diff --git a/sections/german/08/08.md b/sections/german/08/08.md index c8166da..8ca4f36 100644 --- a/sections/german/08/08.md +++ b/sections/german/08/08.md @@ -17,10 +17,10 @@ \item Mehl \item Milch \end{itemize} -

Die einzelnen Stichpunkte werden innerhalb der itemize-Umgebung durch den Befehl \item gekennzeichnet.

+

Die einzelnen Stichpunkte werden in jeder Aufzählungsumgebung durch den Befehl \item gekennzeichnet.

- +
@@ -43,8 +43,8 @@ \end{description}
- - + +
@@ -56,15 +56,15 @@

Das Paket paralist stellt Aufzählungen ohne riesige Zwischenräume zur Verfügung.

\section{Zutaten}
 \begin{compactitem}
-  % ...
+  % \item ...
 \end{compactitem}
 \section{Zubereitung}
 \begin{compactenum}
-  % ...
+  % \item ...
 \end{compactenum}
 \section{Glossar}
 \begin{compactdesc}
-  % ...
+  % \item ...
 \end{compactdesc}
@@ -77,8 +77,8 @@

Verschachtelte Listen

-

Listen lassen sich beliebig verschachteln.

\begin{compactitem}
+	% ...
   \item Gemüse \begin{compactitem}
     \item Passierte Tomaten
     \item Möhren
diff --git a/sections/german/08/nested-lists-crop.svg b/sections/german/08/nested-lists-crop.svg
index 9fde8bb..1217ce9 100644
--- a/sections/german/08/nested-lists-crop.svg
+++ b/sections/german/08/nested-lists-crop.svg
@@ -39,107 +39,101 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
-
-
+
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
 
 
-
-
+
+
 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-
+
 
 
-
-
-
 
 
 
@@ -171,189 +165,187 @@
 
 
   
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
 
-  
-  
-  
+  
 
 
-  
+  
+  
+  
 
 
-  
-
-
-  
-  
-  
-  
-  
-  
-  
-  
-
-
-  
-
-
-  
-  
-  
-  
-  
-  
+  
+  
+  
 
 
   
 
 
-  
-  
-  
-  
-  
-  
+  
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+  
+
+
+  
+  
+  
+  
+  
+  
 
 
   
 
 
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
 
 
   
 
 
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
 
 
-  
-  
-  
+  
 
 
-  
+  
+  
+  
+  
+  
 
 
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
 
 
-  
-  
+  
 
 
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
 
 
-  
-  
+  
+  
 
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
 
 
-  
-  
+  
+  
 
 
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
 
-  
-  
+  
+  
 
 
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
 
 
-  
-  
+  
 
 
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
 
 
   
 
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+
+
+  
 
 
   
 
 
-  
-  
-  
-  
+  
+  
+  
+  
 
 
   
 
 
-  
-  
-  
-  
-
-
-  
+  
+  
+  
+  
+  
+  
 
 
 
diff --git a/sections/german/08/nested-lists-orig.svg b/sections/german/08/nested-lists-orig.svg
index 11b9d28..3f1d1b8 100644
--- a/sections/german/08/nested-lists-orig.svg
+++ b/sections/german/08/nested-lists-orig.svg
@@ -39,107 +39,101 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
-
-
+
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
 
 
-
-
+
+
 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-
+
 
 
-
-
-
 
 
 
@@ -171,189 +165,187 @@
 
 
   
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
 
-  
-  
-  
+  
 
 
-  
+  
+  
+  
 
 
-  
-
-
-  
-  
-  
-  
-  
-  
-  
-  
-
-
-  
-
-
-  
-  
-  
-  
-  
-  
+  
+  
+  
 
 
   
 
 
-  
-  
-  
-  
-  
-  
+  
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+  
+
+
+  
+  
+  
+  
+  
+  
 
 
   
 
 
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
 
 
   
 
 
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
 
 
-  
-  
-  
+  
 
 
-  
+  
+  
+  
+  
+  
 
 
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
 
 
-  
-  
+  
 
 
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
 
 
-  
-  
+  
+  
 
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
 
 
-  
-  
+  
+  
 
 
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
 
-  
-  
+  
+  
 
 
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
 
 
-  
-  
+  
 
 
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
 
 
   
 
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+
+
+  
 
 
   
 
 
-  
-  
-  
-  
+  
+  
+  
+  
 
 
   
 
 
-  
-  
-  
-  
-
-
-  
+  
+  
+  
+  
+  
+  
 
 
 
diff --git a/sections/german/08/nested-lists.tex b/sections/german/08/nested-lists.tex
index 44a0ab7..634028a 100644
--- a/sections/german/08/nested-lists.tex
+++ b/sections/german/08/nested-lists.tex
@@ -10,6 +10,7 @@
 
 \begin{compactitem}
   \item Nudelplatten
+  \item Mozzarella
   \item Gemüse \begin{compactitem}
     \item Passierte Tomaten
     \item Möhren
