Merge branch 'master' of git.fsmpi.rwth-aachen.de:osak/talks

workshops/latex/examples/2a_umbruch.tex

-\documentclass[preview]{standalone}
-\begin{document}
 Zeile 1.
 Zeile 2.
\ No newline at end of file
-\end{document}

workshops/latex/examples/2b_umbruch.tex

-\documentclass[preview]{standalone}
-\begin{document}
 Zeile 1.
 
 Zeile 2.
\ No newline at end of file
-\end{document}

workshops/latex/examples/2c_umbruch.tex

-\documentclass[preview]{standalone}
-\begin{document}
 Zeile 1. \\ Zeile 2.
\ No newline at end of file
-\end{document}

workshops/latex/examples/2d_umbruch.tex

+Seite 1
+\newpage
+Seite 2

workshops/latex/latex.tex

-\documentclass[]{beamer}
+\documentclass[xcolor=dvipsnames]{beamer}
 
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
@@ -15,6 +15,17 @@
 
 \usetheme{OSAK}
 
+\lstset{
+	basicstyle=\scriptsize\ttfamily,
+	language={[LaTeX]TeX},
+	texcsstyle=*\color{Mahogany}\bfseries,
+	commentstyle=\itshape\color{RoyalBlue},
+	keywordstyle=\color{RoyalBlue}\bfseries,
+	moretexcs={lstset,testfont,color,sl,lstinputlisting,newfontfamily,fontsize,HUGE,
+		Gargantous,ShowCharInBox},
+	morekeywords={center,document}
+}
+
 % TODO Titel & Autoren anpassen!
 \date{\today}
 \title[\LaTeX-Workshop]{\LaTeX ist toll!}
@@ -26,12 +37,15 @@
   und der Aachener Linux User Group
 }
 
-
+\newlength\marginwidth
 \newcommand\marginbox[3][2pt]{
+  % USAGE: \marginbox[margin width]{width}{content}
+  % TODO: width is set manually such that it fits real width!
+  \setlength\marginwidth{#1}
   \begin{tikzpicture}[even odd rule, scale=1]
     \node[anchor=north west] (text) {%
-      \begin{minipage}{#1}%
-        #2%
+      \begin{minipage}{#2-2\marginwidth-10pt}%
+        #3%
       \end{minipage}%
     };
     \begin{pgfonlayer}{background}
@@ -121,42 +135,93 @@
 
 \begin{frame}[fragile]{Zeilenumbrüche}
   \structure{Neue Zeile:}
-	\begin{columns}
-		\begin{column}{0.3\textwidth}
+  \begin{tikzpicture}
+      \node[matrix, column sep=4pt, row sep=6pt] {
+        \node{
+          \begin{minipage}[t][10mm][c]{.28\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}
+        }; &
+        \node[draw=blue!20!lightgray, line width=2pt]{
+          \begin{minipage}[t][10mm][c]{.3\textwidth}
+            \lstinputlisting{examples/2a_umbruch.tex}
+          \end{minipage}
+        }; &
+        \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; &
+        \node[draw=blue!20!lightgray, line width=2pt]{
+          \begin{minipage}[t][10mm][c]{.25\textwidth}
+            \input{examples/2a_umbruch.tex}
           \end{minipage}
         };
-			\end{tikzpicture}
-		\end{column}
-		\begin{column}{0.35\textwidth}
-			Zeile 1.
-			Zeile 2.
-		\end{column}
-	\end{columns}
+        \\
+        \node{
+          \begin{minipage}[t][10mm][c]{.28\textwidth}
+            \begin{itemize}
+                \item Absatz: Leere Zeile
+            \end{itemize}
+          \end{minipage}
+        }; &
+        \node[draw=blue!20!lightgray, line width=2pt]{
+          \begin{minipage}[t][10mm][c]{.3\textwidth}
+            \lstinputlisting{examples/2b_umbruch.tex}
+          \end{minipage}
+        }; &
+        \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; &
+        \node[draw=blue!20!lightgray, line width=2pt]{
+          \begin{minipage}[t][10mm][c]{.25\textwidth}
+            \input{examples/2b_umbruch.tex}
+          \end{minipage}
+        };
+        \\
+        \node{
+          \begin{minipage}[t][10mm][c]{.28\textwidth}
             \begin{itemize}
-		%todo Listing Makro, schoene boxen und so
-		\item Leere Zeile $\rightarrow$ \includegraphics[]{2b_umbruch.pdf}
-		\item Manueller Zeilenumbruch: \includegraphics[]{2c_umbruch.pdf}
+                \item Manueller Zeilenumbruch
             \end{itemize}
+          \end{minipage}
+        }; &
+        \node[draw=blue!20!lightgray, line width=2pt]{
+          \begin{minipage}[t][10mm][c]{.3\textwidth}
+            \lstinputlisting{examples/2c_umbruch.tex}
+          \end{minipage}
+        }; &
+        \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; &
+        \node[draw=blue!20!lightgray, line width=2pt]{
+          \begin{minipage}[t][10mm][c]{.25\textwidth}
+            \input{examples/2c_umbruch.tex}
+          \end{minipage}
+        };
+        \\
+      };
+    \end{tikzpicture}
+
   \structure{Neue Seite:}
-%	\begin{verbatim}
-%		\newpage
-%	\end{verbatim}
+  \begin{tikzpicture}
+      \node[matrix, column sep=4pt, row sep=6pt] {
+        \node{
+          \begin{minipage}[t][10mm][c]{.28\textwidth}
+            \begin{itemize}
+                \item Manueller Seitenumbruch
+            \end{itemize}
+          \end{minipage}
+        }; &
+        \node[draw=blue!20!lightgray, line width=2pt]{
+          \begin{minipage}[t][10mm][c]{.3\textwidth}
+            \lstinputlisting{examples/2d_umbruch.tex}
+          \end{minipage}
+        }; &
+        \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; &
+        \node[draw=blue!20!lightgray, line width=2pt]{
+          \begin{minipage}[t][10mm][c]{.25\textwidth}
+            Foto
+          \end{minipage}
+        };
+        \\
+      };
+    \end{tikzpicture}
+
 \end{frame}
 
 \end{document}