From b4f421e9971a25679a6091d2cf2d8989e867ea7a Mon Sep 17 00:00:00 2001 From: valentin <valentinb@fsmpi.rwth-aachen.de> Date: Sun, 2 Jun 2019 14:08:30 +0200 Subject: [PATCH] presentation: labeled .tex and .pdf; indentation; handout: corrections --- workshops/latex/handout.tex | 5 +- workshops/latex/latex.tex | 299 ++++++++++++++++++------------------ 2 files changed, 154 insertions(+), 150 deletions(-) diff --git a/workshops/latex/handout.tex b/workshops/latex/handout.tex index 664705e..b8535af 100644 --- a/workshops/latex/handout.tex +++ b/workshops/latex/handout.tex @@ -353,8 +353,7 @@ Alternativ: \verb|margin=2cm| oder \verb|left=2cm, right=2.5cm| %\verb|\usepackage[ngerman]{babel} | Silbentrennung\\ \verb|\usepackage{polyglossia} | Silbentrennung\\ \verb|\setmainlanguage{german} | Sprache für Silbentrennung\\ -\verb|\usepackage{lmodern}|\hfill schönere Standard-\LaTeX-Schrift\\ -%\verb|\usepackage{libertine}| +%\verb|\usepackage{lmodern}|\hfill schönere Standard-\LaTeX-Schrift\\ \verb|\usepackage{hyperref} | siehe \autoref{sec:references} % \section{Referenzen} @@ -510,7 +509,7 @@ Farbthema auswählen: \verb|\usecolortheme{rose}|\\ % \section{Makros} Neuen Befehl definieren: \verb|\newcommand{\abc}{ABC}|\\ -Befehl überschreiben: \verb|\renewcommand{abc}{XYZ}|\\ +Befehl überschreiben: \verb|\renewcommand{\abc}{XYZ}|\\ Mit 2 Argumenten: \verb|\newcommand{\innerprod}[2]{(#1,#2)}| % %\section{Fehlermeldungen} diff --git a/workshops/latex/latex.tex b/workshops/latex/latex.tex index 02aeaa9..547252d 100644 --- a/workshops/latex/latex.tex +++ b/workshops/latex/latex.tex @@ -137,163 +137,168 @@ \begin{frame}[fragile]{Umbrüche} \structure{Zeilen:} + \vskip-\baselineskip% \begin{tikzpicture} - \node[matrix, column sep=4pt, row sep=6pt] { - \node{ - \begin{minipage}[t][10mm][c]{.28\textwidth} - \begin{itemize} - \item Zeilen im \texttt{.tex} ignoriert - \end{itemize} - \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} - }; - \\ - \node{ - \begin{minipage}[t][10mm][c]{.28\textwidth} - \begin{itemize} - \item Leere Zeile\\$\implies$ Absatz - \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} - \item Zeilenumbruch manuell: \texttt{\textbackslash\textbackslash} - \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} - }; - \\ + \node[matrix, column sep=4pt, row sep=6pt] { + & \node{\texttt{dokument.tex}}; & + & \node{\texttt{dokument.pdf}}; \\ + \node{ + \begin{minipage}[t][10mm][c]{.28\textwidth} + \begin{itemize} + \item Zeilen im \texttt{.tex} ignoriert + \end{itemize} + \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} + \\ + \node{ + \begin{minipage}[t][10mm][c]{.28\textwidth} + \begin{itemize} + \item Leere Zeile\\$\implies$ Absatz + \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} + \item Zeilenumbruch manuell: \texttt{\textbackslash\textbackslash} + \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{Seiten:} \begin{tikzpicture} - \node[matrix, column sep=4pt, row sep=6pt] { - \node{ - \begin{minipage}[t][10mm][c]{.28\textwidth} - \begin{itemize} - \item Manuell neue Seite: - \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} - \includegraphics[width=\textwidth]{figures/newpage.png} - \end{minipage} - }; - \\ + \node[matrix, column sep=4pt, row sep=6pt] { + \node{ + \begin{minipage}[t][10mm][c]{.28\textwidth} + \begin{itemize} + \item Manuell neue Seite: + \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} + \includegraphics[width=\textwidth]{figures/newpage.png} + \end{minipage} }; - \end{tikzpicture} - + \\ + }; + \end{tikzpicture} \end{frame} \begin{frame}[fragile]{Formatierung} -\structure{Schrifteinstellungen:} -\begin{tikzpicture} -\node[matrix, column sep=4pt, row sep=6pt] { - \node{ - \begin{minipage}[t][10mm][c]{.28\textwidth} - \begin{itemize} - \item Fontstyle - \end{itemize} - \end{minipage} - }; & - \node[draw=blue!20!lightgray, line width=2pt]{ - \begin{minipage}[t][10mm][c]{.3\textwidth} - \lstinputlisting{examples/2e.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} - \textbf{fett} \textit{kursiv}\\ - \underline{unterstrichen} - \end{minipage} - }; - \\ - \node{ - \begin{minipage}[t][10mm][c]{.28\textwidth} - \begin{itemize} - \item Schriftgröße - \end{itemize} - \end{minipage} - }; & - \node[draw=blue!20!lightgray, line width=2pt]{ - \begin{minipage}[t][20mm][c]{.3\textwidth} - \lstinputlisting{examples/2f.tex} - \end{minipage} - }; & - \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; & - \node[draw=blue!20!lightgray, line width=2pt]{ - \begin{minipage}[t][20mm][c]{.25\textwidth} - \tiny tiny - \small small - \large large\\ - \Large Large\,\LARGE LARGE\\ - ... - \end{minipage} - }; - \\ - \node{ - \begin{minipage}[t][10mm][c]{.28\textwidth} - \begin{itemize} - \item Textfarbe - \end{itemize} - \end{minipage} - }; & - \node[draw=blue!20!lightgray, line width=2pt]{ - \begin{minipage}[t][10mm][c]{.3\textwidth} - \lstinputlisting[basicstyle=\notsotiny\ttfamily]{examples/2g.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/2g.tex} - \end{minipage} + \structure{Schrifteinstellungen:} + \vskip-\baselineskip% + \begin{tikzpicture} + \node[matrix, column sep=4pt, row sep=6pt] { + & \node{\texttt{dokument.tex}}; & + & \node{\texttt{dokument.pdf}}; \\ + \node{ + \begin{minipage}[t][10mm][c]{.28\textwidth} + \begin{itemize} + \item Fontstyle + \end{itemize} + \end{minipage} + }; & + \node[draw=blue!20!lightgray, line width=2pt]{ + \begin{minipage}[t][10mm][c]{.3\textwidth} + \lstinputlisting{examples/2e.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} + \textbf{fett} \textit{kursiv}\\ + \underline{unterstrichen} + \end{minipage} + }; + \\ + \node{ + \begin{minipage}[t][10mm][c]{.28\textwidth} + \begin{itemize} + \item Schriftgröße + \end{itemize} + \end{minipage} + }; & + \node[draw=blue!20!lightgray, line width=2pt]{ + \begin{minipage}[t][20mm][c]{.3\textwidth} + \lstinputlisting{examples/2f.tex} + \end{minipage} + }; & + \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; & + \node[draw=blue!20!lightgray, line width=2pt]{ + \begin{minipage}[t][20mm][c]{.25\textwidth} + \tiny tiny + \small small + \large large\\ + \Large Large\,\LARGE LARGE\\ + ... + \end{minipage} + }; + \\ + \node{ + \begin{minipage}[t][10mm][c]{.28\textwidth} + \begin{itemize} + \item Textfarbe + \end{itemize} + \end{minipage} + }; & + \node[draw=blue!20!lightgray, line width=2pt]{ + \begin{minipage}[t][10mm][c]{.3\textwidth} + \lstinputlisting[basicstyle=\notsotiny\ttfamily]{examples/2g.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/2g.tex} + \end{minipage} + }; + \\ }; - \\ -}; -\end{tikzpicture} + \end{tikzpicture} \end{frame} \begin{frame}[fragile]{Abschnitte} -- GitLab