diff --git a/workshops/latex/examples/doge.png b/workshops/latex/examples/doge.png new file mode 120000 index 0000000000000000000000000000000000000000..1e36764ba6ff1699f3b0d4850c5dd17e3eb6cdf1 --- /dev/null +++ b/workshops/latex/examples/doge.png @@ -0,0 +1 @@ +../figures/doge.png \ No newline at end of file diff --git a/workshops/latex/examples/figure.pdf b/workshops/latex/examples/figure.pdf new file mode 100644 index 0000000000000000000000000000000000000000..0ff09ca38ea263e769a87dec620ed393e1228769 Binary files /dev/null and b/workshops/latex/examples/figure.pdf differ diff --git a/workshops/latex/examples/figure.tex b/workshops/latex/examples/figure.tex new file mode 100644 index 0000000000000000000000000000000000000000..700549615ffddaabfe67c6956473bdccae7920f0 --- /dev/null +++ b/workshops/latex/examples/figure.tex @@ -0,0 +1,8 @@ +\begin{figure} + \centering + \includegraphics[width=4cm]{doge.png} + \caption[Doge mit Helm]{ + \label{fig:doge} Dieses Bild zeigt + einen \emph{Doge} mit Bauhelm. + } +\end{figure} diff --git a/workshops/latex/examples/generic_header.tex b/workshops/latex/examples/generic_header.tex new file mode 100644 index 0000000000000000000000000000000000000000..1ea4e8f74cc297b9cf741025e6c25b40c1fd588b --- /dev/null +++ b/workshops/latex/examples/generic_header.tex @@ -0,0 +1,7 @@ +\documentclass[12pt,a6paper,german]{article} +\usepackage[ngerman]{babel} +\usepackage{geometry} +\usepackage{graphicx} +\begin{document} +\input{figure.tex} +\end{document} diff --git a/workshops/latex/latex.tex b/workshops/latex/latex.tex index e5606be79fa63788fccdc9b5d797232578cf5508..310263235d4c94e65e8ced8dc50e546d86e41383 100644 --- a/workshops/latex/latex.tex +++ b/workshops/latex/latex.tex @@ -26,7 +26,7 @@ commentstyle=\itshape\color{RoyalBlue}, keywordstyle=\color{RoyalBlue}\bfseries, moretexcs={lstset,subsubsection,paragraph,subsection,color,sl,textcolor,lstinputlisting,newfontfamily,fontsize,section,documentclass,begin,includegraphics,hello,bye,setmainlanguage,setlength}, - morekeywords={center,document,flushleft,flushright,itemize,enumerate,tabular,article,polyglossia,geometry,amsmath,graphicx,xcolor,hyperref} + morekeywords={center,document,flushleft,flushright,itemize,enumerate,tabular,article,polyglossia,geometry,amsmath,graphicx,xcolor,hyperref,figure} } \makeatletter @@ -553,21 +553,48 @@ \end{frame} \begin{frame}[fragile]{Floats} - \structure{Floats} für Bilder, Tabellen, ... \emph{im Text} - \begin{itemize} - \item Umgebungen \highlightBlu{table} \& \highlightBlu{figure} - \item \highlightRed{\textbackslash{}centering} - \item \highlightRed{\textbackslash{}caption}\verb+{Bildunterschrift}+ - \item \highlightRed{\textbackslash{}includegraphics}\verb+{}+ \& - \highlightBlu{tabular} zusätzlich \\ - \emph{{\ttfamily\color{RoyalBlue}table} \& - {\ttfamily\color{RoyalBlue}figure} Umgebungen sind initial leer!} - % TODO Bild von float machen! - \end{itemize} + \begin{columns} + \begin{column}{0.45\textwidth} + \structure{Floats} für Bilder, Tabellen, ... \emph{im Text} + \begin{itemize} + \small + \item Umgebungen \highlightBlu{table} \& \highlightBlu{figure} + \item \highlightRed{\textbackslash{}centering} + \item \highlightRed{\textbackslash{}caption}\verb+{Text}+ + \item \highlightRed{\textbackslash{}includegraphics}\verb+{}+ \& + \highlightBlu{tabular} zusätzlich \\[5pt] + \scriptsize + \emph{{\ttfamily\color{RoyalBlue}table} \& + {\ttfamily\color{RoyalBlue}figure} Umgebungen sind initial leer!} + % TODO Bild von float machen! + \end{itemize} + \end{column} + \begin{column}{0.45\textwidth} + \begin{tikzpicture} + \node[matrix,column sep=4pt, row sep=6pt] { + \node[draw=blue!20!lightgray,line width=2pt]{ + \begin{minipage}[t][2.1cm][c]{\textwidth} + \lstinputlisting[basicstyle=\tiny]{examples/figure.tex} + \end{minipage} + }; \\ + \node[rotate=270]{ + \includegraphics[width=16pt]{figures/texstudio-compile.pdf} + }; \\ + \node[draw=blue!20!lightgray,line width=2pt]{ + \begin{minipage}[t][2.75cm][c]{\textwidth} + \centering + \includegraphics[width=0.7\textwidth]{examples/figure.pdf} + \end{minipage} + }; \\ + }; + \end{tikzpicture} + \end{column} + \end{columns} \end{frame} \begin{frame}[fragile]{Labels, Referenzen und Links} -\structure{Referenzen} markieren mit \texttt{\textbackslash label}, verweisen mit \texttt{\textbackslash ref}: +\structure{Referenzen} markieren mit \texttt{\textbackslash label}, + verweisen mit \texttt{\textbackslash ref}: \begin{tikzpicture} \node[matrix, column sep=4pt, row sep=6pt] { \node{ @@ -617,6 +644,8 @@ \begin{itemize} \item Einfügen mit \verb|\footnote{Fußnotentext}| 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]{ @@ -633,14 +662,17 @@ \\ }; \end{tikzpicture} + \vspace{-6pt} + \end{center} \structure{Besondere Zeichen} \begin{itemize} - \item \%, "{}: \texttt{\textbackslash\%}, \verb+"{}+ - \item \&, \#, \$: \texttt{\textbackslash\&, \textbackslash\#, - \textbackslash\$} - \item \textbackslash, \{, \}: \texttt{\textbackslash textbackslash, - \textbackslash\{, \textbackslash\}} - \item \^, \_, \textasciitilde: \verb|\^, \_, \textasciitilde| + \item {\bfseries\color{MidnightBlue}\%, "{}}: \texttt{\textbackslash\%}, \verb+"{}+ + \item {\bfseries\color{MidnightBlue}\&, \#, \$}: \texttt{\textbackslash\&, + \textbackslash\#, \textbackslash\$} + \item {\bfseries\color{MidnightBlue}\textbackslash, \{, \}}: \texttt{\textbackslash + textbackslash, \textbackslash\{, \textbackslash\}} + \item {\bfseries\color{MidnightBlue}\^~, \_, \textasciitilde}: % + \verb|\^, \_, \textasciitilde| %todo besser sortieren, noch was vergessen? \end{itemize} \end{frame} @@ -662,7 +694,6 @@ {\only<1>{\color{RoyalBlue}}\only<2>{\color{Green}}\rule{0.5pt}{0.8\textheight}} \end{column} \begin{column}{0.55\textwidth} - % TODO vertical alignment \only<1>{\lstinputlisting[basicstyle=\tiny\ttfamily]{examples/preamble.tex}} \only<2>{\vspace{-.5em}\includegraphics[width=0.8\textwidth]{examples/preamble.pdf}} \end{column}