From 862942ed761d829712d63f81d1cd3133acdef6f8 Mon Sep 17 00:00:00 2001 From: koeart Date: Tue, 23 Jul 2013 00:34:41 +0200 Subject: [PATCH] letzter stand --- datenschleuder.cls | 14 ++---- example/adressen.tex | 86 +++++++++++++++++------------------ example/fremderartikel.tex | 7 +-- example/schleuderbeispiel.tex | 4 +- 4 files changed, 55 insertions(+), 56 deletions(-) diff --git a/datenschleuder.cls b/datenschleuder.cls index 0e41b48..ba34539 100644 --- a/datenschleuder.cls +++ b/datenschleuder.cls @@ -22,7 +22,7 @@ pdftex, a5paper, twoside, -% twocolumn, + twocolumn, DIV=15, ]{scrartcl} @@ -90,7 +90,7 @@ \addauthor{Ein anderer Test} \renewcommand{\maketitle}{% -% \twocolumn[ + \twocolumn[ % \renewcommand{\@runninghead}{\@runningheadtmp} \textsf{\Huge\@title} @@ -101,7 +101,7 @@ {\bfseries\@DSabstract} \vspace*{3mm} -% ] + ] \directlua{ruhetmp=nxruhetmp nxruhetmp=nil} \normalsize } @@ -118,17 +118,14 @@ \newenvironment{DSarticle}[1][]{% \setkeys{DSarticleKeys}{#1}% - \@addauthor{Ein Test} - \addauthor{Zwei Test} \maketitle - \begin{multicols}{2} - }{\end{multicols}} + }{% +} \newcounter{NumOfLetters} \setcounter{NumOfLetters}{0} \newenvironment{letter}{% - \begin{multicols}{2} \setlength{\parskip}{2.5mm}% \setlength{\parindent}{0mm}% \ifthenelse{\equal{\arabic{NumOfLetters}}{0}}{}{% @@ -148,7 +145,6 @@ }% \stepcounter{NumOfLetters}% }{% -\end{multicols} } \newenvironment{question}{% }{% diff --git a/example/adressen.tex b/example/adressen.tex index f9683b9..6e61565 100644 --- a/example/adressen.tex +++ b/example/adressen.tex @@ -8,48 +8,48 @@ \usepackage{rotating} \begin{document} -\begin{sidewaysfigure}[h] +%%%%\begin{sidewaysfigure}[h] \tiny -\pgfplotstableset{ - columns/Erfa/.style={string type}, - columns/Ort/.style={string type}, - columns/Tag/.style={ - string type, - column name={Tag, Uhrzeit} - }, - columns/Adresse/.style={string type}, - columns/Bemerkung/.style={string type, - assign cell content/.code={ - \pgfkeyssetvalue{/pgfplots/table/@cell content}{\url{##1}} - }, - }, - create on use/Zusammen/.style={ - string type, - create col/assign/.code={ - \getthisrow{Erfa}\erfa - \getthisrow{Ort}\ort - \edef\entry{ {\erfa~wohnt im \ort}}% - \pgfkeyslet{/pgfplots/table/create col/next content}\entry - }, - - }, - columns/Zusammen/.style={ - string type, - }, - } - \pgfplotstabletypeset[ - col sep=semicolon, - columns={Erfa,Ort,Zusammen}, - % - empty cells with={--}, % replace empty cells - every head row/.style={before row=\toprule, after row=\midrule}, - every last row/.style={after row=\midrule}, - every even row/.style={ - before row={ - \rowcolor{lightgray} - }, - }, - ]{adressliste.csv} -\end{sidewaysfigure}% -\normalsize +%%%%\pgfplotstableset{ +%%%% columns/Erfa/.style={string type}, +%%%% columns/Ort/.style={string type}, +%%%% columns/Tag/.style={ +%%%% string type, +%%%% column name={Tag, Uhrzeit} +%%%% }, +%%%% columns/Adresse/.style={string type}, +%%%% columns/Bemerkung/.style={string type, +%%%% assign cell content/.code={ +%%%% \pgfkeyssetvalue{/pgfplots/table/@cell content}{\url{##1}} +%%%% }, +%%%% }, +%%%%% create on use/Zusammen/.style={ +%%%%% string type, +%%%%% create col/assign/.code={ +%%%%% \getthisrow{Erfa}\erfa +%%%%% \getthisrow{Ort}\ort +%%%%% \edef\entry{ {\erfa~wohnt im \ort}}% +%%%%% \pgfkeyslet{/pgfplots/table/create col/next content}\entry +%%%%% }, +%%%%% +%%%%% }, +%%%%% columns/Zusammen/.style={ +%%%%% string type, +%%%%% }, +%%%%} +%%%%\pgfplotstabletypeset[ +%%%% col sep=semicolon, +%%%%% columns={Erfa,Ort}, +%%%% % +%%%% empty cells with={--}, % replace empty cells +%%%% every head row/.style={before row=\toprule, after row=\midrule}, +%%%% every last row/.style={after row=\midrule}, +%%%% every even row/.style={ +%%%% before row={ +%%%% \rowcolor{lightgray} +%%%% }, +%%%% }, +%%%%]{adressliste.csv} +%%%%\end{sidewaysfigure}% +%%%%\normalsize \end{document} diff --git a/example/fremderartikel.tex b/example/fremderartikel.tex index 1fa6fdf..50360b2 100644 --- a/example/fremderartikel.tex +++ b/example/fremderartikel.tex @@ -12,6 +12,7 @@ \begin{DSarticle}[ title=Lamer Artikel, author=Mrs. Lamewriter, + runninghead=Not so lame, DSabstract={ Dies ist ein Artikel von einem Fremdautor oder einer Fremdautorin. Dieser kann auf dem heimischen System kompiliert werden. } @@ -23,10 +24,10 @@ Wenn mir alles gefällt, dann veröffentliche ich diesen Artikel natürlich in e \subsection{Hier ist eine Unterüberschrift} \lipsum[3-4] \begin{center} - \includegraphics[width=1\linewidth]{fremderpenguin.png} + \includegraphics[width=1\linewidth]{fremderpenguin.png} %\caption{Ein Pinguin hat sich eingeschlichen} - \end{center} - \lipsum[5-6] +\end{center} +\lipsum[5-6] \section{Meine letzte Überschrift} \lipsum[23] Und jetzt das Literaturverzeichnis. Vielen Dank! diff --git a/example/schleuderbeispiel.tex b/example/schleuderbeispiel.tex index 86bf364..dd795c4 100644 --- a/example/schleuderbeispiel.tex +++ b/example/schleuderbeispiel.tex @@ -51,8 +51,10 @@ \end{answer} \end{letter} +\begin{figure} \includegraphics[width=1\linewidth]{flickr_mightyjohn_3985923685_cc-by-sa.jpg} \caption{Flickr, by mightyjohn, cc-by-sa} +\end{figure} % Article 1 (with old-fashioned commands) \begin{DSarticle}[ @@ -65,6 +67,7 @@ ] \lipsum[30-41] \end{DSarticle} +\DSimpressum \addauthor{Test ausserhalb} \addauthor{Noch ein Test ausserhalb} \begin{DSarticle}[% @@ -76,7 +79,6 @@ \end{DSarticle} -\DSimpressum % Article 1 (with old-fashioned commands) %%%\title{Noch was tolles}