Commit 89317d93 authored by Lennart Klebl's avatar Lennart Klebl
Browse files

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

parents 72cabc77 b4f421e9
...@@ -353,8 +353,7 @@ Alternativ: \verb|margin=2cm| oder \verb|left=2cm, right=2.5cm| ...@@ -353,8 +353,7 @@ Alternativ: \verb|margin=2cm| oder \verb|left=2cm, right=2.5cm|
%\verb|\usepackage[ngerman]{babel} | Silbentrennung\\ %\verb|\usepackage[ngerman]{babel} | Silbentrennung\\
\verb|\usepackage{polyglossia} | Silbentrennung\\ \verb|\usepackage{polyglossia} | Silbentrennung\\
\verb|\setmainlanguage{german} | Sprache für Silbentrennung\\ \verb|\setmainlanguage{german} | Sprache für Silbentrennung\\
\verb|\usepackage{lmodern}|\hfill schönere Standard-\LaTeX-Schrift\\ %\verb|\usepackage{lmodern}|\hfill schönere Standard-\LaTeX-Schrift\\
%\verb|\usepackage{libertine}|
\verb|\usepackage{hyperref} | siehe \autoref{sec:references} \verb|\usepackage{hyperref} | siehe \autoref{sec:references}
% %
\section{Referenzen} \section{Referenzen}
...@@ -510,7 +509,7 @@ Farbthema auswählen: \verb|\usecolortheme{rose}|\\ ...@@ -510,7 +509,7 @@ Farbthema auswählen: \verb|\usecolortheme{rose}|\\
% %
\section{Makros} \section{Makros}
Neuen Befehl definieren: \verb|\newcommand{\abc}{ABC}|\\ 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)}| Mit 2 Argumenten: \verb|\newcommand{\innerprod}[2]{(#1,#2)}|
% %
%\section{Fehlermeldungen} %\section{Fehlermeldungen}
......
...@@ -137,163 +137,168 @@ ...@@ -137,163 +137,168 @@
\begin{frame}[fragile]{Umbrüche} \begin{frame}[fragile]{Umbrüche}
\structure{Zeilen:} \structure{Zeilen:}
\vskip-\baselineskip%
\begin{tikzpicture} \begin{tikzpicture}
\node[matrix, column sep=4pt, row sep=6pt] { \node[matrix, column sep=4pt, row sep=6pt] {
\node{ & \node{\texttt{dokument.tex}}; &
\begin{minipage}[t][10mm][c]{.28\textwidth} & \node{\texttt{dokument.pdf}}; \\
\begin{itemize} \node{
\item Zeilen im \texttt{.tex} ignoriert \begin{minipage}[t][10mm][c]{.28\textwidth}
\end{itemize} \begin{itemize}
\end{minipage} \item Zeilen im \texttt{.tex} ignoriert
}; & \end{itemize}
\node[draw=blue!20!lightgray, line width=2pt]{ \end{minipage}
\begin{minipage}[t][10mm][c]{.3\textwidth} }; &
\lstinputlisting{examples/2a_umbruch.tex} \node[draw=blue!20!lightgray, line width=2pt]{
\end{minipage} \begin{minipage}[t][10mm][c]{.3\textwidth}
}; & \lstinputlisting{examples/2a_umbruch.tex}
\node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; & \end{minipage}
\node[draw=blue!20!lightgray, line width=2pt]{ }; &
\begin{minipage}[t][10mm][c]{.25\textwidth} \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; &
\input{examples/2a_umbruch.tex} \node[draw=blue!20!lightgray, line width=2pt]{
\end{minipage} \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}
};
\\
}; };
\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:} \structure{Seiten:}
\begin{tikzpicture} \begin{tikzpicture}
\node[matrix, column sep=4pt, row sep=6pt] { \node[matrix, column sep=4pt, row sep=6pt] {
\node{ \node{
\begin{minipage}[t][10mm][c]{.28\textwidth} \begin{minipage}[t][10mm][c]{.28\textwidth}
\begin{itemize} \begin{itemize}
\item Manuell neue Seite: \item Manuell neue Seite:
\end{itemize} \end{itemize}
\end{minipage} \end{minipage}
}; & }; &
\node[draw=blue!20!lightgray, line width=2pt]{ \node[draw=blue!20!lightgray, line width=2pt]{
\begin{minipage}[t][10mm][c]{.3\textwidth} \begin{minipage}[t][10mm][c]{.3\textwidth}
\lstinputlisting{examples/2d_umbruch.tex} \lstinputlisting{examples/2d_umbruch.tex}
\end{minipage} \end{minipage}
}; & }; &
\node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; & \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; &
\node[draw=blue!20!lightgray, line width=2pt]{ \node[draw=blue!20!lightgray, line width=2pt]{
\begin{minipage}[t][10mm][c]{.25\textwidth} \begin{minipage}[t][10mm][c]{.25\textwidth}
\includegraphics[width=\textwidth]{figures/newpage.png} \includegraphics[width=\textwidth]{figures/newpage.png}
\end{minipage} \end{minipage}
};
\\
}; };
\end{tikzpicture} \\
};
\end{tikzpicture}
\end{frame} \end{frame}
\begin{frame}[fragile]{Formatierung} \begin{frame}[fragile]{Formatierung}
\structure{Schrifteinstellungen:} \structure{Schrifteinstellungen:}
\begin{tikzpicture} \vskip-\baselineskip%
\node[matrix, column sep=4pt, row sep=6pt] { \begin{tikzpicture}
\node{ \node[matrix, column sep=4pt, row sep=6pt] {
\begin{minipage}[t][10mm][c]{.28\textwidth} & \node{\texttt{dokument.tex}}; &
\begin{itemize} & \node{\texttt{dokument.pdf}}; \\
\item Fontstyle \node{
\end{itemize} \begin{minipage}[t][10mm][c]{.28\textwidth}
\end{minipage} \begin{itemize}
}; & \item Fontstyle
\node[draw=blue!20!lightgray, line width=2pt]{ \end{itemize}
\begin{minipage}[t][10mm][c]{.3\textwidth} \end{minipage}
\lstinputlisting{examples/2e.tex} }; &
\end{minipage} \node[draw=blue!20!lightgray, line width=2pt]{
}; & \begin{minipage}[t][10mm][c]{.3\textwidth}
\node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; & \lstinputlisting{examples/2e.tex}
\node[draw=blue!20!lightgray, line width=2pt]{ \end{minipage}
\begin{minipage}[t][10mm][c]{.25\textwidth} }; &
\textbf{fett} \textit{kursiv}\\ \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; &
\underline{unterstrichen} \node[draw=blue!20!lightgray, line width=2pt]{
\end{minipage} \begin{minipage}[t][10mm][c]{.25\textwidth}
}; \textbf{fett} \textit{kursiv}\\
\\ \underline{unterstrichen}
\node{ \end{minipage}
\begin{minipage}[t][10mm][c]{.28\textwidth} };
\begin{itemize} \\
\item Schriftgröße \node{
\end{itemize} \begin{minipage}[t][10mm][c]{.28\textwidth}
\end{minipage} \begin{itemize}
}; & \item Schriftgröße
\node[draw=blue!20!lightgray, line width=2pt]{ \end{itemize}
\begin{minipage}[t][20mm][c]{.3\textwidth} \end{minipage}
\lstinputlisting{examples/2f.tex} }; &
\end{minipage} \node[draw=blue!20!lightgray, line width=2pt]{
}; & \begin{minipage}[t][20mm][c]{.3\textwidth}
\node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; & \lstinputlisting{examples/2f.tex}
\node[draw=blue!20!lightgray, line width=2pt]{ \end{minipage}
\begin{minipage}[t][20mm][c]{.25\textwidth} }; &
\tiny tiny \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; &
\small small \node[draw=blue!20!lightgray, line width=2pt]{
\large large\\ \begin{minipage}[t][20mm][c]{.25\textwidth}
\Large Large\,\LARGE LARGE\\ \tiny tiny
... \small small
\end{minipage} \large large\\
}; \Large Large\,\LARGE LARGE\\
\\ ...
\node{ \end{minipage}
\begin{minipage}[t][10mm][c]{.28\textwidth} };
\begin{itemize} \\
\item Textfarbe \node{
\end{itemize} \begin{minipage}[t][10mm][c]{.28\textwidth}
\end{minipage} \begin{itemize}
}; & \item Textfarbe
\node[draw=blue!20!lightgray, line width=2pt]{ \end{itemize}
\begin{minipage}[t][10mm][c]{.3\textwidth} \end{minipage}
\lstinputlisting[basicstyle=\notsotiny\ttfamily]{examples/2g.tex} }; &
\end{minipage} \node[draw=blue!20!lightgray, line width=2pt]{
}; & \begin{minipage}[t][10mm][c]{.3\textwidth}
\node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; & \lstinputlisting[basicstyle=\notsotiny\ttfamily]{examples/2g.tex}
\node[draw=blue!20!lightgray, line width=2pt]{ \end{minipage}
\begin{minipage}[t][10mm][c]{.25\textwidth} }; &
\input{examples/2g.tex} \node{\includegraphics[width=16pt]{figures/texstudio-compile.pdf}}; &
\end{minipage} \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} \end{frame}
\begin{frame}[fragile]{Abschnitte} \begin{frame}[fragile]{Abschnitte}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment