Merge branch 'master' of git.c3d2.de:schleuderpackung

This commit is contained in:
koeart 2013-07-23 06:55:07 +02:00
commit f3cf3bf013
5 changed files with 62 additions and 9 deletions

24
TODO Normal file
View File

@ -0,0 +1,24 @@
# was hier noch so fehlt:
* erfaliste -> koerart wills machen
* Umschlagseiten -> macht john
* Codeumgebun DScode floatend
* paketoptionen-review
* Makefile baut automatisch links und builddir und so...
** TEXMF Hack?
* Barcode @ pagenum (no qrcode pls )
* impressum sachen als keys für die dokumentklasse aufnehmen
* autoren automatik für impressum und artikel
* inhaltsverzeichnis
* Todoliste vervollständigen....
## Dokumentation
* fehlt bisher vom Beispiel abgesehen
## Artikel Developer Kit
* Sollte man machen mit Makefile und Doku
* Vll als eigenes Git? Tarball?

View File

@ -51,8 +51,19 @@
\RequirePackage{scrpage2} \RequirePackage{scrpage2}
\RequirePackage{graphicx} \RequirePackage{graphicx}
\RequirePackage{tikz} \RequirePackage{tikz}
\RequirePackage{hyperref} \RequirePackage[pdftex,%
citebordercolor={0.9 0.9 1},%
filebordercolor={0.9 0.9 1},%
linkbordercolor={0.9 0.9 1},%
pagebordercolor={0.9 0.9 1},%
urlbordercolor={0.9 0.9 1},%
pdfborder={0.9 0.9 1},%
pagebackref,plainpages=false,pdfpagelabels=true]{hyperref}
\RequirePackage{float} \RequirePackage{float}
\pgfdeclareimage[height=5mm]{Pesthoernchen}{pesthoernchen.pdf}
\pgfdeclareimage[width=10mm]{CCCLogo}{Logo_CCC}
\newfloat{impressum}{tpbh}{loi} %impressum als Float, damit kann Text fließen \newfloat{impressum}{tpbh}{loi} %impressum als Float, damit kann Text fließen
\pagestyle{scrheadings} \pagestyle{scrheadings}
@ -63,8 +74,8 @@
} }
%FIXME: use pgfdeclared image for saving objects in pdf %FIXME: use pgfdeclared image for saving objects in pdf
\rehead[]{\tikz[overlay]{\node[xshift=0.3mm,yshift=0.9mm]{\includegraphics[width=1cm]{Logo_CCC}};}} \rehead[]{\tikz[overlay]{\node[xshift=0.3mm,yshift=0.9mm]{\pgfuseimage{CCCLogo}};}}
\rohead[]{\tikz[overlay]{\node[xshift=0.3mm,yshift=0.9mm]{\includegraphics[width=1cm]{Logo_CCC}};}} \rohead[]{\tikz[overlay]{\node[xshift=0.3mm,yshift=0.9mm]{\pgfuseimage{CCCLogo}};}}
\chead{\directlua{tex.print(ruhetmp or "Bitte runninghead setzen")}} \chead{\directlua{tex.print(ruhetmp or "Bitte runninghead setzen")}}
\setheadsepline{0.5pt} \setheadsepline{0.5pt}
@ -132,10 +143,17 @@
\newcounter{NumOfLetters} \newcounter{NumOfLetters}
\newenvironment{DSletters}{%
\manrunninghead{Leserbriefe}
\setcounter{NumOfLetters}{0} \setcounter{NumOfLetters}{0}
\begin{multicols}{2}
}
{%
\end{multicols}
}
\newenvironment{letter}{% \newenvironment{letter}{%
\begin{multicols}{2}
\setlength{\parskip}{2.5mm}% \setlength{\parskip}{2.5mm}%
\setlength{\parindent}{0mm}% \setlength{\parindent}{0mm}%
\ifthenelse{\equal{\arabic{NumOfLetters}}{0}}{}{% \ifthenelse{\equal{\arabic{NumOfLetters}}{0}}{}{%
@ -144,11 +162,11 @@
\hfill% \hfill%
\hfill% \hfill%
%FIXME: use pgfdeclared image for saving objects in pdf %FIXME: use pgfdeclared image for saving objects in pdf
\includegraphics[width=5mm]{pesthoernchen}% \pgfuseimage{Pesthoernchen}
\hfill% \hfill%
\includegraphics[width=5mm]{pesthoernchen}% \pgfuseimage{Pesthoernchen}
\hfill% \hfill%
\includegraphics[width=5mm]{pesthoernchen}% \pgfuseimage{Pesthoernchen}
\hfill% \hfill%
\hfill\hspace*{0cm}% \hfill\hspace*{0cm}%
\end{center}% \end{center}%
@ -156,10 +174,10 @@
}% }%
\stepcounter{NumOfLetters}% \stepcounter{NumOfLetters}%
}{% }{%
\end{multicols}
} }
\newenvironment{question}{% \newenvironment{question}{%
}{% }{%
\par
} }
\newenvironment{answer}{% \newenvironment{answer}{%
\itshape% \itshape%

View File

@ -34,8 +34,8 @@
\begin{document} \begin{document}
\manrunninghead{Leserbriefe}
\begin{DSletters}
\begin{letter} \begin{letter}
\begin{question} \begin{question}
@ -77,6 +77,9 @@
\end{answer} \end{answer}
\end{letter} \end{letter}
\end{DSletters}
\begin{figure}[b!] \begin{figure}[b!]
\includegraphics[width=1\linewidth]{flickr_mightyjohn_3985923685_cc-by-sa.jpg} \includegraphics[width=1\linewidth]{flickr_mightyjohn_3985923685_cc-by-sa.jpg}
\caption{Flickr, by mightyjohn, cc-by-sa} \caption{Flickr, by mightyjohn, cc-by-sa}

1
img/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
*.pdf

View File

@ -1,3 +1,10 @@
PDFS= Logo_CCC.pdf pesthoernchen.pdf
all: $(PDFS)
clean:
rm $(PDFS)
%.pdf: %.svg %.pdf: %.svg
inkscape --export-pdf=$@ $< inkscape --export-pdf=$@ $<