@@ -20,12 +21,11 @@
     \item Oregano
     \item Basilikum
     \item Rosmarin
-    \item Salz
-    \item Pfeffer
   \end{compactenum}
-  \item Mozzarella
   \item Mehl
   \item Milch
+  \item Salz
+  \item Pfeffer
 \end{compactitem}
 
 \end{document}
diff --git a/sections/german/10/10.md b/sections/german/10/10.md
index 9e7f0ba..7cdeb98 100644
--- a/sections/german/10/10.md
+++ b/sections/german/10/10.md
@@ -79,7 +79,7 @@ Eine Überschrift wird so ausgezeichnet:
 }
- +
@@ -98,6 +98,6 @@ breaklines=true, ]{javascript} % ... \end{minted} -

🔗 Dokumentation von Overleaf

+

🔗 Einführung und offizielle Dokumentation

\ No newline at end of file diff --git a/sections/german/12/12.md b/sections/german/12/12.md index bd4a476..38122f9 100644 --- a/sections/german/12/12.md +++ b/sections/german/12/12.md @@ -1,12 +1,192 @@
-

Tabellen

+

🗒️
Tabellen

--- -TODO: Tabellen (booktabs, Möglichkeit für Querformat) +
+
+

Grundstruktur

+

Für typografisch schöne Tabellen nutzen wir das Paket booktabs.

+
\usepackage{booktabs}
+
\begin{table}[position]
+	\begin{tabular}{Spaltendefinition}
+		% Tabelleninhalt
+	\end{tabular}
+	\caption{Tabellenunterschrift}
+\end{table}
+

Die Positionierung erfolgt analog zu Grafiken.

+
+
+ +--- + +
+
+

Spaltendefinitionen

+
\begin{tabular}{lrcl}
+    % Tabelleninhalt
+\end{tabular}
+ + + + + + + + + + + + + + + + + +
KürzelBedeutung
llinksbündige Spalte
czentrierte Spalte
rrechtsbündige Spalte
+

Hinweis: Vertikale Trennlinien und doppelte horizontale Linien sind unter Typograph\*innen nicht gern gesehen.

+
+
+ +
+
+ +--- + +
+
+

Tabelleninhalt

+
\begin{tabular}{lll}
+    \toprule
+    Spalte 1 & Spalte 2 & Spalte 3 \\\\
+    \midrule
+    Inhalt a & Inhalt b & Inhalt c \\\\
+    Inhalt e & Inhalt f & Inhalt g \\\\
+    Inhalt i & Inhalt j & Inhalt k \\\\
+    \bottomrule
+\end{tabular}
+ +
+
+ +
+
+ +--- + +
+
+

Die gesamte Tabelle

+
\begin{table}[h]
+	\begin{tabular}{lrcl} \toprule
+        Sprache & Autor             & Erscheinungsjahr & Aktuelle Version   \\\\
+        \midrule
+        C++     & Bjarne Stroustrup & 1985             & ISO/IEC 14882:2017 \\\\
+        Java    & James Gosling     & 1998             & 12.0.1             \\\\
+        Python  & Guido van Rossum  & 1991             & 3.7.3              \\\\
+        \bottomrule
+	\end{tabular}
+	\caption{Bekannte Programmiersprachen}
+\end{table}
+
+
+ +--- + +
+
+

Besonders lange Tabellen

+

Tabellen, die über mehrere Seiten gehen, werden von tabular einfach abgeschnitten. Die Lösung bietet hier das Paket longtable:

+
\usepackage{longtable}
+
\begin{longtable}{lll}
+    % Tabelleninhalt
+    \caption{Untertitel}
+    \label{tab:bsptab1}
+\end{longtable}
+
+
+ +--- + +
+
+

Hinweise zu longtable

+
\begin{longtable}{lll}
+    % Tabelleninhalt
+    \caption{Untertitel}
+    \label{tab:bsptab1}
+\end{longtable}
+ +
+
+ +--- + +
+
+

Besonders breite Tabellen

+

Sollte die Tabelle einmal zu breit für eine Seite werden, können einzelne Seiten auch im Querformat dargestellt werden:

+
\usepackage{lscape}
+
\begin{landscape}
+    \begin{table}[h]
+        \begin{tabular}{lll}
+            % Tabelleninhalt
+        \end{tabular}
+    \end{table}
+\end{landscape}
+
+
+ +--- + +
+
+

Weiterführendes Beispiel

+
\begin{table}[h]
+    \begin{tabular}{llr}
+        \toprule
+        Struktur & \multicolumn{2}{l}{Zeitkomplexität für Zugriff} \\ \cmidrule(r){2-3}
+        & Average & Worst \\
+        \midrule
+        Stack & $\mathcal{O}(n)$ & $\mathcal{O}(n)$ \\
+        Binärbaum & $\mathcal{O}(log(n))$ & $\mathcal{O}(log(n))$ \\
+        AVL-Baum & $\mathcal{O}(log(n))$ & $\mathcal{O}(log(n))$ \\
+        \bottomrule
+    \end{tabular}
+\end{table}
+

