diff --git a/slides/tables.de.md b/slides/tables.de.md index 3a2ba64..828882f 100644 --- a/slides/tables.de.md +++ b/slides/tables.de.md @@ -231,6 +231,9 @@ Eine Tabelle einfärben * Farben können mit Namen, Prozentwerten (z. B. `yellow!25`) oder Hex-Codes (`[HTML]{...}`) angegeben werden. +@preview +![](svg/tables/tabelle-farbe-crop.svg){.thin-padding} + @slide(layout=extra-content-and-preview) @title @@ -252,6 +255,9 @@ Zellen verbinden * Das zweite Argument legt die Ausrichtung (und Ränder) fest. +@preview +![](svg/tables/tabelle-zellen-verbinden-crop.svg){.thin-padding} + @slide(layout=extra-content-and-preview) @title @@ -267,8 +273,8 @@ Zeilenumbruch in einer Zelle \toprule Name & Beschreibung \\ \midrule - Katze & \makecell{klein \\ schläft gerne} \\ - Hund & \makecell{treu \\ braucht Spaziergänge} \\ + Katze & \makecell[l]{klein \\ schläft gerne} \\ + Hund & \makecell[l]{treu \\ braucht Spaziergänge} \\ \bottomrule \end{tabular} ``` @@ -277,6 +283,9 @@ Zeilenumbruch in einer Zelle * Mit `\makecell[l]{Inhalt}` kann man ihn linksbündig ausrichten. +@preview +![](svg/tables/tabelle-zeilenumbruch-crop.svg){.thin-padding} + @slide(layout=extra-content-and-preview) @title @@ -295,6 +304,9 @@ Die Spalte `p{4cm}` bricht den Text automatisch auf 4cm Breite um. \end{tabular} ``` +@preview +![](svg/tables/tabelle-feste-breite-crop.svg){.thin-padding} + @slide(layout=extra-content-and-preview) @title diff --git a/slides/tables.en.md b/slides/tables.en.md index 1973469..64177bd 100644 --- a/slides/tables.en.md +++ b/slides/tables.en.md @@ -231,6 +231,9 @@ Colouring a table * Use `\rowcolor` to color entire rows. * Color can be defined by name, percentage (e.g. `yellow!25`), or hex (`[HTML]{...}`). +@preview +![](svg/tables/table-colouring-crop.svg){.thin-padding} + @slide(layout=extra-content-and-preview) @title @@ -251,6 +254,9 @@ Merge cells * `\multicolumn{2}{c}{...}` combines two columns into one. * The second argument specifies the alignment (and borders). +@preview +![](svg/tables/table-merge-cells-crop.svg){.thin-padding} + @slide(layout=extra-content-and-preview) @title @@ -266,8 +272,8 @@ Line breaks in a cell \toprule Name & Description \\ \midrule - Cat & \makecell{small \\ likes to sleep} \\ - Dog & \makecell{loyal \\ needs walks} \\ + Cat & \makecell[l]{small \\ likes to sleep} \\ + Dog & \makecell[l]{loyal \\ needs walks} \\ \bottomrule \end{tabular} ``` @@ -275,6 +281,8 @@ Line breaks in a cell * By default, `\makecell` centers its contents. * Use `\makecell[l]{content}` to left-align the content. +@preview +![](svg/tables/table-line-break-crop.svg){.thin-padding} @slide(layout=extra-content-and-preview) @@ -293,9 +301,12 @@ The `p{4cm}` column automatically wraps text within 4cm. Table & Like a chair but different \\ \bottomrule \end{tabular} - ``` +@preview +![](svg/tables/table-fixed-width-crop.svg){.thin-padding} + + @slide(layout=extra-content-and-preview) @title diff --git a/svg/tables/tabelle-farbe-crop.svg b/svg/tables/tabelle-farbe-crop.svg new file mode 100644 index 0000000..66fbee3 --- /dev/null +++ b/svg/tables/tabelle-farbe-crop.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/tabelle-farbe-orig.svg b/svg/tables/tabelle-farbe-orig.svg new file mode 100644 index 0000000..3beb60c --- /dev/null +++ b/svg/tables/tabelle-farbe-orig.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/tabelle-farbe.tex b/svg/tables/tabelle-farbe.tex new file mode 100644 index 0000000..57fc0b0 --- /dev/null +++ b/svg/tables/tabelle-farbe.tex @@ -0,0 +1,24 @@ +\documentclass[a4paper]{article} +\usepackage{lmodern} +\usepackage{amssymb,amsmath} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{hyperref} +\usepackage{booktabs} +\usepackage[table]{xcolor} +\usepackage[ngerman]{babel} +\begin{document} +\thispagestyle{empty} + +\begin{table}[h] + \begin{tabular}{lll} + \toprule + Eine & \cellcolor{yellow}gelbe & Zelle \\ + Ein & \cellcolor{yellow!25}helleres & Gelb \\ + \rowcolor[HTML]{FFDE21} + Eine & gelbe & Zeile \\ + \bottomrule + \end{tabular} +\end{table} + +\end{document} diff --git a/svg/tables/tabelle-feste-breite-crop.svg b/svg/tables/tabelle-feste-breite-crop.svg new file mode 100644 index 0000000..842f274 --- /dev/null +++ b/svg/tables/tabelle-feste-breite-crop.svg @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/tabelle-feste-breite-orig.svg b/svg/tables/tabelle-feste-breite-orig.svg new file mode 100644 index 0000000..0a44e04 --- /dev/null +++ b/svg/tables/tabelle-feste-breite-orig.svg @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/tabelle-feste-breite.tex b/svg/tables/tabelle-feste-breite.tex new file mode 100644 index 0000000..f3d0ba7 --- /dev/null +++ b/svg/tables/tabelle-feste-breite.tex @@ -0,0 +1,23 @@ +\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}{lp{4cm}} + \toprule + Gegenstand & Beschreibung \\ + \midrule + Stuhl & Vier Beine, eine Fläche \\ + Tisch & Wie ein Stuhl, aber anders \\ + \bottomrule + \end{tabular} +\end{table} + +\end{document} diff --git a/svg/tables/tabelle-zeilenumbruch-crop.svg b/svg/tables/tabelle-zeilenumbruch-crop.svg new file mode 100644 index 0000000..b220650 --- /dev/null +++ b/svg/tables/tabelle-zeilenumbruch-crop.svg @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/tabelle-zeilenumbruch-orig.svg b/svg/tables/tabelle-zeilenumbruch-orig.svg new file mode 100644 index 0000000..6a770ee --- /dev/null +++ b/svg/tables/tabelle-zeilenumbruch-orig.svg @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/tabelle-zeilenumbruch.tex b/svg/tables/tabelle-zeilenumbruch.tex new file mode 100644 index 0000000..f39aebf --- /dev/null +++ b/svg/tables/tabelle-zeilenumbruch.tex @@ -0,0 +1,24 @@ +\documentclass[a4paper]{article} +\usepackage{lmodern} +\usepackage{amssymb,amsmath} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{hyperref} +\usepackage{booktabs} +\usepackage{makecell} +\usepackage[ngerman]{babel} +\begin{document} +\thispagestyle{empty} + +\begin{table}[h] + \begin{tabular}{ll} + \toprule + Name & Beschreibung \\ + \midrule + Katze & \makecell[l]{klein \\ schläft gerne} \\ + Hund & \makecell[l]{treu \\ braucht Spaziergänge} \\ + \bottomrule + \end{tabular} +\end{table} + +\end{document} diff --git a/svg/tables/tabelle-zeilenumbruch.tex~ b/svg/tables/tabelle-zeilenumbruch.tex~ new file mode 100644 index 0000000..f75798a --- /dev/null +++ b/svg/tables/tabelle-zeilenumbruch.tex~ @@ -0,0 +1,24 @@ +\documentclass[a4paper]{article} +\usepackage{lmodern} +\usepackage{amssymb,amsmath} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{hyperref} +\usepackage{booktabs} +\usepackage{makecell} +\usepackage[ngerman]{babel} +\begin{document} +\thispagestyle{empty} + +\begin{table}[h] + \begin{tabular}{ll} + \toprule + Name & Beschreibung \\ + \midrule + Katze & \makecell{klein \\ schläft gerne} \\ + Hund & \makecell{treu \\ braucht Spaziergänge} \\ + \bottomrule + \end{tabular} +\end{table} + +\end{document} diff --git a/svg/tables/tabelle-zellen-verbinden-crop.svg b/svg/tables/tabelle-zellen-verbinden-crop.svg new file mode 100644 index 0000000..b5a3ff1 --- /dev/null +++ b/svg/tables/tabelle-zellen-verbinden-crop.svg @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/tabelle-zellen-verbinden-orig.svg b/svg/tables/tabelle-zellen-verbinden-orig.svg new file mode 100644 index 0000000..ee43a66 --- /dev/null +++ b/svg/tables/tabelle-zellen-verbinden-orig.svg @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/tabelle-zellen-verbinden.tex b/svg/tables/tabelle-zellen-verbinden.tex new file mode 100644 index 0000000..94a6133 --- /dev/null +++ b/svg/tables/tabelle-zellen-verbinden.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}{lll} + \toprule + Tier & Futter & Größe \\ + \midrule + Pferd & Heu & groß \\ + Frosch & Fliegen & klein \\ + Fooboar & \multicolumn{2}{c}{unbekannt} \\ + \bottomrule + \end{tabular} +\end{table} + +\end{document} diff --git a/svg/tables/table-colouring-crop.svg b/svg/tables/table-colouring-crop.svg new file mode 100644 index 0000000..680639a --- /dev/null +++ b/svg/tables/table-colouring-crop.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/table-colouring-orig.svg b/svg/tables/table-colouring-orig.svg new file mode 100644 index 0000000..f32e746 --- /dev/null +++ b/svg/tables/table-colouring-orig.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/table-colouring.tex b/svg/tables/table-colouring.tex new file mode 100644 index 0000000..7f6b04e --- /dev/null +++ b/svg/tables/table-colouring.tex @@ -0,0 +1,24 @@ +\documentclass[a4paper]{article} +\usepackage{lmodern} +\usepackage{amssymb,amsmath} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{hyperref} +\usepackage{booktabs} +\usepackage[table]{xcolor} +\begin{document} +\thispagestyle{empty} + +\begin{table}[h] + \begin{tabular}{lll} + \toprule + A & \cellcolor{yellow}yellow & cell \\ + A & \cellcolor{yellow!25}lighter yellow & cell \\ + \rowcolor[HTML]{FFDE21} + A & yellow & row \\ + \bottomrule + \end{tabular} +\end{table} + +\end{document} + diff --git a/svg/tables/table-fixed-width-crop.svg b/svg/tables/table-fixed-width-crop.svg new file mode 100644 index 0000000..a99d9a9 --- /dev/null +++ b/svg/tables/table-fixed-width-crop.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/table-fixed-width-orig.svg b/svg/tables/table-fixed-width-orig.svg new file mode 100644 index 0000000..902463b --- /dev/null +++ b/svg/tables/table-fixed-width-orig.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/table-fixed-width.tex b/svg/tables/table-fixed-width.tex new file mode 100644 index 0000000..5273d6b --- /dev/null +++ b/svg/tables/table-fixed-width.tex @@ -0,0 +1,22 @@ +\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}{lp{4cm}} + \toprule + Item & Description \\ + \midrule + Chair & Four legs, one surface \\ + Table & Like a chair but different \\ + \bottomrule + \end{tabular} +\end{table} + +\end{document} diff --git a/svg/tables/table-line-break-crop.svg b/svg/tables/table-line-break-crop.svg new file mode 100644 index 0000000..a39a190 --- /dev/null +++ b/svg/tables/table-line-break-crop.svg @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/table-line-break-orig.svg b/svg/tables/table-line-break-orig.svg new file mode 100644 index 0000000..277a746 --- /dev/null +++ b/svg/tables/table-line-break-orig.svg @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/table-line-break.tex b/svg/tables/table-line-break.tex new file mode 100644 index 0000000..bdec4e1 --- /dev/null +++ b/svg/tables/table-line-break.tex @@ -0,0 +1,24 @@ +\documentclass[a4paper]{article} +\usepackage{lmodern} +\usepackage{amssymb,amsmath} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{hyperref} +\usepackage{booktabs} +\usepackage{makecell} + +\begin{document} +\thispagestyle{empty} + +\begin{table}[h] + \begin{tabular}{ll} + \toprule + Name & Description \\ + \midrule + Cat & \makecell[l]{small \\ likes to sleep} \\ + Dog & \makecell[l]{loyal \\ needs walks} \\ + \bottomrule + \end{tabular} +\end{table} + +\end{document} diff --git a/svg/tables/table-line-break.tex~ b/svg/tables/table-line-break.tex~ new file mode 100644 index 0000000..c343298 --- /dev/null +++ b/svg/tables/table-line-break.tex~ @@ -0,0 +1,24 @@ +\documentclass[a4paper]{article} +\usepackage{lmodern} +\usepackage{amssymb,amsmath} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{hyperref} +\usepackage{booktabs} +\usepackage{makecell} + +\begin{document} +\thispagestyle{empty} + +\begin{table}[h] + \begin{tabular}{ll} + \toprule + Name & Description \\ + \midrule + Cat & \makecell{small \\ likes to sleep} \\ + Dog & \makecell{loyal \\ needs walks} \\ + \bottomrule + \end{tabular} +\end{table} + +\end{document} diff --git a/svg/tables/table-merge-cells-crop.svg b/svg/tables/table-merge-cells-crop.svg new file mode 100644 index 0000000..787b5af --- /dev/null +++ b/svg/tables/table-merge-cells-crop.svg @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/table-merge-cells-orig.svg b/svg/tables/table-merge-cells-orig.svg new file mode 100644 index 0000000..52156e7 --- /dev/null +++ b/svg/tables/table-merge-cells-orig.svg @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svg/tables/table-merge-cells.tex b/svg/tables/table-merge-cells.tex new file mode 100644 index 0000000..5605f9c --- /dev/null +++ b/svg/tables/table-merge-cells.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 + Animal & Food & Size \\ + \midrule + horse & hay & large \\ + frog & flies & small \\ + fooboar & \multicolumn{2}{c}{unknown} \\ + \bottomrule + \end{tabular} +\end{table} + +\end{document}