From 2e3dddfbd703ccb1c0a16b52dd679d825beca0a3 Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Tue, 11 Oct 2022 21:13:28 +0200 Subject: [PATCH] Refactor lists --- slides/chapter-08.de.md | 81 ++-- slides/chapter-08.en.md | 82 ++-- svg/chapter-08/nested-lists-crop.svg | 474 ++++++++----------- svg/chapter-08/nested-lists-english-crop.svg | 249 ++++------ svg/chapter-08/nested-lists-english-orig.svg | 247 ++++------ svg/chapter-08/nested-lists-english.tex | 18 +- svg/chapter-08/nested-lists-orig.svg | 472 ++++++++---------- svg/chapter-08/nested-lists.tex | 18 +- 8 files changed, 655 insertions(+), 986 deletions(-) diff --git a/slides/chapter-08.de.md b/slides/chapter-08.de.md index f709d82..c257631 100644 --- a/slides/chapter-08.de.md +++ b/slides/chapter-08.de.md @@ -56,6 +56,43 @@ Geordnete Listen und Definitionslisten @slide(layout=content-and-preview) +@title +Verschachtelte Listen + +@content +``` {.lang-tex .hljs} +\begin{itemize} + % … + \item Gemüse \begin{itemize} + \item Passierte Tomaten + \item Möhren + \end{itemize} + \item Kräuter \begin{enumerate} + \item Oregano + \item Basilikum + \end{enumerate} + % … +\end{itemize} +``` + +@preview +![](svg/chapter-08/nested-lists-crop.svg) + +@slide(layout=task) + +@task-number +8 + +@title +Aufzählungen einfügen + +@content +* Formatiert das Rezept in `lists.tex` im Ordner `exercises/lists` als **ungeordnete Liste** mit den Elementen *Ingredients* und *Instructions*. Nutzt dafür den Befehl `\itemize`. +* Benutzt innerhalb dieser Liste für die Zutaten eine **ungeordnete Liste** und für die Arbeitsschritte eine **geordnete Liste**. + + +@slide(layout=extra-content-and-preview) + @title Kompakte Listen @@ -80,7 +117,7 @@ Das Paket `paralist` stellt Aufzählungen ohne riesige Zwischenräume zur Verfü @preview ![](svg/chapter-08/compact-crop.svg) -@slide(layout=content-and-preview) +@slide(layout=extra-content-and-preview) @title Aufzählungen im Absatz @@ -102,34 +139,8 @@ Natürlich gibt es auch hier ein Pendant namens `inparaenum` für geordnete List @preview -@slide(layout=content-and-preview) -@title -Verschachtelte Listen - -@content -``` {.lang-tex .hljs} -\begin{compactitem} - % … - \item Gemüse \begin{compactitem} - \item Passierte Tomaten - \item Möhren - \item Erbsen - \item Zwiebeln - \end{compactitem} - \item Kräuter \begin{compactenum} - \item Oregano - \item Basilikum - \item Rosmarin - \end{compactenum} - % … -\end{compactitem} -``` - -@preview -![](svg/chapter-08/nested-lists-crop.svg) - -@slide(layout=content-and-preview) +@slide(layout=extra-content-and-preview) @title Aufzählungsarten @@ -150,16 +161,4 @@ Die Art der Aufzählung lässt sich über den optionalen Parameter `label` ände ``` @preview -![](svg/chapter-08/list-style-types-crop.svg) - -@slide(layout=task) - -@task-number -8 - -@title -Aufzählungen einfügen - -@content -* Formatiert das Rezept in `lists.tex` im Ordner `exercises/lists` als **ungeordnete Liste** mit den Elementen *Ingredients* und *Instructions*. Nutzt dafür den Befehl `\itemize`. -* Benutzt innerhalb dieser Liste für die Zutaten eine **ungeordnete Liste** und für die Arbeitsschritte eine **geordnete Liste**. +![](svg/chapter-08/list-style-types-crop.svg) \ No newline at end of file diff --git a/slides/chapter-08.en.md b/slides/chapter-08.en.md index 415463b..779aa6f 100644 --- a/slides/chapter-08.en.md +++ b/slides/chapter-08.en.md @@ -57,6 +57,44 @@ Ordered and definition lists @slide(layout=content-and-preview) +@title +Nested lists + +@content +``` {.lang-tex .hljs} +\begin{itemize} + % … + \item vegetables \begin{itemize} + \item crushed tomatoes + \item carrots + \end{itemize} + \item herbs \begin{enumerate} + \item oregano + \item basil + \end{enumerate} + % … +\end{itemize} +``` + +@preview +![](svg/chapter-08/nested-lists-english-crop.svg) + + +@slide(layout=task) + +@task-number +8 + +@title +Adding enumerations + +@content +* Turn the recipe in `lists.tex` into an **unordered list** consisting of the elements *Ingredients* and *Instructions*. You can find the file in the directory `exercises/lists`. Use the `itemize` command. +* Within this list, create a **unordered list** for the ingredients and a **ordered list** for the instructions. + + +@slide(layout=extra-content-and-preview) + @title Compact lists @@ -81,7 +119,7 @@ The package `paralist` offers enumerations with less line spacing. @preview ![](svg/chapter-08/compact-english-crop.svg) -@slide(layout=content-and-preview) +@slide(layout=extra-content-and-preview) @title In-line enumerations @@ -103,34 +141,8 @@ Of course, there is an accompanying list type called `inparaenum` for ordered li @preview -@slide(layout=content-and-preview) -@title -Nested lists - -@content -``` {.lang-tex .hljs} -\begin{compactitem} - % … - \item vegetables \begin{compactitem} - \item crushed tomatoes - \item carrots - \item peas - \item onions - \end{compactitem} - \item herbs \begin{compactenum} - \item oregano - \item basil - \item rosemary - \end{compactenum} - % … -\end{compactitem} -``` - -@preview -![](svg/chapter-08/nested-lists-english-crop.svg) - -@slide(layout=content-and-preview) +@slide(layout=extra-content-and-preview) @title List styles @@ -152,16 +164,4 @@ To accomplish this, we need to include the package `enumitem` first. ``` @preview -![](svg/chapter-08/list-style-types-english-crop.svg) - -@slide(layout=task) - -@task-number -8 - -@title -Adding enumerations - -@content -* Turn the recipe in `lists.tex` into an **unordered list** consisting of the elements *Ingredients* and *Instructions*. You can find the file in the directory `exercises/lists`. Use the `itemize` command. -* Within this list, create a **unordered list** for the ingredients and a **ordered list** for the instructions. +![](svg/chapter-08/list-style-types-english-crop.svg) \ No newline at end of file diff --git a/svg/chapter-08/nested-lists-crop.svg b/svg/chapter-08/nested-lists-crop.svg index 1217ce9..2d6abdb 100644 --- a/svg/chapter-08/nested-lists-crop.svg +++ b/svg/chapter-08/nested-lists-crop.svg @@ -1,351 +1,261 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + + - + - - - + + + - - - + + + - + - + - - - - - - - - + + + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + + - + + - - - - - + + + + + + + - - - + + - + + + + + + + + + - - - - - - - + - - + + + + - - - - - - - + - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/svg/chapter-08/nested-lists-english-crop.svg b/svg/chapter-08/nested-lists-english-crop.svg index ceb3bb5..626e9f1 100644 --- a/svg/chapter-08/nested-lists-english-crop.svg +++ b/svg/chapter-08/nested-lists-english-crop.svg @@ -1,5 +1,5 @@ - + @@ -60,30 +60,21 @@ - - - - - - - + - + - - + + - - - - + - + @@ -121,194 +112,134 @@ - + - - - - - - - - - - + + + + + + + + + + - + - - - - - + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + + + + + + + - - - + + + + + + - + + - - - - - - + - + + + + + + + - - - - - + - - + + + + + - - - - - - - + + - - + + + + + + + - - - - - + + - - + + + + + - - - - - - - - + - + + + + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/svg/chapter-08/nested-lists-english-orig.svg b/svg/chapter-08/nested-lists-english-orig.svg index 104b791..6fe93b9 100644 --- a/svg/chapter-08/nested-lists-english-orig.svg +++ b/svg/chapter-08/nested-lists-english-orig.svg @@ -60,30 +60,21 @@ - - - - - - - + - + - - + + - - - - + - + @@ -121,194 +112,134 @@ - + - - - - - - - - - - + + + + + + + + + + - + - - - - - + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + + + + + + + - - - + + + + + + - + + - - - - - - + - + + + + + + + - - - - - + - - + + + + + - - - - - - - + + - - + + + + + + + - - - - - + + - - + + + + + - - - - - - - - + - + + + + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/svg/chapter-08/nested-lists-english.tex b/svg/chapter-08/nested-lists-english.tex index 1a662fa..ddb7525 100644 --- a/svg/chapter-08/nested-lists-english.tex +++ b/svg/chapter-08/nested-lists-english.tex @@ -4,28 +4,22 @@ \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage{hyperref} -\usepackage{paralist} \begin{document} \thispagestyle{empty} -\begin{compactitem} +\begin{itemize} \item lasagna noodles \item mozzarella cheese - \item vegetables \begin{compactitem} + \item vegetables \begin{itemize} \item crushed tomatoes \item carrots - \item peas - \item onions - \end{compactitem} - \item herbs \begin{compactenum} + \end{itemize} + \item herbs \begin{enumerate} \item oregano \item basil - \item rosemary - \end{compactenum} + \end{enumerate} \item flour \item milk - \item salt - \item pepper -\end{compactitem} +\end{itemize} \end{document} diff --git a/svg/chapter-08/nested-lists-orig.svg b/svg/chapter-08/nested-lists-orig.svg index 3f1d1b8..7813f96 100644 --- a/svg/chapter-08/nested-lists-orig.svg +++ b/svg/chapter-08/nested-lists-orig.svg @@ -6,346 +6,256 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + + - + - - - + + + - - - + + + - + - + - - - - - - - - + + + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + + - + + - - - - - + + + + + + + - - - + + - + + + + + + + + + - - - - - - - + - - + + + + - - - - - - - + - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/svg/chapter-08/nested-lists.tex b/svg/chapter-08/nested-lists.tex index 634028a..f7ed4bf 100644 --- a/svg/chapter-08/nested-lists.tex +++ b/svg/chapter-08/nested-lists.tex @@ -4,28 +4,22 @@ \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage{hyperref} -\usepackage{paralist} \begin{document} \thispagestyle{empty} -\begin{compactitem} +\begin{itemize} \item Nudelplatten \item Mozzarella - \item Gemüse \begin{compactitem} + \item Gemüse \begin{itemize} \item Passierte Tomaten \item Möhren - \item Erbsen - \item Zwiebeln - \end{compactitem} - \item Kräuter \begin{compactenum} + \end{itemize} + \item Kräuter \begin{enumerate} \item Oregano \item Basilikum - \item Rosmarin - \end{compactenum} + \end{enumerate} \item Mehl \item Milch - \item Salz - \item Pfeffer -\end{compactitem} +\end{itemize} \end{document}