From 1208905376d414e5e5cd62dcfc078853534b7b7d Mon Sep 17 00:00:00 2001 From: john stone Date: Tue, 23 Jul 2013 02:29:26 +0200 Subject: [PATCH 1/6] leserbrief multicol fixung --- datenschleuder.cls | 11 +++++++++-- example/schleuderbeispiel.tex | 5 ++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/datenschleuder.cls b/datenschleuder.cls index 4e6a6c2..175b617 100644 --- a/datenschleuder.cls +++ b/datenschleuder.cls @@ -127,10 +127,17 @@ } \newcounter{NumOfLetters} + +\newenvironment{DSletters}{% +\manrunninghead{Leserbriefe} \setcounter{NumOfLetters}{0} +\begin{multicols}{2} +} +{% +\end{multicols} +} \newenvironment{letter}{% - \begin{multicols}{2} \setlength{\parskip}{2.5mm}% \setlength{\parindent}{0mm}% \ifthenelse{\equal{\arabic{NumOfLetters}}{0}}{}{% @@ -151,10 +158,10 @@ }% \stepcounter{NumOfLetters}% }{% -\end{multicols} } \newenvironment{question}{% }{% +\par } \newenvironment{answer}{% \itshape% diff --git a/example/schleuderbeispiel.tex b/example/schleuderbeispiel.tex index 16f884c..3efe4c6 100644 --- a/example/schleuderbeispiel.tex +++ b/example/schleuderbeispiel.tex @@ -8,8 +8,8 @@ \begin{document} -\manrunninghead{Leserbriefe} +\begin{DSletters} \begin{letter} \begin{question} @@ -51,6 +51,9 @@ \end{answer} \end{letter} +\end{DSletters} + + \begin{figure}[b!] \includegraphics[width=1\linewidth]{flickr_mightyjohn_3985923685_cc-by-sa.jpg} \caption{Flickr, by mightyjohn, cc-by-sa} From 3ec26098b8b5a7ed00d5bea7e2f3d8d38d65124f Mon Sep 17 00:00:00 2001 From: john stone Date: Tue, 23 Jul 2013 02:55:05 +0200 Subject: [PATCH 2/6] pgfimages safe pdf objects (faster compile, less data) --- datenschleuder.cls | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/datenschleuder.cls b/datenschleuder.cls index 035f0cd..0d23efe 100644 --- a/datenschleuder.cls +++ b/datenschleuder.cls @@ -53,6 +53,10 @@ \RequirePackage{tikz} \RequirePackage{hyperref} \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 \pagestyle{scrheadings} @@ -63,8 +67,8 @@ } %FIXME: use pgfdeclared image for saving objects in pdf -\rehead[]{\tikz[overlay]{\node[xshift=0.3mm,yshift=0.9mm]{\includegraphics[width=1cm]{Logo_CCC}};}} -\rohead[]{\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]{\pgfuseimage{CCCLogo}};}} \chead{\directlua{tex.print(ruhetmp or "Bitte runninghead setzen")}} \setheadsepline{0.5pt} @@ -153,11 +157,11 @@ \hfill% \hfill% %FIXME: use pgfdeclared image for saving objects in pdf - \includegraphics[width=5mm]{pesthoernchen}% + \pgfuseimage{Pesthoernchen} \hfill% - \includegraphics[width=5mm]{pesthoernchen}% + \pgfuseimage{Pesthoernchen} \hfill% - \includegraphics[width=5mm]{pesthoernchen}% + \pgfuseimage{Pesthoernchen} \hfill% \hfill\hspace*{0cm}% \end{center}% From c63207f891fde86364d3c785ef717030de99b272 Mon Sep 17 00:00:00 2001 From: john stone Date: Tue, 23 Jul 2013 03:00:59 +0200 Subject: [PATCH 3/6] Makefile fix for clean submoduling --- img/.gitignore | 1 + img/Makefile | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 img/.gitignore diff --git a/img/.gitignore b/img/.gitignore new file mode 100644 index 0000000..a136337 --- /dev/null +++ b/img/.gitignore @@ -0,0 +1 @@ +*.pdf diff --git a/img/Makefile b/img/Makefile index b75c7b9..baa2e8d 100644 --- a/img/Makefile +++ b/img/Makefile @@ -1,3 +1,10 @@ +PDFS= Logo_CCC.pdf pesthoernchen.pdf + +all: $(PDFS) + +clean: + rm $(PDFS) + %.pdf: %.svg inkscape --export-pdf=$@ $< From ce4c38e1f3db4e08d26e106e4258270469ba2940 Mon Sep 17 00:00:00 2001 From: john stone Date: Tue, 23 Jul 2013 04:16:53 +0200 Subject: [PATCH 4/6] hyperrefopts set --- datenschleuder.cls | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/datenschleuder.cls b/datenschleuder.cls index 0d23efe..ba02ec6 100644 --- a/datenschleuder.cls +++ b/datenschleuder.cls @@ -51,7 +51,14 @@ \RequirePackage{scrpage2} \RequirePackage{graphicx} \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} \pgfdeclareimage[height=5mm]{Pesthoernchen}{pesthoernchen.pdf} From 4a4bee0a7dcfa640b7e36fc51bde6e878af8b6eb Mon Sep 17 00:00:00 2001 From: john stone Date: Tue, 23 Jul 2013 04:22:28 +0200 Subject: [PATCH 5/6] added TODO file --- TODO | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 TODO diff --git a/TODO b/TODO new file mode 100644 index 0000000..8f2dc1b --- /dev/null +++ b/TODO @@ -0,0 +1,14 @@ + +# 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.... From cba68876bcc45b054795f948015ed2d3a1646084 Mon Sep 17 00:00:00 2001 From: john stone Date: Tue, 23 Jul 2013 04:26:59 +0200 Subject: [PATCH 6/6] moar TODO --- TODO | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/TODO b/TODO index 8f2dc1b..23340ac 100644 --- a/TODO +++ b/TODO @@ -12,3 +12,13 @@ * 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? +