From 4c67398034b88b54ae5da520cb39a462d314791b Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Fri, 28 May 2021 12:20:43 +0200 Subject: [PATCH 01/11] Remove hints --- slides/chapter-08.de.md | 2 +- slides/chapter-08.en.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/chapter-08.de.md b/slides/chapter-08.de.md index 6a27e61..acaf34b 100644 --- a/slides/chapter-08.de.md +++ b/slides/chapter-08.de.md @@ -159,4 +159,4 @@ Aufzählungen einfügen @content * Formatiert das Rezept in `lists.tex` im Ordner `exercises/lists` als **ungeordnete Liste** mit den Elementen *Zutaten* und *Arbeitsschritte*. Nutzt dafür den Befehl `\itemize`. -* ++ Benutzt innerhalb dieser Liste für die Zutaten eine **kompakte, ungeordnete Liste** (`compactitem`) und für die Arbeitsschritte eine **kompakte, geordnete Liste**. +* ++ Benutzt innerhalb dieser Liste für die Zutaten eine **kompakte, ungeordnete Liste** und für die Arbeitsschritte eine **kompakte, geordnete Liste**. diff --git a/slides/chapter-08.en.md b/slides/chapter-08.en.md index f115f2a..fe5bc46 100644 --- a/slides/chapter-08.en.md +++ b/slides/chapter-08.en.md @@ -161,4 +161,4 @@ Adding enumerations @content * Turn the recipe in `lists.tex` into an **unordered list** consisting of the elements *Zutaten* and *Arbeitsschritte*. You can find the file in the directory `exercises/lists`. Use the `itemize` command. -* ++ Within this list, create **compact unordered list** (`compactitem`) for the ingredients (Zutaten) and a **compact ordered list** for the instructions (Arbeitsschritte). +* ++ Within this list, create a **compact unordered list** for the ingredients (*Zutaten*) and a **compact ordered list** for the instructions (*Arbeitsschritte*). From 2f9fb326789eff6fe0da567c7bf518fc51abbd95 Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Fri, 28 May 2021 12:42:31 +0200 Subject: [PATCH 02/11] Fix typo --- slides/chapter-10.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/chapter-10.en.md b/slides/chapter-10.en.md index ce3fc28..9ff55db 100644 --- a/slides/chapter-10.en.md +++ b/slides/chapter-10.en.md @@ -121,7 +121,7 @@ Listing source code @content * In the directory `exercises/source-code-listings` you can find a file named `Source.java`, which we want to include in our document. -* ++ **Include** the java code in the file `task-1.tex1`. +* ++ **Include** the java code in the file `task-1.tex`. * ++ **Number** the code lines. * ++ Use the **theme** `native`. * ++ Change the **background colour** to dark blue. From f3d249a9678f5fab5cdfdaefe8572ab8e5df4c21 Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Fri, 28 May 2021 12:51:10 +0200 Subject: [PATCH 03/11] Fix typo --- slides/chapter-11.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/chapter-11.en.md b/slides/chapter-11.en.md index bfab1ce..fc71eba 100644 --- a/slides/chapter-11.en.md +++ b/slides/chapter-11.en.md @@ -104,7 +104,7 @@ Inserting graphics @content * In the directory `exercises/graphics` you can find an image file named `latex-logo.png`. -* ++ Include the figure **directly** beneath the the task for this chapter. +* ++ Include the figure **directly** beneath the task for this chapter. * ++ The image shall be **centered**. * ++ Additionally, add a **caption** for the figure. * ++ Adapt the **width** of the image to the width of the text (`textwidth`). From 879185015bcb5d6abf4853298b3df67327689ac5 Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Fri, 28 May 2021 12:51:21 +0200 Subject: [PATCH 04/11] Add remark on relative file paths --- slides/chapter-10.de.md | 2 +- slides/chapter-10.en.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/chapter-10.de.md b/slides/chapter-10.de.md index 1919c23..e35beca 100644 --- a/slides/chapter-10.de.md +++ b/slides/chapter-10.de.md @@ -121,7 +121,7 @@ Quelltext einbinden @content * Im Ordner `exercises/source-code-listings` findet ihr eine Datei namens `Source.java`. Wir werden diese im Folgenden in unser Dokument einbinden und das Aussehen unseren Wünschen anpassen. -* ++ **Bindet** den Java-Quelltext in der Datei `task-1.tex` **ein**. +* ++ **Bindet** den Java-Quelltext in der Datei `task-1.tex` **ein**. (Beachtet, dass der Dateipfad relativ zum Hauptdokument ist, also zu `main.tex`.) * ++ Aktiviert das **Syntax-Highlighting** durch Angabe der Sprache Java. * ++ Verwendet eine Option, um die Zeilen zu **nummerieren**. * ++ Nutzt das **Theme** `native`. diff --git a/slides/chapter-10.en.md b/slides/chapter-10.en.md index 9ff55db..f0bbd37 100644 --- a/slides/chapter-10.en.md +++ b/slides/chapter-10.en.md @@ -121,7 +121,7 @@ Listing source code @content * In the directory `exercises/source-code-listings` you can find a file named `Source.java`, which we want to include in our document. -* ++ **Include** the java code in the file `task-1.tex`. +* ++ **Include** the java code in the file `task-1.tex`. (Keep in mind that the file path is relative to the main LaTeX document, i. e., to `main.tex`.) * ++ **Number** the code lines. * ++ Use the **theme** `native`. * ++ Change the **background colour** to dark blue. From a674eb2fe38f39884e805ffece84ba6bc97d1c7f Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Fri, 28 May 2021 12:56:43 +0200 Subject: [PATCH 05/11] Rename task files --- slides/chapter-10.de.md | 2 +- slides/chapter-10.en.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/chapter-10.de.md b/slides/chapter-10.de.md index e35beca..a0891f8 100644 --- a/slides/chapter-10.de.md +++ b/slides/chapter-10.de.md @@ -121,7 +121,7 @@ Quelltext einbinden @content * Im Ordner `exercises/source-code-listings` findet ihr eine Datei namens `Source.java`. Wir werden diese im Folgenden in unser Dokument einbinden und das Aussehen unseren Wünschen anpassen. -* ++ **Bindet** den Java-Quelltext in der Datei `task-1.tex` **ein**. (Beachtet, dass der Dateipfad relativ zum Hauptdokument ist, also zu `main.tex`.) +* ++ **Bindet** den Java-Quelltext in der Datei `source-code-listings.tex` **ein**. (Beachtet, dass der Dateipfad relativ zum Hauptdokument ist, also zu `main.tex`.) * ++ Aktiviert das **Syntax-Highlighting** durch Angabe der Sprache Java. * ++ Verwendet eine Option, um die Zeilen zu **nummerieren**. * ++ Nutzt das **Theme** `native`. diff --git a/slides/chapter-10.en.md b/slides/chapter-10.en.md index f0bbd37..12bf3b5 100644 --- a/slides/chapter-10.en.md +++ b/slides/chapter-10.en.md @@ -121,7 +121,7 @@ Listing source code @content * In the directory `exercises/source-code-listings` you can find a file named `Source.java`, which we want to include in our document. -* ++ **Include** the java code in the file `task-1.tex`. (Keep in mind that the file path is relative to the main LaTeX document, i. e., to `main.tex`.) +* ++ **Include** the java code in the file `source-code-listings.tex`. (Keep in mind that the file path is relative to the main LaTeX document, i. e., to `main.tex`.) * ++ **Number** the code lines. * ++ Use the **theme** `native`. * ++ Change the **background colour** to dark blue. From f7a79ba36dcbabd8c73fce6bcb0973f6f8da6ff6 Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Fri, 28 May 2021 12:57:13 +0200 Subject: [PATCH 06/11] Point to task file --- slides/chapter-11.en.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slides/chapter-11.en.md b/slides/chapter-11.en.md index fc71eba..25fc4bd 100644 --- a/slides/chapter-11.en.md +++ b/slides/chapter-11.en.md @@ -103,8 +103,8 @@ Alternatively: Inserting graphics @content -* In the directory `exercises/graphics` you can find an image file named `latex-logo.png`. -* ++ Include the figure **directly** beneath the task for this chapter. +* In the directory `exercises/graphics` you can find an image file named `latex-logo.png`. +* ++ **Include** the figure in `exercises/graphics/graphics.tex`. * ++ The image shall be **centered**. * ++ Additionally, add a **caption** for the figure. -* ++ Adapt the **width** of the image to the width of the text (`textwidth`). +* ++ Adapt the **width** of the image to the width of the text (`textwidth`). From 6bc8179766b71566be70bfe00f1b9c9a67e79b50 Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Fri, 28 May 2021 13:03:16 +0200 Subject: [PATCH 07/11] Fix typo --- slides/chapter-12.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/chapter-12.en.md b/slides/chapter-12.en.md index aef7f5f..8d9aeea 100644 --- a/slides/chapter-12.en.md +++ b/slides/chapter-12.en.md @@ -196,7 +196,7 @@ An advanced example \end{table} ``` -[🔗 Booktaabs documentation](http://packages.oth-regensburg.de/ctan/macros/latex/contrib/booktabs/booktabs.pdf) +[🔗 Booktabs documentation](http://packages.oth-regensburg.de/ctan/macros/latex/contrib/booktabs/booktabs.pdf) @preview ![](svg/chapter-12/table-advanced-example-crop.svg){.thin-padding} From da13365fc0152cc54d238eaf790beb78ddb5e438 Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Fri, 28 May 2021 13:07:12 +0200 Subject: [PATCH 08/11] Fix embarrassing mistake --- slides/chapter-12.en.md | 2 +- .../table-advanced-example-crop.svg | 221 +++++++++--------- .../table-advanced-example-orig.svg | 221 +++++++++--------- svg/chapter-12/table-advanced-example.tex | 2 +- 4 files changed, 212 insertions(+), 234 deletions(-) diff --git a/slides/chapter-12.en.md b/slides/chapter-12.en.md index 8d9aeea..0acfe9f 100644 --- a/slides/chapter-12.en.md +++ b/slides/chapter-12.en.md @@ -189,7 +189,7 @@ An advanced example & Average & Worst \\ \midrule Stack & $\mathcal{O}(n)$ & $\mathcal{O}(n)$ \\ - Binary tree & $\mathcal{O}(log(n))$ & $\mathcal{O}(log(n))$ \\ + Binary tree & $\mathcal{O}(log(n))$ & $\mathcal{O}(n)$ \\ AVL tree & $\mathcal{O}(log(n))$ & $\mathcal{O}(log(n))$ \\ \bottomrule \end{tabular} diff --git a/svg/chapter-12/table-advanced-example-crop.svg b/svg/chapter-12/table-advanced-example-crop.svg index 1582329..52a33d2 100644 --- a/svg/chapter-12/table-advanced-example-crop.svg +++ b/svg/chapter-12/table-advanced-example-crop.svg @@ -109,222 +109,211 @@ - - - - - - - - - + + + + + + + + + - + - - - - - + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - + - + - + - + - - - - - + + + + + - + - - - - + + + + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - - - + + + + + + - - - - + + + + - + - + - + - - + + - + - + - - + + - + - + - + - - + - + - + + - - + + + + - + - - + - - - - + - + + - + - + - - + + - + - + - - + - + + - + - + - - + + - - - - - - - - - - - + diff --git a/svg/chapter-12/table-advanced-example-orig.svg b/svg/chapter-12/table-advanced-example-orig.svg index ae71df4..cade7a5 100644 --- a/svg/chapter-12/table-advanced-example-orig.svg +++ b/svg/chapter-12/table-advanced-example-orig.svg @@ -109,222 +109,211 @@ - - - - - - - - - + + + + + + + + + - + - - - - - + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - + - + - + - + - - - - - + + + + + - + - - - - + + + + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - - - + + + + + + - - - - + + + + - + - + - + - - + + - + - + - - + + - + - + - + - - + - + - + + - - + + + + - + - - + - - - - + - + + - + - + - - + + - + - + - - + - + + - + - + - - + + - - - - - - - - - - - + diff --git a/svg/chapter-12/table-advanced-example.tex b/svg/chapter-12/table-advanced-example.tex index 2f99dc1..705d15b 100644 --- a/svg/chapter-12/table-advanced-example.tex +++ b/svg/chapter-12/table-advanced-example.tex @@ -15,7 +15,7 @@ & Average & Worst \\ \midrule Stack & $\mathcal{O}(n)$ & $\mathcal{O}(n)$ \\ - Binary tree & $\mathcal{O}(log(n))$ & $\mathcal{O}(log(n))$ \\ + Binary tree & $\mathcal{O}(log(n))$ & $\mathcal{O}(n)$ \\ AVL tree & $\mathcal{O}(log(n))$ & $\mathcal{O}(log(n))$ \\ \bottomrule \end{tabular} From ba7329c80446c0dacbd69a89305f022f70addb7a Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Fri, 28 May 2021 13:13:18 +0200 Subject: [PATCH 09/11] Fix typo --- slides/chapter-12.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/chapter-12.en.md b/slides/chapter-12.en.md index 0acfe9f..c80b86c 100644 --- a/slides/chapter-12.en.md +++ b/slides/chapter-12.en.md @@ -225,5 +225,5 @@ Typesetting tables * The list in file `exercises/tables/tables.tex` stores information on a few modules of the WIAI faculty. * ++ Transform the list into a **table**. * ++ The table shall have colums for the *name*, the *abbreviation* (Kürzel) and the *semester* of the lectures. -* ++ Add a **column** with **center aligned text** on the left side on the table in order to **number** the lecutres. +* ++ Add a **column** with **center-aligned text** on the left side on the table in order to **number** the lecutres. * ++ Add a **caption** for the table. From 3bb614a6b3828eef77a2f0caa3ae037f72ffea5d Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Fri, 28 May 2021 13:21:21 +0200 Subject: [PATCH 10/11] Update content --- slides/chapter-13.en.md | 9 +- svg/chapter-13/footnote-example-crop.svg | 352 +++++++++++------------ svg/chapter-13/footnote-example-orig.svg | 352 +++++++++++------------ svg/chapter-13/footnote-example.tex | 2 +- 4 files changed, 351 insertions(+), 364 deletions(-) diff --git a/slides/chapter-13.en.md b/slides/chapter-13.en.md index ca00f4d..bb28fbb 100644 --- a/slides/chapter-13.en.md +++ b/slides/chapter-13.en.md @@ -20,11 +20,10 @@ Footnotes are automatically numbered consecutively, independent of sections. ``` {.hljs .lang-tex} The wild boar (Sus scrofa), also known as -the wild swine, Common wild pig, or +the wild swine, common wild pig, or simply wild pig, is a suid native to much -of the Palearctic, as well as introduced -numbers in the Americas and Southeast -Asia. +of Eurasia and North Africa, and has been +introduced to the Americas and Oceania. \footnote{\url{https://en.wikipedia.org/ wiki/Wild_boar}} ``` @@ -190,7 +189,7 @@ slide(layout=task) Inserting footnotes @content -* Make the text *Stand März 2021* in file `exercies/footnotes/footnotes.tex` appear as a **footnote**. +* Make the text *Stand März 2021* in file `exercises/footnotes/footnotes.tex` appear as a **footnote**. * ++ Additionally, insert a **clickable URL** that leads to the download page for the Java Development Kit (`https://www.oracle.com/java/technologies/javase-downloads.html`). diff --git a/svg/chapter-13/footnote-example-crop.svg b/svg/chapter-13/footnote-example-crop.svg index 692c4c0..1384c28 100644 --- a/svg/chapter-13/footnote-example-crop.svg +++ b/svg/chapter-13/footnote-example-crop.svg @@ -72,30 +72,33 @@ - - - - + - + - + - + + + + - + + + + @@ -185,273 +188,264 @@ - - - - + + + + - + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - + + + - - + + - - + + - - - + + + - - + + + - - + - - - - - - + + + + + + - - - - - - + + + + + + - + + + + - - - + + + + - - - - + + - - + + + + + + - - - - - - + + + + - - - - + + + + - - - - + + - - + - + + + + - - - - + + + + + - - - - - + - + - - + - + - - + + - + - - + + - - - + + + + + + + - + + + - - - - - - - - - - + + + + + - - + + + + + + + - + + + - - - + + + - - + - - + + + - - - + + - - - - - + + + - + + + + - - + - + + - - - + + + - - + + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/svg/chapter-13/footnote-example-orig.svg b/svg/chapter-13/footnote-example-orig.svg index fcf0ccf..b1eea79 100644 --- a/svg/chapter-13/footnote-example-orig.svg +++ b/svg/chapter-13/footnote-example-orig.svg @@ -72,30 +72,33 @@ - - - - + - + - + - + + + + - + + + + @@ -185,273 +188,264 @@ - - - - + + + + - + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - + + + - - + + - - + + - - - + + + - - + + + - - + - - - - - - + + + + + + - - - - - - + + + + + + - + + + + - - - + + + + - - - - + + - - + + + + + + - - - - - - + + + + - - - - + + + + - - - - + + - - + - + + + + - - - - + + + + + - - - - - + - + - - + - + - - + + - + - - + + - - - + + + + + + + - + + + - - - - - - - - - - + + + + + - - + + + + + + + - + + + - - - + + + - - + - - + + + - - - + + - - - - - + + + - + + + + - - + - + + - - - + + + - - + + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/svg/chapter-13/footnote-example.tex b/svg/chapter-13/footnote-example.tex index 3acdf3a..0b47cd5 100644 --- a/svg/chapter-13/footnote-example.tex +++ b/svg/chapter-13/footnote-example.tex @@ -7,6 +7,6 @@ \thispagestyle{empty} \vspace*{18.5cm} -The wild boar (Sus scrofa), also known as the wild swine, Common wild pig, or simply wild pig, is a suid native to much of the Palearctic, as well as introduced numbers in the Americas and Southeast Asia.\footnote{\url{https://en.wikipedia.org/wiki/Wild_boar}} +The wild boar (Sus scrofa), also known as the wild swine, common wild pig, or simply wild pig, is a suid native to much of Eurasia and North Africa, and has been introduced to the Americas and Oceania.\footnote{\url{https://en.wikipedia.org/wiki/Wild_boar}} \end{document} From 38cd74a81cffc96a87f7774cb1a6843e72173cc3 Mon Sep 17 00:00:00 2001 From: Florian Knoch Date: Fri, 28 May 2021 13:23:55 +0200 Subject: [PATCH 11/11] Add missing @ --- slides/chapter-13.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/chapter-13.en.md b/slides/chapter-13.en.md index bb28fbb..ee3741c 100644 --- a/slides/chapter-13.en.md +++ b/slides/chapter-13.en.md @@ -180,7 +180,7 @@ sec:section3,sec:section5}. ![](svg/chapter-13/cref-multiple-example-crop.svg) -slide(layout=task) +@slide(layout=task) @task-number 13