generated from tobias-hilfiker/latex-base
Merge branch 'arbeitsjournal'
# Conflicts: # main.tex
This commit is contained in:
14
main.tex
14
main.tex
@@ -40,11 +40,11 @@
|
||||
|
||||
% Advanced Table functions
|
||||
\usepackage{tabularx}
|
||||
\newcolumntype{W}{>{\hsize=1.5\hsize}X}
|
||||
\newcolumntype{w}{>{\hsize=1.25\hsize}X}
|
||||
\newcolumntype{W}{>{\hsize=2.44\hsize}X}
|
||||
\newcolumntype{w}{>{\hsize=1.5\hsize}X}
|
||||
\newcolumntype{m}{X}
|
||||
\newcolumntype{S}{>{\hsize=.75\hsize}X}
|
||||
\newcolumntype{s}{>{\hsize=.5\hsize}X}
|
||||
\newcolumntype{S}{>{\hsize=.5\hsize}X}
|
||||
\newcolumntype{s}{>{\hsize=.28\hsize}X}
|
||||
%ATTENTION WHEN USING COLUMNS -> They have to sum up to the correct count of cols: two cols mean that the sizes have to in sum be two
|
||||
|
||||
% Bibliography management
|
||||
@@ -1376,7 +1376,7 @@
|
||||
|
||||
|
||||
\section{Glossar} % Kapitel x - Glossar
|
||||
\begin{tabularx}{\textwidth}{| s | W |}
|
||||
\begin{tabularx}{\textwidth}{| S | w |}
|
||||
\hline
|
||||
\textbf{Begriff} & \textbf{Erklärung} \\ \hline
|
||||
Klimaökologische Wirksamkeit & Fähigkeit eines Systems oder Massnahme positive Auswirkungen auf ein Ökosystem oder Klima zu haben. \\ \hline
|
||||
@@ -1386,6 +1386,10 @@
|
||||
Deiche & Maritime Schutzanlage, welche das dahinter liegende Land vor Hochwasser oder Flut schützt. \\ \hline
|
||||
\end{tabularx}
|
||||
|
||||
\begin{landscape}
|
||||
\include{journal}
|
||||
\end{landscape}
|
||||
|
||||
\pagebreak %PAGEBREAK
|
||||
\bibliography{bibliography} % Kapitel 4 - Literaturverzeichnis
|
||||
|
||||
|
||||
Reference in New Issue
Block a user