Merge branch 'master' of git.c3d2.de:datenschleuder98
This commit is contained in:
commit
1fa6be8307
|
@ -1,5 +1,6 @@
|
||||||
\documentclass[%
|
\documentclass[%
|
||||||
% draft,
|
% draft,
|
||||||
|
% non-free,
|
||||||
volume=98,
|
volume=98,
|
||||||
year=2017
|
year=2017
|
||||||
]{datenschleuder}
|
]{datenschleuder}
|
||||||
|
@ -66,12 +67,19 @@
|
||||||
\end{tikzpicture}
|
\end{tikzpicture}
|
||||||
\end{DSTitlePage}
|
\end{DSTitlePage}
|
||||||
|
|
||||||
|
\DSFullImgPage[picturepuzzle,fg=IDpurple]{bilder/c64}
|
||||||
|
|
||||||
\begin{DSletters}
|
\begin{DSletters}
|
||||||
\input{artikel/leserbriefe.tex}
|
\input{artikel/leserbriefe.tex}
|
||||||
\end{DSletters}
|
\end{DSletters}
|
||||||
|
|
||||||
\DSimpressum
|
\DSimpressum
|
||||||
|
|
||||||
|
\begin{figure}[bh!]
|
||||||
|
\includegraphics[width=1\textwidth]{bilder/mightyjohn-cc-by-sa.jpg}
|
||||||
|
\caption{mightyjohn warnt. cc-by-sa (via flickr)}
|
||||||
|
\end{figure}
|
||||||
|
|
||||||
%aktuelle Schleuder
|
%aktuelle Schleuder
|
||||||
\input{artikel/dieweltvonmorgen.tex}
|
\input{artikel/dieweltvonmorgen.tex}
|
||||||
|
|
||||||
|
@ -88,8 +96,8 @@
|
||||||
%\input{artikel/torbridges.tex}
|
%\input{artikel/torbridges.tex}
|
||||||
%
|
%
|
||||||
%%
|
%%
|
||||||
%\DSFullImgPage{bilder/datenspuren}
|
\DSFullImgPage{bilder/datenspuren}
|
||||||
%\DSFullImgPage{bilder/tattoo}
|
\DSFullImgPage{bilder/tattoo}
|
||||||
|
|
||||||
\end{document}
|
\end{document}
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 074920de72b1ececa25b50f2d32dea2e068fb031
|
Subproject commit faddb90fb98fda710221946613a015494a95f048
|
Loading…
Reference in New Issue
Block a user