diff options
| -rw-r--r-- | Info/10/2/Datenkapselung/capsule.tikz | 4 | ||||
| -rw-r--r-- | Info/10/2/Datenkapselung/slides-bank.md | 13 | ||||
| -rw-r--r-- | Info/10/2/Datenkapselung/slides-spielautomat.md | 2 | ||||
| -rw-r--r-- | Info/10/2/Datenkapselung/slides.md | 2 | ||||
| -rw-r--r-- | common.mk | 2 |
5 files changed, 15 insertions, 8 deletions
diff --git a/Info/10/2/Datenkapselung/capsule.tikz b/Info/10/2/Datenkapselung/capsule.tikz index cc11c0a1..41ba012d 100644 --- a/Info/10/2/Datenkapselung/capsule.tikz +++ b/Info/10/2/Datenkapselung/capsule.tikz @@ -17,11 +17,11 @@ \only<-4> { \node[opacity=0] (getSchnitt) at (0, 3.75) {SchnittGeben()}; - \node[opacity=0] at ($(getSchnitt) + (0, 0.75)$) {\huge \bm{$\Uparrow$}}; + \node[opacity=0] at ($(getSchnitt) + (0, 0.75)$) {\huge $\symbfit{\Uparrow}$}; } \only<5-> { \node (getSchnitt) at (0, 3.75) {SchnittGeben()}; - \node at ($(getSchnitt) + (0, 0.75)$) {\huge \bm{$\Uparrow$}}; + \node at ($(getSchnitt) + (0, 0.75)$) {\huge $\symbfit{\Uparrow}$}; } \draw[fill=white] (0,0) circle (1); diff --git a/Info/10/2/Datenkapselung/slides-bank.md b/Info/10/2/Datenkapselung/slides-bank.md index cbcbc052..48c6a12f 100644 --- a/Info/10/2/Datenkapselung/slides-bank.md +++ b/Info/10/2/Datenkapselung/slides-bank.md @@ -3,9 +3,9 @@ author: Florian Fischer theme: Rochester header-includes: | \usepackage[school]{pgf-umlcd} - \usepackage{bm} + \usepackage{unicode-math} \usepackage{tikz} - \usetikzlibrary{calc, arrows.meta} + \usetikzlibrary{calc, arrows.meta, decorations.text} --- @@ -37,9 +37,16 @@ font=\small}] \draw(kunde.east) edge[midway, sloped, align=center] node {\small < bedient \\ \small hat Konto bei > } (bank.west); +\node[class] (karte) at (4.5, 4) {Karte}; + +\draw[postaction={decorate,decoration={raise=0.75ex,text along path,text align=center,text={|\small| < gehört}}}] (kunde.east) to [bend left=25] (karte.west); +\draw[postaction={decorate,decoration={raise=-2ex,text along path,text align=center,text={|\small| besitzt >}}}] (kunde.east) to [bend left=25] (karte.west); + +\draw (bank) edge[align=center] node[rotate=90] {\small gibt aus > \\ \small < weist auf} (karte); + \node[class] (konto) at (9,1) {Konto}; -\draw (bank) edge[midway, sloped, align=center] node {\small verwaltet > \\ \small < wird verwaltet} (konto); +\draw (bank) edge[midway, align=center] node {\small verwaltet > \\ \small < wird verwaltet} (konto); \end{tikzpicture} ## Arbeitsauftrag diff --git a/Info/10/2/Datenkapselung/slides-spielautomat.md b/Info/10/2/Datenkapselung/slides-spielautomat.md index 1de621b1..8151813a 100644 --- a/Info/10/2/Datenkapselung/slides-spielautomat.md +++ b/Info/10/2/Datenkapselung/slides-spielautomat.md @@ -3,7 +3,7 @@ author: Florian Fischer theme: Rochester header-includes: | \usepackage[school]{pgf-umlcd} - \usepackage{bm} + \usepackage{unicode-math} \usepackage{tikz} \usetikzlibrary{calc} --- diff --git a/Info/10/2/Datenkapselung/slides.md b/Info/10/2/Datenkapselung/slides.md index fc5e26af..66e9ba84 100644 --- a/Info/10/2/Datenkapselung/slides.md +++ b/Info/10/2/Datenkapselung/slides.md @@ -3,7 +3,7 @@ author: Florian Fischer theme: Rochester header-includes: | \usepackage[school]{pgf-umlcd} - \usepackage{bm} + \usepackage{unicode-math} \usepackage{tikz} \usetikzlibrary{calc} --- @@ -4,7 +4,7 @@ LATEX_BASE := $(MAKEFILE_DIR)latex PANDOC_FILTER_DIR := $(MAKEFILE_DIR)pandoc COMMON_IMAGES := $(LATEX_BASE)/images -COMMON_PANDOC_OPTIONS := --resource-path="$(COMMON_IMAGES):." --lua-filter "$(PANDOC_FILTER_DIR)/center-img.lua" --lua-filter "$(PANDOC_FILTER_DIR)/include-files.lua" +COMMON_PANDOC_OPTIONS := --pdf-engine=lualatex --resource-path="$(COMMON_IMAGES):." --lua-filter "$(PANDOC_FILTER_DIR)/center-img.lua" --lua-filter "$(PANDOC_FILTER_DIR)/include-files.lua" PANDOC := pandoc $(COMMON_PANDOC_OPTIONS) SLIDES_OPTIONS := --slide-level 2 -t beamer |