+ 🔗 Dokumentation zu Booktabs +

+
+
+ +
+
+ +--- + +
+
+

Vereinfachung

+

+ Der Tables Generator ist ein wunderbares Werkzeug, um schnell Tabellen verschiedener Formate zu erstellen. +

+ + + +
+
--- diff --git a/sections/german/12/table-advanced-example-crop.svg b/sections/german/12/table-advanced-example-crop.svg new file mode 100644 index 0000000..f0c53b1 --- /dev/null +++ b/sections/german/12/table-advanced-example-crop.svg @@ -0,0 +1,347 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sections/german/12/table-advanced-example-orig.svg b/sections/german/12/table-advanced-example-orig.svg new file mode 100644 index 0000000..57082e3 --- /dev/null +++ b/sections/german/12/table-advanced-example-orig.svg @@ -0,0 +1,347 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sections/german/12/table-advanced-example.tex b/sections/german/12/table-advanced-example.tex new file mode 100644 index 0000000..f1c5c71 --- /dev/null +++ b/sections/german/12/table-advanced-example.tex @@ -0,0 +1,24 @@ +\documentclass[a4paper]{article} +\usepackage{lmodern} +\usepackage{amssymb,amsmath} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{hyperref} +\usepackage{booktabs} +\begin{document} +\thispagestyle{empty} + +\begin{table}[h] + \begin{tabular}{llr} + \toprule + Struktur & \multicolumn{2}{l}{Zeitkomplexität für Zugriff} \\ \cmidrule(r){2-3} + & Average & Worst \\ + \midrule + Stack & $\mathcal{O}(n)$ & $\mathcal{O}(n)$ \\ + Binärbaum & $\mathcal{O}(log(n))$ & $\mathcal{O}(log(n))$ \\ + AVL-Baum & $\mathcal{O}(log(n))$ & $\mathcal{O}(log(n))$ \\ + \bottomrule +\end{tabular} +\end{table} + +\end{document} diff --git a/sections/german/12/table-content-example-crop.svg b/sections/german/12/table-content-example-crop.svg new file mode 100644 index 0000000..11367ec --- /dev/null +++ b/sections/german/12/table-content-example-crop.svg @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sections/german/12/table-content-example-orig.svg b/sections/german/12/table-content-example-orig.svg new file mode 100644 index 0000000..997e940 --- /dev/null +++ b/sections/german/12/table-content-example-orig.svg @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sections/german/12/table-content-example.tex b/sections/german/12/table-content-example.tex new file mode 100644 index 0000000..33d21fb --- /dev/null +++ b/sections/german/12/table-content-example.tex @@ -0,0 +1,23 @@ +\documentclass[a4paper]{article} +\usepackage{lmodern} +\usepackage{amssymb,amsmath} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{hyperref} +\usepackage{booktabs} +\begin{document} +\thispagestyle{empty} + +\begin{table}[h] + \begin{tabular}{lll} + \toprule + Spalte 1 & Spalte 2 & Spalte 3 \\ + \midrule + Inhalt a & Inhalt b & Inhalt c \\ + Inhalt e & Inhalt f & Inhalt g \\ + Inhalt i & Inhalt j & Inhalt k \\ + \bottomrule +\end{tabular} +\end{table} + +\end{document} diff --git a/sections/german/12/table-example-crop.svg b/sections/german/12/table-example-crop.svg new file mode 100644 index 0000000..68e6178 --- /dev/null +++ b/sections/german/12/table-example-crop.svg @@ -0,0 +1,408 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sections/german/12/table-example-orig.svg b/sections/german/12/table-example-orig.svg new file mode 100644 index 0000000..ad28ec1 --- /dev/null +++ b/sections/german/12/table-example-orig.svg @@ -0,0 +1,408 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sections/german/12/table-example.tex b/sections/german/12/table-example.tex new file mode 100644 index 0000000..ca7ce22 --- /dev/null +++ b/sections/german/12/table-example.tex @@ -0,0 +1,24 @@ +\documentclass[a4paper]{article} +\usepackage{lmodern} +\usepackage{amssymb,amsmath} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{hyperref} +\usepackage{booktabs} +\usepackage[ngerman]{babel} +\begin{document} +\thispagestyle{empty} + +\begin{table}[h] + \begin{tabular}{lrcl} \toprule + Sprache & Autor & Erscheinungsjahr & Aktuelle Version \\ + \midrule + C++ & Bjarne Stroustrup & 1985 & ISO/IEC 14882:2017 \\ + Java & James Gosling & 1998 & 12.0.1 \\ + Python & Guido van Rossum & 1991 & 3.7.3 \\ + \bottomrule + \end{tabular} + \caption{Bekannte Programmiersprachen} +\end{table} + +\end{document} diff --git a/sections/german/12/tables-generator.png b/sections/german/12/tables-generator.png new file mode 100644 index 0000000..70dbc77 Binary files /dev/null and b/sections/german/12/tables-generator.png differ