diff --git a/workshops/latex/examples/2h.tex b/workshops/latex/examples/2h.tex index c002e1c55979b8422c58b9becea7571aef06a8b5..1089baa87675bf9160da0d1573f8555b4bc321f3 100644 --- a/workshops/latex/examples/2h.tex +++ b/workshops/latex/examples/2h.tex @@ -1,7 +1,7 @@ \section{Erster Teil} \subsection{Teil 1a} \subsection{Teil 1b} -\section{Zweriter Teil} +\section{Zweiter Teil} \subsection{Teil 2a} \section*{Versteckt} -\section{Weiterer Teil} \ No newline at end of file +\section{Weiterer Teil} diff --git a/workshops/latex/examples/2h_fake.pdf b/workshops/latex/examples/2h_fake.pdf index 2bbe9113e1312ce92cc880a7e99e4655f60b7bba..0336b5a6e414522feeb226a7f3faac088f0f1d00 100644 Binary files a/workshops/latex/examples/2h_fake.pdf and b/workshops/latex/examples/2h_fake.pdf differ diff --git a/workshops/latex/examples/2h_fake.tex b/workshops/latex/examples/2h_fake.tex index 50f0a71c57393f78be04273eead1fd2e219b9e68..1042fb7913e2606432f3b72b84cf09192dff027b 100644 --- a/workshops/latex/examples/2h_fake.tex +++ b/workshops/latex/examples/2h_fake.tex @@ -8,7 +8,7 @@ \section{Erster Teil} \subsection{Teil 1a} \subsection{Teil 1b} -\section{Zweriter Teil} +\section{Zweiter Teil} \subsection{Teil 2a} \section*{Versteckt} \section{Weiterer Teil} diff --git a/workshops/latex/examples/4a.tex b/workshops/latex/examples/4a.tex index 55ac308aabb8fa91f33b26c87b61748e65fc2a9f..9bd14628528b1cd841aa536abe867f158af53559 100644 --- a/workshops/latex/examples/4a.tex +++ b/workshops/latex/examples/4a.tex @@ -1,7 +1,7 @@ \begin{equation} - a^2+b^2=c^2 + a^2 + b^2 = c^2 \label{pythagoras} \end{equation} -As shown in equation +Beachte in Gleichung \ref{pythagoras} ... diff --git a/workshops/latex/examples/4c.tex b/workshops/latex/examples/4c.tex index 61c80c4306b7a8813b617f10da717e20b9d91858..9dac0ea8d48393838e3e3822a85af92bdd1aabed 100644 --- a/workshops/latex/examples/4c.tex +++ b/workshops/latex/examples/4c.tex @@ -1,2 +1,2 @@ -egestas vel odio. Dieser Beweis ist -richtig.\footnote{außer wenn $x>0$} \ No newline at end of file +dignissim rutrum. Dieser Beweis ist +richtig.\footnote{außer wenn $x>0$} diff --git a/workshops/latex/examples/figure.tex b/workshops/latex/examples/figure.tex index 700549615ffddaabfe67c6956473bdccae7920f0..dd3b1218e02ac5ab962ca65606a11f492a977ce3 100644 --- a/workshops/latex/examples/figure.tex +++ b/workshops/latex/examples/figure.tex @@ -1,7 +1,7 @@ \begin{figure} \centering \includegraphics[width=4cm]{doge.png} - \caption[Doge mit Helm]{ + \caption{ \label{fig:doge} Dieses Bild zeigt einen \emph{Doge} mit Bauhelm. } diff --git a/workshops/latex/examples/preamble.pdf b/workshops/latex/examples/preamble.pdf index bbb291590006e308ef7c59b7c028d09d0dd64a41..155bd60edb913bd35b7d01cb6e9eaf75e3a80e04 100644 Binary files a/workshops/latex/examples/preamble.pdf and b/workshops/latex/examples/preamble.pdf differ diff --git a/workshops/latex/examples/preamble.tex b/workshops/latex/examples/preamble.tex index 918ee1f5ee72b018ecd4c460c11d3953817f6770..56cf660b6c654fbc36a60192ed55b21f46f7d8c1 100644 --- a/workshops/latex/examples/preamble.tex +++ b/workshops/latex/examples/preamble.tex @@ -1,6 +1,6 @@ \documentclass[12pt,a6paper]{article} % Minimale Präambel für die meisten Fälle -\usepackage[german]{babel} +\usepackage[ngerman]{babel} \usepackage[margin=2cm]{geometry} % Rand \usepackage{mathtools} % Viel Mathe-Zeug \usepackage{graphicx} % Bilder diff --git a/workshops/latex/latex.tex b/workshops/latex/latex.tex index 77a030815a907a1ead9436956214cb36c62651b5..61b8189b25f1b10fbfa6361bbfe54076885cd30a 100644 --- a/workshops/latex/latex.tex +++ b/workshops/latex/latex.tex @@ -130,8 +130,8 @@ %\OSAKthemenologo \subsection{\TeX{}studio als Editor} -\begin{frame}{TeXStudio (Editor)} - \vspace{-8pt} +\begin{frame}{\TeX{}Studio (Editor)} + \vspace{-3.8pt}% \includegraphics[width=\textwidth]{figures/texstudio.png} \end{frame} @@ -140,8 +140,8 @@ \vskip-\baselineskip% \begin{tikzpicture} \node[matrix, column sep=4pt, row sep=6pt] { - & \node{\texttt{dokument.tex}}; & - & \node{\texttt{dokument.pdf}}; \\ + & \node[anchor=base]{\texttt{dokument.tex}}; & + & \node[anchor=base]{\texttt{dokument.pdf}}; \\ \node{ \begin{minipage}[t][10mm][c]{.28\textwidth} \begin{itemize} @@ -227,14 +227,13 @@ \end{tikzpicture} \end{frame} - \begin{frame}[fragile]{Formatierung} \structure{Schrifteinstellungen:} \vskip-\baselineskip% \begin{tikzpicture} \node[matrix, column sep=4pt, row sep=6pt] { - & \node{\texttt{dokument.tex}}; & - & \node{\texttt{dokument.pdf}}; \\ + & \node[anchor=base]{\texttt{dokument.tex}}; & + & \node[anchor=base]{\texttt{dokument.pdf}}; \\ \node{ \begin{minipage}[t][10mm][c]{.28\textwidth} \begin{itemize} @@ -302,26 +301,27 @@ \end{frame} \begin{frame}[fragile]{Abschnitte} -\begin{columns} - \begin{column}{0.4\textwidth} - \structure{section, subsection, subsubsection:} - \begin{itemize} - \item Überschriften (automatisch nummeriert) - \begin{tikzpicture} - \node[draw=blue!20!lightgray, line width=2pt]{ - \begin{minipage}[t][22mm][c]{0.7\textwidth} - \lstinputlisting[basicstyle=\notsotiny\ttfamily]{examples/2h.tex} - \end{minipage} - }; - \end{tikzpicture} - \item Inhaltsverzeichnis (automatisch erstellt) - \texttt{\textbackslash tableofcontents} - \end{itemize} - \end{column} - \begin{column}{0.5\textwidth} - \includegraphics[width=\textwidth,trim=0cm 0cm 0cm 0cm, clip]{examples/2h_fake.pdf} - \end{column} -\end{columns} + \begin{columns} + \begin{column}{0.48\textwidth} + \structure{section, subsection, subsubsection:} + \begin{itemize} + \item Überschriften\\(automatisch nummeriert)\\[2pt] + \begin{tikzpicture} + \node[draw=blue!20!lightgray, line width=2pt]{ + \begin{minipage}[t][22mm][c]{0.7\textwidth} + \lstinputlisting[basicstyle=\notsotiny\ttfamily]{examples/2h.tex} + \end{minipage} + }; + \end{tikzpicture} + \item Inhaltsverzeichnis\\(automatisch erstellt)\\[2pt] + \texttt{\textbackslash tableofcontents} + \end{itemize} + \vspace*{24pt} + \end{column} + \begin{column}{0.5\textwidth} + \includegraphics[width=\textwidth,trim=0cm 0cm 0cm 0cm, clip]{examples/2h_fake.pdf} + \end{column} + \end{columns} \end{frame} \begin{frame}[fragile]{Umgebungen} @@ -385,13 +385,13 @@ \item \highlightBlu{equation}{\bfseries:} Vom Text abgesetzte Gleichung \\[10pt] \item \highlightBlu{align}{\bfseries:} Wie \highlightBlu{equation}, nur dass man an \highlightRed{\&} - \glqq tabben\grqq\ kann \\[10pt] - \item Wie bei z.\,B. \highlightRed{\textbackslash section*\{...\}} auch - hier \highlightRed{*} für - nicht-nummerierte Gleichungen, also \highlightRed{\textbackslash begin\{}% + ausrichten kann \\[10pt] + \item Wie bei z.\,B. \highlightRed{\textbackslash section*\{...\}} auch:\\ + \highlightBlu{*} für nicht-nummerierte Gleichungen, also + \highlightRed{\textbackslash begin\{}% \highlightBlu{align*}\highlightRed{\}} \\[10pt] \end{itemize} - \structure{Im Textfluss} kann man Gleichungen mit \highlightRed{\$ ... \$} + \structure{Im Textfluss} kann man Gleichungen mit \highlightRed{\$...\$} schreiben, also z.\,B. \begin{center} \begin{tikzpicture} @@ -511,12 +511,13 @@ \begin{frame}{Detexify}{\url{http://detexify.kirelabs.org}} \vspace{-18pt} \includegraphics[width=\textwidth]{figures/detexify.png} + \note[\centering]{\large auf \texttt{\textbackslash usepackage} achten!}% \end{frame} \begin{frame}[fragile]{Bilder \& Tabellen} \begin{itemize} \item \highlightRed{\textbackslash% - includegraphics}\texttt{[optional]}\highlightRed{\{\}}, um Bilder + includegraphics}\texttt{[optional]}\highlightRed{\{...\}}, um Bilder einzubinden (bspw. \texttt{width=0.9\textbackslash textwidth} als Option) \begin{tikzpicture} \node[matrix,column sep=4pt, row sep=6pt] { @@ -563,10 +564,10 @@ \item Mit \highlightRed{\textbackslash{}includegraphics} bzw. \highlightBlu{tabular} für Inhalt \scriptsize\\ -(\emph{{\ttfamily\color{RoyalBlue}table} \& - {\ttfamily\color{RoyalBlue}figure} sind initial leer!}) -\normalsize -\\[12pt] + (\emph{{\ttfamily\color{RoyalBlue}table} \& + {\ttfamily\color{RoyalBlue}figure} sind initial leer!}) + \normalsize + \\[12pt] \item \highlightRed{\textbackslash{}centering} für zentrierten Inhalt \\[12pt] \item \highlightRed{\textbackslash{}caption}\verb+{Text}+ für Beschriftung und Verweise\\[12pt] @@ -599,50 +600,50 @@ \begin{frame}[fragile]{Labels, Referenzen und Links} \structure{Referenzen} markieren mit \texttt{\bfseries\color{Mahogany}\textbackslash label}, - verweisen mit \texttt{\bfseries\color{Mahogany}\textbackslash ref}: -\begin{tikzpicture} -\node[matrix, column sep=4pt, row sep=6pt] { - \node{ - \begin{minipage}[t][10mm][c]{.28\textwidth} - \begin{itemize} - \item Gleichungen, Sections, Figures und vieles mehr! - \end{itemize} - \end{minipage} - }; & - \node[draw=blue!20!lightgray, line width=2pt]{ - \begin{minipage}[t][30mm][c]{.3\textwidth} - \lstinputlisting{examples/4a.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/4a.tex} - \end{minipage} - }; - \\ - \node{ - \begin{minipage}[t][10mm][c]{.28\textwidth} - \begin{itemize} - \item \highlightRed{\bsl ref} darf auch vor vor dem \highlightRed{\bsl - label} stehen - \end{itemize} - \end{minipage} - }; & - \node[draw=blue!20!lightgray, line width=2pt]{ - \begin{minipage}[t][30mm][c]{.3\textwidth} - \lstinputlisting{examples/4b.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} - \includegraphics[width=\textwidth,trim=0cm 0cm 0cm 0cm, clip]{examples/4b_fake.png} - \end{minipage} - }; - \\ -}; -\end{tikzpicture} + verweisen mit \texttt{\bfseries\color{Mahogany}\textbackslash ref}:\\[2pt] + \hspace*{-6pt}\begin{tikzpicture} + \node[matrix, column sep=3pt, row sep=8pt] { + \node{ + \begin{minipage}[t][10mm][c]{.28\textwidth} + \begin{itemize} + \item Gleichungen, Sections, Figures und vieles mehr! + \end{itemize} + \end{minipage} + }; & + \node[draw=blue!20!lightgray, line width=2pt]{ + \begin{minipage}[t][26mm][c]{.3\textwidth} + \lstinputlisting{examples/4a.tex} + \end{minipage} + }; & + \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; & + \node[draw=blue!20!lightgray, line width=2pt]{ + \begin{minipage}[t][26mm][c]{.25\textwidth} + \input{examples/4a.tex} + \end{minipage} + }; + \\ + \node{ + \begin{minipage}[t][10mm][c]{.28\textwidth} + \begin{itemize} + \item \highlightRed{\bsl ref} darf auch vor dem + \highlightRed{\bsl label} stehen + \end{itemize} + \end{minipage} + }; & + \node[draw=blue!20!lightgray, line width=2pt]{ + \begin{minipage}[t][26mm][c]{.3\textwidth} + \lstinputlisting{examples/4b.tex} + \end{minipage} + }; & + \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; & + \node[draw=blue!20!lightgray, line width=2pt]{ + \begin{minipage}[t][26mm][c]{.25\textwidth} + \includegraphics[width=\textwidth,trim=0cm 0cm 0cm 0cm, clip]{examples/4b_fake.png} + \end{minipage} + }; + \\ + }; + \end{tikzpicture} \end{frame} \begin{frame}[fragile]{Verschiedenes} @@ -652,26 +653,27 @@ irgendwo: \end{itemize} \begin{center} - \vspace{-6pt} - \begin{tikzpicture} - \node[matrix, column sep=4pt, row sep=6pt] { - \node[draw=blue!20!lightgray, line width=2pt]{ - \begin{minipage}[t][30mm][c]{.5\textwidth} - \lstinputlisting{examples/4c.tex} - \end{minipage} - }; & - \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; & - \node[draw=blue!20!lightgray, line width=2pt]{ - \begin{minipage}[t][30mm][c]{.3\textwidth} - \includegraphics[width=1\textwidth,trim=0cm 0cm 0cm 0cm, clip]{examples/4c_fake.png} - \end{minipage} + \vspace{-8pt} + \begin{tikzpicture} + \node[matrix, column sep=4pt, row sep=0pt] { + \node[draw=blue!20!lightgray, line width=2pt]{ + \begin{minipage}[t][24mm][c]{.5\textwidth} + \lstinputlisting{examples/4c.tex} + \end{minipage} + }; & + \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; & + \node[draw=blue!20!lightgray, line width=2pt]{ + \begin{minipage}[t][24mm][c]{.3\textwidth} + \includegraphics[width=1\textwidth,trim=0cm 0cm 0cm 0cm, clip]{examples/4c_fake.png} + \end{minipage} + }; + \\ }; - \\ - }; - \end{tikzpicture} - \vspace{-6pt} + \end{tikzpicture} + \vspace{-8pt} \end{center} - \structure{URLs:} \highlightRed{\textbackslash url}\verb+{http://fsmpi.eu/latex}+ \\ + \structure{URLs:} + \highlightRed{\textbackslash url}\verb+{http://fsmpi.eu/latex}+ \\[2pt] \structure{Besondere Zeichen} \begin{itemize} \item {\bfseries\color{MidnightBlue}\%, "{}}: \texttt{\textbackslash\%}, \verb+"{}+ @@ -687,7 +689,7 @@ \begin{frame}[fragile]{Präambel} \begin{columns} - \begin{column}{0.4\textwidth} + \begin{column}{0.45\textwidth} \structure{Die \glqq{Präambel}\grqq} wird benutzt für \\[3pt] \begin{itemize} \item Dokumententyp: \\ @@ -697,16 +699,19 @@ \item Macros definieren: \\ \highlightRed{\textbackslash{}newcommand} \\[4pt] \item \highlightRed{\textbackslash{}begin}\verb+{document}+ \\ + \hspace{1em}Inhalt\\ \highlightRed{\textbackslash{}end}\verb+{document}+ \end{itemize} + \vspace{12pt} \end{column} \hspace{10pt} \begin{column}{0.05\textwidth} {\only<1>{\color{RoyalBlue}}\only<2>{\color{Green}}\rule{0.5pt}{0.8\textheight}} \end{column} - \begin{column}{0.55\textwidth} + \begin{column}{0.45\textwidth} + \vspace*{-20pt} \only<1>{\lstinputlisting[basicstyle=\tiny\ttfamily]{examples/preamble.tex}} - \only<2>{\vspace{-.5em}\includegraphics[width=0.8\textwidth]{examples/preamble.pdf}} + \only<2>{\includegraphics[width=\textwidth]{examples/preamble.pdf}\vspace{-10pt}} \end{column} \hspace{-10pt} \end{columns} diff --git a/workshops/latex/makefile b/workshops/latex/makefile index 71eb01b944be67c88d844c249797f9b411ad16c1..dc44ec003e81bff5d2d290b3c0ecbf34e91e3f5c 100644 --- a/workshops/latex/makefile +++ b/workshops/latex/makefile @@ -1,9 +1,16 @@ #!/bin/make -f EXAMPLES = examples/2h_fake.pdf examples/tabular.pdf examples/figure.pdf examples/preamble.pdf +EXAMPLE_INPUTS = $(wildcard examples/*.tex) -latex.pdf: latex.tex $(EXAMPLES) +latex.pdf: latex.tex $(EXAMPLES) $(EXAMPLE_INPUTS) latexmk -lualatex latex.tex -notes.pdf: latex.tex $(EXAMPLES) +notes.pdf: latex.tex $(EXAMPLES) $(EXAMPLE_INPUTS) latexmk -lualatex notes.tex + +examples/2h_fake.pdf: examples/2h_fake.tex + cd examples; latexmk --lualatex 2h_fake.tex + +examples/preamble.pdf: examples/preamble.tex + cd examples; latexmk --lualatex preamble.tex