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

workshops/latex/examples/2g.tex

+\textcolor{blue}{blau}
 \textcolor{green}{grün}
-\textcolor{purple}{pink}
+\textcolor{purple}{lila}

workshops/latex/examples/3b.tex

+\begin{center}
+  Mitte
+\end{center}
+\begin{flushleft}
+  Links
+\end{flushleft}
+\begin{flushright}
+  Rechts
+\end{flushright}

workshops/latex/examples/3c.tex

+\begin{itemize}
+	\item Dies und
+	\item Jenes
+\end{itemize}
+\begin{enumerate}
+	\item Erstens
+	\item Zweitens
+\end{enumerate}
\ No newline at end of file

workshops/latex/latex.tex

@@ -26,7 +26,7 @@
   keywordstyle=\color{RoyalBlue}\bfseries,
   moretexcs={lstset,testfont,testfont,subsubsection,paragraph,subsection ,color,sl,textcolor,lstinputlisting,newfontfamily,fontsize,HUGE,
     Gargantous,ShowCharInBox},
-  morekeywords={center,document}
+  morekeywords={center,document,flushleft,flushright,itemize,enumerate}
 }
 
 \makeatletter
@@ -232,9 +232,9 @@
 \end{frame}
 
 
-\begin{frame}[fragile]{Zeilenumbrüche}
+\begin{frame}[fragile]{Formatierung}
 \structure{Formatierung:}
-%TODO Mehrere von diesen structures?
+%TODO Mehrere von diesen structures? + Title
 \begin{tikzpicture}
 \node[matrix, column sep=4pt, row sep=6pt] {
   \node{
@@ -275,7 +275,8 @@
       \tiny tiny
       \small small
       \large large\\
-      \Large Large\,\LARGE LARGE
+      \Large Large\,\LARGE LARGE\\
+      ...
     \end{minipage}
   };
   \\
@@ -322,6 +323,57 @@ Foto
 
 \end{frame}
 
+
+
+\begin{frame}[fragile]{Abschnitte und Umgebungen}
+\structure{Umgebungen:}
+%TODO Überschriften verbessen
+\begin{tikzpicture}
+\node[matrix, column sep=4pt, row sep=6pt] {
+	\node{
+		\begin{minipage}[t][10mm][c]{.28\textwidth}
+		\begin{itemize}
+		\item Center / Linksbündig
+		\end{itemize}
+		\end{minipage}
+	}; &
+	\node[draw=blue!20!lightgray, line width=2pt]{
+		\begin{minipage}[t][30mm][c]{.3\textwidth}
+		\lstinputlisting{examples/3b.tex}
+		\end{minipage}
+	}; &
+	\node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; &
+	\node[draw=blue!20!lightgray, line width=2pt]{
+		\begin{minipage}[t][30mm][c]{.25\textwidth}
+		    \input{examples/3b.tex}
+		\end{minipage}
+	};
+	\\
+	\node{
+		\begin{minipage}[t][10mm][c]{.28\textwidth}
+		\begin{itemize}
+		\item Auflistungen
+		\end{itemize}
+		\end{minipage}
+	}; &
+	\node[draw=blue!20!lightgray, line width=2pt]{
+		\begin{minipage}[t][30mm][c]{.3\textwidth}
+		\lstinputlisting{examples/3c.tex}
+		\end{minipage}
+	}; &
+	\node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; &
+	\node[draw=blue!20!lightgray, line width=2pt]{
+		\begin{minipage}[t][30mm][c]{.25\textwidth}
+		\input{examples/3c.tex}
+		\end{minipage}
+	};
+	\\
+};
+\end{tikzpicture}
+
+\end{frame}
+
+
 \begin{frame}[fragile]{Mathematik}
   \begin{tikzpicture}
       \node[matrix, column sep=4pt, row sep=6pt] {