From 4cbd581c8f79d6fb1178b1e44bc488bcd1d349d6 Mon Sep 17 00:00:00 2001
From: Stefan Heimersheim <stefan.heimersheim@rwth-aachen.de>
Date: Mon, 20 May 2019 19:42:14 +0200
Subject: [PATCH] Examples 2a-2d
---
workshops/latex/examples/2a_umbruch.tex | 5 +-
workshops/latex/examples/2b_umbruch.tex | 5 +-
workshops/latex/examples/2c_umbruch.tex | 5 +-
workshops/latex/examples/2d_umbruch.tex | 3 ++
workshops/latex/latex.tex | 71 ++++++++++++++++---------
5 files changed, 52 insertions(+), 37 deletions(-)
create mode 100644 workshops/latex/examples/2d_umbruch.tex
diff --git a/workshops/latex/examples/2a_umbruch.tex b/workshops/latex/examples/2a_umbruch.tex
index 058dfbd..28729c2 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 08adcab..fe83b00 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 c17aaba..ab45704 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 0000000..4eec680
--- /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 42e83eb..4bbda8d 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}
--
GitLab