diff --git a/workshops/latex/examples/2a_umbruch.tex b/workshops/latex/examples/2a_umbruch.tex index 058dfbd491eb52a621dba52c39df6e333414768d..28729c204e8173681b08e717f05d666d084c3087 100644 --- a/workshops/latex/examples/2a_umbruch.tex +++ b/workshops/latex/examples/2a_umbruch.tex @@ -1,5 +1,2 @@ -\documentclass[preview]{standalone} -\begin{document} Zeile 1. -Zeile 2. -\end{document} +Zeile 2. \ No newline at end of file diff --git a/workshops/latex/examples/2b_umbruch.tex b/workshops/latex/examples/2b_umbruch.tex index 08adcab07db55d5e3fa07b4f753e40804dad70f3..fe83b00a95aecaf80f482fd04708c069e2464bb5 100644 --- a/workshops/latex/examples/2b_umbruch.tex +++ b/workshops/latex/examples/2b_umbruch.tex @@ -1,6 +1,3 @@ -\documentclass[preview]{standalone} -\begin{document} Zeile 1. -Zeile 2. -\end{document} +Zeile 2. \ No newline at end of file diff --git a/workshops/latex/examples/2c_umbruch.tex b/workshops/latex/examples/2c_umbruch.tex index c17aabaff29c198c45846c014c3067f8c2b51c2f..ab457040532767b73775452754b5d9c23e4526e4 100644 --- a/workshops/latex/examples/2c_umbruch.tex +++ b/workshops/latex/examples/2c_umbruch.tex @@ -1,4 +1 @@ -\documentclass[preview]{standalone} -\begin{document} -Zeile 1. \\ Zeile 2. -\end{document} +Zeile 1. \\ Zeile 2. \ No newline at end of file diff --git a/workshops/latex/examples/2d_umbruch.tex b/workshops/latex/examples/2d_umbruch.tex new file mode 100644 index 0000000000000000000000000000000000000000..4eec680ce15470506971d2b1d383f64d1ff0834c --- /dev/null +++ b/workshops/latex/examples/2d_umbruch.tex @@ -0,0 +1,3 @@ +Seite 1 +\newpage +Seite 2 diff --git a/workshops/latex/latex.tex b/workshops/latex/latex.tex index 42e83ebc157f0bcfc7e884fe80a18d512bca9efe..4bbda8d226d9caa92960f344992f48d6169c888a 100644 --- a/workshops/latex/latex.tex +++ b/workshops/latex/latex.tex @@ -124,39 +124,60 @@ \begin{columns} \begin{column}{0.3\textwidth} \begin{itemize} - \item Zeilen ignoriert + \item Zeilen im \texttt{.tex} ignoriert \end{itemize} \end{column} \begin{column}{0.35\textwidth} - \begin{tikzpicture}[even odd rule, scale=1] - \coordinate (text) at (0,0); - \filldraw[fill=blue!25!lightgray, draw=blue!25!lightgray] (0,0) - rectangle (\textwidth, -.5\textwidth) (2pt,-2pt) - rectangle (\textwidth-2pt, -.5\textwidth+2pt); - \node[anchor=north west] at (4pt, -12pt) {\begin{minipage}[t][.5\textwidth-12pt][t]{\textwidth-12pt} - \centering - \begin{verbatim} - Zeile 1. - Zeile 2. - \end{verbatim} - \end{minipage} - }; - \end{tikzpicture} + \marginbox{\textwidth}{\lstinputlisting{examples/2a_umbruch.tex}} \end{column} \begin{column}{0.35\textwidth} - Zeile 1. - Zeile 2. + \input{examples/2a_umbruch.tex} \end{column} \end{columns} - \begin{itemize} - %todo Listing Makro, schoene boxen und so - \item Leere Zeile $\rightarrow$ \includegraphics[]{2b_umbruch.pdf} - \item Manueller Zeilenumbruch: \includegraphics[]{2c_umbruch.pdf} - \end{itemize} + + \begin{columns} + \begin{column}{0.3\textwidth} + \begin{itemize} + \item Absatz: Leere Zeile + \end{itemize} + \end{column} + \begin{column}{0.35\textwidth} + \marginbox{\textwidth}{\lstinputlisting{examples/2b_umbruch.tex}} + \end{column} + \begin{column}{0.35\textwidth} + \input{examples/2b_umbruch.tex} + \end{column} + \end{columns} + + \begin{columns} + \begin{column}{0.3\textwidth} + \begin{itemize} + \item Manueller Zeilenumbruch + \end{itemize} + \end{column} + \begin{column}{0.35\textwidth} + \marginbox{\textwidth}{\lstinputlisting{examples/2c_umbruch.tex}} + \end{column} + \begin{column}{0.35\textwidth} + \input{examples/2c_umbruch.tex} + \end{column} + \end{columns} + \structure{Neue Seite:} -% \begin{verbatim} -% \newpage -% \end{verbatim} + \begin{columns} + \begin{column}{0.3\textwidth} + \begin{itemize} + \item Manueller Seitenumbruch + \end{itemize} + \end{column} + \begin{column}{0.35\textwidth} + \marginbox{\textwidth}{\lstinputlisting{examples/2d_umbruch.tex}} + \end{column} + \begin{column}{0.35\textwidth} + Foto + \end{column} + \end{columns} + \end{frame} \end{document}