diff --git a/.~lock.drinks.csv# b/.~lock.drinks.csv# deleted file mode 100644 index cfc1b9c..0000000 --- a/.~lock.drinks.csv# +++ /dev/null @@ -1 +0,0 @@ -,michael,michael-MS-7C02,29.03.2023 01:11,file:///home/michael/.config/libreoffice/4; \ No newline at end of file diff --git a/cmds.tex b/cmds.tex index 2a5b34c..f07b473 100644 --- a/cmds.tex +++ b/cmds.tex @@ -40,6 +40,8 @@ \newcommand*{\subsubsubheading}[1]{% {\Large{\artfont\selectfont\textcolor{head}{#1}}\\}} +\newcommand*{\subsubsubsubheading}[1]{% + {\raggedright\Large\artfont\selectfont\textcolor{head}{#1}\\}} % to format each subentry \newcommand*{\Expl}[1]{% @@ -64,6 +66,9 @@ \hspace*{0.5cm}\small #3 \dotfill\Price{#4}\\ } +\newcommand*{\ShotItem}[4]{%1 = Name; 2 = Desc; 3 = Size; 4 = Price + \small#1\scriptsize\space\textit{#2}\small\dotfill #3\space\Price{#4}} + \newcommand*{\parseprule}{% \par \begingroup diff --git a/main.aux b/main.aux index ac30deb..5f56f40 100644 --- a/main.aux +++ b/main.aux @@ -1,42 +1,8 @@ \relax -\@input{pages/cover.aux} -\pgfsyspdfmark {pgfid2}{4736286}{34421990} -\pgfsyspdfmark {pgfid1}{2847719}{37570577} -\@input{pages/soli.aux} -\pgfsyspdfmark {pgfid4}{4736286}{34421990} -\pgfsyspdfmark {pgfid3}{2847719}{37570577} -\@input{pages/kaffee.aux} -\pgfsyspdfmark {pgfid6}{4736286}{34421990} -\pgfsyspdfmark {pgfid5}{14290151}{37570577} -\@input{pages/teekakao.aux} -\pgfsyspdfmark {pgfid8}{4736286}{34421990} -\pgfsyspdfmark {pgfid7}{14290151}{37570577} -\pgfsyspdfmark {pgfid10}{4736286}{34421990} -\pgfsyspdfmark {pgfid9}{25732582}{37570577} -\@input{pages/erfrischung.aux} -\pgfsyspdfmark {pgfid12}{4736286}{34421990} -\pgfsyspdfmark {pgfid11}{13798631}{37570577} -\@input{pages/bier.aux} -\pgfsyspdfmark {pgfid14}{4736286}{34421990} -\pgfsyspdfmark {pgfid13}{13798631}{37570577} -\@input{pages/wein.aux} -\pgfsyspdfmark {pgfid16}{4736286}{34421990} -\pgfsyspdfmark {pgfid15}{13798631}{37570577} -\pgfsyspdfmark {pgfid18}{4736286}{34421990} -\pgfsyspdfmark {pgfid17}{25732582}{37570577} \@input{pages/spirituosen.aux} -\pgfsyspdfmark {pgfid20}{4736286}{34421990} -\pgfsyspdfmark {pgfid19}{13798631}{37570577} +\pgfsyspdfmark {pgfid2}{4736286}{34421990} +\pgfsyspdfmark {pgfid1}{14290151}{37570577} \@input{pages/spirituosen2.aux} -\pgfsyspdfmark {pgfid22}{4736286}{34421990} -\pgfsyspdfmark {pgfid21}{5713044}{37444538} -\@input{pages/cocktails.aux} -\pgfsyspdfmark {pgfid24}{4736286}{34421990} -\pgfsyspdfmark {pgfid23}{13798631}{37570577} -\@input{pages/zeitungen.aux} -\pgfsyspdfmark {pgfid26}{4736286}{34421990} -\pgfsyspdfmark {pgfid25}{25732582}{37570577} -\@input{pages/backcover.aux} -\pgfsyspdfmark {pgfid28}{4736286}{34421990} -\pgfsyspdfmark {pgfid27}{25514347}{37570577} -\gdef \@abspage@last{14} +\pgfsyspdfmark {pgfid4}{4736286}{34421990} +\pgfsyspdfmark {pgfid3}{14290151}{37570577} +\gdef \@abspage@last{2} diff --git a/main.log b/main.log index 75821e8..61755dc 100644 --- a/main.log +++ b/main.log @@ -1,4 +1,4 @@ -This is XeTeX, Version 3.141592653-2.6-0.999993 (TeX Live 2022/dev/Debian) (preloaded format=xelatex 2023.2.28) 29 MAR 2023 03:08 +This is XeTeX, Version 3.141592653-2.6-0.999993 (TeX Live 2022/dev/Debian) (preloaded format=xelatex 2023.2.28) 29 MAR 2023 21:24 entering extended mode restricted \write18 enabled. %&-line parsing enabled. @@ -806,11 +806,8 @@ Package geometry Warning: Over-specification in `h'-direction. \dtlkeys@drinks=\toks64 \dtlrows@drinks=\count371 \dtlcols@drinks=\count372 -(./glass.tex) (./cmds.tex) (./main.aux (./pages/cover.aux) (./pages/soli.aux) -(./pages/kaffee.aux) (./pages/teekakao.aux) (./pages/erfrischung.aux) -(./pages/bier.aux) (./pages/wein.aux) (./pages/spirituosen.aux) -(./pages/spirituosen2.aux) (./pages/cocktails.aux) (./pages/zeitungen.aux) -(./pages/backcover.aux)) +(./glass.tex) (./cmds.tex) (./main.aux (./pages/spirituosen.aux) +(./pages/spirituosen2.aux)) \openout1 = `main.aux'. LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 47. @@ -885,465 +882,62 @@ Package pdflscape Info: Auto-detected driver: dvipdfm (xetex) on input line 98. Package: atbegshi-ltx 2021/01/10 v1.0c Emulation of the original atbegshi package with kernel methods )) -\openout2 = `pages/cover.aux'. +\openout2 = `pages/spirituosen.aux'. -(./pages/cover.tex -File: img//covers/32_48_649.jpg Graphic file (type bmp) - -) [1 - - -] -\openout2 = `pages/soli.aux'. - - (./pages/soli.tex +(./pages/spirituosen.tex File: img//bg-border.png Graphic file (type bmp) -File: img//illus/kley-upscaled-alpha.png Graphic file (type bmp) - -LaTeX Font Info: Trying to load font information for OT1+ppl on input line 1 -1. + +! LaTeX Error: Something's wrong--perhaps a missing \item. + +See the LaTeX manual or LaTeX Companion for explanation. +Type H for immediate help. + ... + +l.7 ...rink erhältlich. Sprecht uns einfach an!\\} + +Try typing to proceed. +If that doesn't work, type X to quit. + +LaTeX Font Info: Calculating math sizes for size <11> on input line 54. +LaTeX Font Info: Trying to load font information for OT1+ppl on input line 5 +4. (/usr/share/texlive/texmf-dist/tex/latex/psnfss/ot1ppl.fd File: ot1ppl.fd 2001/06/04 font definitions for OT1/ppl. ) LaTeX Font Info: Trying to load font information for OML+zplm on input line -11. +54. (/usr/share/texlive/texmf-dist/tex/latex/psnfss/omlzplm.fd File: omlzplm.fd 2002/09/08 Fontinst v1.914 font definitions for OML/zplm. ) LaTeX Font Info: Trying to load font information for OMS+zplm on input line -11. +54. (/usr/share/texlive/texmf-dist/tex/latex/psnfss/omszplm.fd File: omszplm.fd 2002/09/08 Fontinst v1.914 font definitions for OMS/zplm. ) LaTeX Font Info: Trying to load font information for OMX+zplm on input line -11. +54. (/usr/share/texlive/texmf-dist/tex/latex/psnfss/omxzplm.fd File: omxzplm.fd 2002/09/08 Fontinst v1.914 font definitions for OMX/zplm. ) LaTeX Font Info: Trying to load font information for OT1+zplm on input line -11. +54. (/usr/share/texlive/texmf-dist/tex/latex/psnfss/ot1zplm.fd File: ot1zplm.fd 2002/09/08 Fontinst v1.914 font definitions for OT1/zplm. -)) [2 +)) [1 - -] -\openout2 = `pages/kaffee.aux'. - - -(./pages/kaffee.tex -File: img//bg-border.png Graphic file (type bmp) - - - -! LaTeX Error: Something's wrong--perhaps a missing \item. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.9 ...e}{Alle Kaffes werden von .... blablabla\\} - -Try typing to proceed. -If that doesn't work, type X to quit. - -) [3 - - - -] -\openout2 = `pages/teekakao.aux'. - - (./pages/teekakao.tex -File: img//bg-border.png Graphic file (type bmp) - - - -! LaTeX Error: Something's wrong--perhaps a missing \item. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.9 ...ster Biotee und so. Geiler Scheiß whaaaaat} - \\$\cdot$ -Try typing to proceed. -If that doesn't work, type X to quit. - - -! LaTeX Error: Something's wrong--perhaps a missing \item. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.43 ...Biokakao und so. Geiler Scheiß whaaaaat\\} - -Try typing to proceed. -If that doesn't work, type X to quit. - - -Overfull \hbox (15.0pt too wide) in paragraph at lines 43--43 - [][] - [] - -File: img//illus/ads/10_10_114-crop1-alpha2.png Graphic file (type bmp) - -) [4 - - - -] -File: img//bg-border.png Graphic file (type bmp) - -File: img//illus/16_63_003-upscaled-crop-alpha2.png Graphic file (type bmp) - - [5 - - -] -\openout2 = `pages/erfrischung.aux'. - - (./pages/erfrischung.tex -File: img//bg-border.png Graphic file (type bmp) - - - -! LaTeX Error: Something's wrong--perhaps a missing \item. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.6 ...extbf{Wasserstiftung e.V.} zu bestellen.\\} - -Try typing to proceed. -If that doesn't work, type X to quit. - -LaTeX Font Info: Calculating math sizes for size <11> on input line 21. -) [6 - -] -\openout2 = `pages/bier.aux'. - - (./pages/bier.tex -File: img//bg-border.png Graphic file (type bmp) - - - -! LaTeX Error: Something's wrong--perhaps a missing \item. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.6 ...aktuellen Aktionen oder frag bei uns nach.} - -Try typing to proceed. -If that doesn't work, type X to quit. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - -) [7 - - - -] -\openout2 = `pages/wein.aux'. - - (./pages/wein.tex -File: img//bg-border.png Graphic file (type bmp) - - - -! LaTeX Error: Something's wrong--perhaps a missing \item. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.6 \begin{Group}{Wein und Sekt}{} - -Try typing to proceed. -If that doesn't work, type X to quit. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.17 ^^I^^I}} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - -File: img//illus/ads/33_36_469-upscaled-crop2-alpha.png Graphic file (type bmp) - - -) [8 - - - -] -File: img//bg-border.png Graphic file (type bmp) - -File: img//illus/16_58_001-upscale-alpha2-crop2.png Graphic file (type bmp) - - [9 - - -] -\openout2 = `pages/spirituosen.aux'. - - (./pages/spirituosen.tex -File: img//bg-border.png Graphic file (type bmp) - - - -! LaTeX Error: Something's wrong--perhaps a missing \item. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.7 ...in{Group}{Spirituosen}{Mix? Zockerrunde?\\} - -Try typing to proceed. -If that doesn't work, type X to quit. - -) [10 - ] \openout2 = `pages/spirituosen2.aux'. - (./pages/spirituosen2.tex -File: img//bg-border.png Graphic file (type bmp) - -) [11 - - -] -\openout2 = `pages/cocktails.aux'. - - (./pages/cocktails.tex +(./pages/spirituosen2.tex File: img//bg-border.png Graphic file (type bmp) @@ -1354,236 +948,23 @@ See the LaTeX manual or LaTeX Companion for explanation. Type H for immediate help. ... -l.6 \begin{Group}{Cocktails}{} - +l.3 \begin{Group}{Spirituosen}{} + Try typing to proceed. If that doesn't work, type X to quit. - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.13 ^^I^^I} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.13 ^^I^^I} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.13 ^^I^^I} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.13 ^^I^^I} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.13 ^^I^^I} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.13 ^^I^^I} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.13 ^^I^^I} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.13 ^^I^^I} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.13 ^^I^^I} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.13 ^^I^^I} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.13 ^^I^^I} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - - -! LaTeX Error: There's no line here to end. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.13 ^^I^^I} - -Your command was ignored. -Type I to replace it with another command, -or to continue without it. - -) [12 +) [2 -] -\openout2 = `pages/zeitungen.aux'. - - (./pages/zeitungen.tex -File: img//bg-border.png Graphic file (type bmp) - - - -! LaTeX Error: Something's wrong--perhaps a missing \item. - -See the LaTeX manual or LaTeX Companion for explanation. -Type H for immediate help. - ... - -l.7 ^^I\heading{Lesestoff} - -Try typing to proceed. -If that doesn't work, type X to quit. - - -Underfull \hbox (badness 10000) in paragraph at lines 9--9 - \TU/lmr/m/n/12 senschaft - [] - - -Underfull \hbox (badness 10000) in paragraph at lines 10--10 - \TU/lmr/m/n/10 spielen an. - [] - - -Underfull \hbox (badness 10000) in paragraph at lines 11--11 - []\TU/FoglihtenDeH02(0)/m/n/20 7 - [] - -File: img//illus/ads/33_36_469-upscaled-crop-alpha-sm.png Graphic file (type bm -p) - -) [13 - - - -] -\openout2 = `pages/backcover.aux'. - - (./pages/backcover.tex -File: img//bg-border.png Graphic file (type bmp) - -File: img//covers/10_01_001-upscaled-crop-sm.png Graphic file (type bmp) - -) [14 - - - -] (./main.aux (./pages/cover.aux) -(./pages/soli.aux) (./pages/kaffee.aux) (./pages/teekakao.aux) -(./pages/erfrischung.aux) (./pages/bier.aux) (./pages/wein.aux) -(./pages/spirituosen.aux) (./pages/spirituosen2.aux) (./pages/cocktails.aux) -(./pages/zeitungen.aux) (./pages/backcover.aux)) ) +] (./main.aux (./pages/spirituosen.aux) (./pages/spirituosen2.aux)) ) Here is how much of TeX's memory you used: - 20643 strings out of 476191 - 450495 string characters out of 5812072 - 1131442 words of memory out of 5000000 - 40838 multiletter control sequences out of 15000+600000 - 489515 words of font info for 106 fonts, out of 8000000 for 9000 + 20214 strings out of 476191 + 437078 string characters out of 5812072 + 1060219 words of memory out of 5000000 + 40499 multiletter control sequences out of 15000+600000 + 483813 words of font info for 87 fonts, out of 8000000 for 9000 1348 hyphenation exceptions out of 8191 - 115i,10n,118p,993b,32681s stack positions out of 5000i,500n,10000p,200000b,80000s + 115i,10n,118p,453b,13528s stack positions out of 5000i,500n,10000p,200000b,80000s -Output written on main.pdf (14 pages). +Output written on main.pdf (2 pages). diff --git a/main.pdf b/main.pdf index 2ef5936..7f42b4e 100644 Binary files a/main.pdf and b/main.pdf differ diff --git a/main.synctex.gz b/main.synctex.gz index 7606660..0a9090f 100644 Binary files a/main.synctex.gz and b/main.synctex.gz differ diff --git a/main.tex b/main.tex index c34428d..cd4cfbe 100644 --- a/main.tex +++ b/main.tex @@ -46,20 +46,20 @@ \begin{document} -\include{pages/cover.tex} -\include{pages/soli.tex} -\include{pages/kaffee.tex} -\include{pages/teekakao.tex} -\illupage{illus/16_63_003-upscaled-crop-alpha2.png} -\include{pages/erfrischung.tex} +%\include{pages/cover.tex} +%\include{pages/soli.tex} +%\include{pages/kaffee.tex} +%\include{pages/teekakao.tex} +%\illupage{illus/16_63_003-upscaled-crop-alpha2.png} +%\include{pages/erfrischung.tex} %bis hier hin!!! -\include{pages/bier.tex} -\include{pages/wein.tex} -\illupage{illus/16_58_001-upscale-alpha2-crop2.png} +%\include{pages/bier.tex} +%\include{pages/wein.tex} +%\illupage{illus/16_58_001-upscale-alpha2-crop2.png} \include{pages/spirituosen.tex} \include{pages/spirituosen2.tex} -\include{pages/cocktails.tex} -\include{pages/zeitungen.tex} -\include{pages/backcover.tex} +%\include{pages/cocktails.tex} +%\include{pages/zeitungen.tex} +%\include{pages/backcover.tex} \end{document} \ No newline at end of file diff --git a/pages/backcover.aux b/pages/backcover.aux index 90cc90e..7c1ad52 100644 --- a/pages/backcover.aux +++ b/pages/backcover.aux @@ -1,6 +1,6 @@ \relax \@setckpt{pages/backcover}{ -\setcounter{page}{15} +\setcounter{page}{16} \setcounter{equation}{0} \setcounter{enumi}{0} \setcounter{enumii}{0} @@ -22,7 +22,7 @@ \setcounter{DTLrowi}{12} \setcounter{DTLrowii}{0} \setcounter{DTLrowiii}{0} -\setcounter{DTLrow}{28} +\setcounter{DTLrow}{30} \setcounter{blindtext}{1} \setcounter{Blindtext}{5} \setcounter{blind@countparstart}{0} diff --git a/pages/bier.aux b/pages/bier.aux index c2ca8bb..0ff521e 100644 --- a/pages/bier.aux +++ b/pages/bier.aux @@ -1,6 +1,6 @@ \relax \@setckpt{pages/bier}{ -\setcounter{page}{8} +\setcounter{page}{9} \setcounter{equation}{0} \setcounter{enumi}{0} \setcounter{enumii}{0} diff --git a/pages/cocktails.aux b/pages/cocktails.aux index e0da7ba..985b29d 100644 --- a/pages/cocktails.aux +++ b/pages/cocktails.aux @@ -1,6 +1,6 @@ \relax \@setckpt{pages/cocktails}{ -\setcounter{page}{13} +\setcounter{page}{14} \setcounter{equation}{0} \setcounter{enumi}{0} \setcounter{enumii}{0} @@ -22,7 +22,7 @@ \setcounter{DTLrowi}{12} \setcounter{DTLrowii}{0} \setcounter{DTLrowiii}{0} -\setcounter{DTLrow}{28} +\setcounter{DTLrow}{30} \setcounter{blindtext}{1} \setcounter{Blindtext}{5} \setcounter{blind@countparstart}{0} diff --git a/pages/erfrischung.aux b/pages/erfrischung.aux index b3ee05c..1dd44d7 100644 --- a/pages/erfrischung.aux +++ b/pages/erfrischung.aux @@ -1,6 +1,6 @@ \relax \@setckpt{pages/erfrischung}{ -\setcounter{page}{7} +\setcounter{page}{8} \setcounter{equation}{0} \setcounter{enumi}{0} \setcounter{enumii}{0} diff --git a/pages/spirituosen.aux b/pages/spirituosen.aux index 953054f..e05f3a9 100644 --- a/pages/spirituosen.aux +++ b/pages/spirituosen.aux @@ -1,6 +1,6 @@ \relax \@setckpt{pages/spirituosen}{ -\setcounter{page}{11} +\setcounter{page}{2} \setcounter{equation}{0} \setcounter{enumi}{0} \setcounter{enumii}{0} @@ -19,10 +19,10 @@ \setcounter{AM@survey}{0} \setcounter{su@anzahl}{0} \setcounter{parentequation}{0} -\setcounter{DTLrowi}{6} +\setcounter{DTLrowi}{5} \setcounter{DTLrowii}{0} \setcounter{DTLrowiii}{0} -\setcounter{DTLrow}{26} +\setcounter{DTLrow}{6} \setcounter{blindtext}{1} \setcounter{Blindtext}{5} \setcounter{blind@countparstart}{0} diff --git a/pages/spirituosen.tex b/pages/spirituosen.tex index 8100ece..72f09db 100644 --- a/pages/spirituosen.tex +++ b/pages/spirituosen.tex @@ -4,7 +4,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newpage \PageBackground{\bg} -\begin{Group}{Spirituosen}{Mix? Zockerrunde?\\} +\begin{Group}{Spirituosen}{Alle Spirituosen sind auch als Longdrink erhältlich. Sprecht uns einfach an!\\} %%%%%%%%%%%%%%%%%%% %% Hausgemachtes %%%%%%%%%%%%%%%%%%% @@ -12,17 +12,17 @@ \DTLforeach[\DTLiseq{\cat}{Hausgemachtes}]{drinks}{ \name=name,\desc=beschreibung,\img=img,\preisa=preis1,\sizea=size1,\cat=cat} { - \small\name\footnotesize, \sizea\desc\small\dotfill\Price{\preisa} \\ + \ShotItem{\name}{\desc}{\sizea}{\preisa} \\ } %%%%%%%%%%%%%%%%%%% %% Kräuterapotheke %%%%%%%%%%%%%%%%%%% - \subsubsubheading{Kräuterapotheke} + \subsubsubsubheading{Kräuterapotheke} \DTLforeach[\DTLiseq{\cat}{Kräuterapotheke}]{drinks}{ \name=name,\desc=beschreibung,\img=img,\preisa=preis1,\sizea=size1,\cat=cat} { - \small\name\footnotesize, \sizea\desc\small\dotfill\Price{\preisa} \\ + \ShotItem{\name}{\desc}{\sizea}{\preisa} \\ } %%%%%%%%%%%%%%%%%%% @@ -32,7 +32,7 @@ \DTLforeach[\DTLiseq{\cat}{Rum}]{drinks}{ \name=name,\desc=beschreibung,\img=img,\preisa=preis1,\sizea=size1,\cat=cat} { - \small\name\footnotesize, \sizea\desc\small\dotfill\Price{\preisa} \\ + \ShotItem{\name}{\desc}{\sizea}{\preisa} \\ } %%%%%%%%%%%%%%%%%%% @@ -42,5 +42,18 @@ \DTLforeach[\DTLiseq{\cat}{Whisky}]{drinks}{ \name=name,\desc=beschreibung,\img=img,\preisa=preis1,\sizea=size1,\cat=cat} { - \small\name\footnotesize, \sizea\desc\small\dotfill\Price{\preisa} \\ + \ShotItem{\name}{\desc}{\sizea}{\preisa} \\ } + + %%%%%%%%%%%%%%%%%%% + %% Zocker-Shots + %%%%%%%%%%%%%%%%%%% + \subheading{Zockerschäpse}\desctext{Ihr schockt gerne, habt euren Pilotenschein beim Looping Louie gemacht oder Schengeln ist euch ein Begriff? Um die Schmach einer verlorenen Runde etwas zu lindern, bieten wir euch einige Shots günstiger an, wenn ihr beim Zocken verloren habt und eine Runde ausgeben müsst. Folgende Shots bekommt ihr für} + \DTLforeach[\DTLiseq{\cat}{Saftpreis}]{drinks}{ + \name=name,\desc=beschreibung,\img=img,\preisa=preis1,\preisb=preis2,\sizea=size1,\sizeb=size2,\cat=cat, \note=note} + {\textbf{\preisa €}}.\\$\cdot$\space + \DTLforeach[\DTLiseq{\cat}{Granini}\AND\NOT\DTLiseq{\note}{zusatz}]{drinks}{ + \name=name,\desc=beschreibung,\img=img,\preis=preis1,\cat=cat,\note=note} + {{\large\name\space$\cdot$\space}}\\ \medskip + +\end{Group} \ No newline at end of file diff --git a/pages/spirituosen2.aux b/pages/spirituosen2.aux index bd06d1d..02aff26 100644 --- a/pages/spirituosen2.aux +++ b/pages/spirituosen2.aux @@ -1,6 +1,6 @@ \relax \@setckpt{pages/spirituosen2}{ -\setcounter{page}{12} +\setcounter{page}{3} \setcounter{equation}{0} \setcounter{enumi}{0} \setcounter{enumii}{0} @@ -22,7 +22,7 @@ \setcounter{DTLrowi}{37} \setcounter{DTLrowii}{0} \setcounter{DTLrowiii}{0} -\setcounter{DTLrow}{27} +\setcounter{DTLrow}{7} \setcounter{blindtext}{1} \setcounter{Blindtext}{5} \setcounter{blind@countparstart}{0} diff --git a/pages/spirituosen2.tex b/pages/spirituosen2.tex index 1632e84..d247168 100644 --- a/pages/spirituosen2.tex +++ b/pages/spirituosen2.tex @@ -1,13 +1,14 @@ \newpage \PageBackground{\bg} -%%%%%%%%%%%%%%%%%%% -%% Weiteres -%%%%%%%%%%%%%%%%%%% -\subheading{Weiteres} -\DTLforeach[\DTLiseq{\cat}{Classics}]{drinks}{ - \name=name,\desc=beschreibung,\img=img,\preisa=preis1,\sizea=size1,\cat=cat} -{ - \small\name\footnotesize, \sizea\desc\small\dotfill\Price{\preisa} \\ -} -\centering{\linefont\fontsize{20}{60}\selectfont 7}\\ -\end{Group} \ No newline at end of file +\begin{Group}{Spirituosen}{} + \subheading{Weiteres} + %%%%%%%%%%%%%%%%%%% + %% Weiteres + %%%%%%%%%%%%%%%%%%% + \DTLforeach[\DTLiseq{\cat}{Classics}]{drinks}{ + \name=name,\desc=beschreibung,\img=img,\preisa=preis1,\sizea=size1,\cat=cat} + { + \ShotItem{\name}{\desc}{\sizea}{\preisa} \\ + } + \centering{\linefont\fontsize{20}{60}\selectfont 7}\\ +\end{Group} diff --git a/pages/teekakao.aux b/pages/teekakao.aux index 41c3e9c..ca33f87 100644 --- a/pages/teekakao.aux +++ b/pages/teekakao.aux @@ -1,6 +1,6 @@ \relax \@setckpt{pages/teekakao}{ -\setcounter{page}{5} +\setcounter{page}{6} \setcounter{equation}{0} \setcounter{enumi}{0} \setcounter{enumii}{0} diff --git a/pages/wein.aux b/pages/wein.aux index 8c8b390..760a185 100644 --- a/pages/wein.aux +++ b/pages/wein.aux @@ -1,6 +1,6 @@ \relax \@setckpt{pages/wein}{ -\setcounter{page}{9} +\setcounter{page}{10} \setcounter{equation}{0} \setcounter{enumi}{0} \setcounter{enumii}{0} diff --git a/pages/zeitungen.aux b/pages/zeitungen.aux index 7d4a9c8..92fb0ea 100644 --- a/pages/zeitungen.aux +++ b/pages/zeitungen.aux @@ -1,6 +1,6 @@ \relax \@setckpt{pages/zeitungen}{ -\setcounter{page}{14} +\setcounter{page}{15} \setcounter{equation}{0} \setcounter{enumi}{0} \setcounter{enumii}{0} @@ -22,7 +22,7 @@ \setcounter{DTLrowi}{12} \setcounter{DTLrowii}{0} \setcounter{DTLrowiii}{0} -\setcounter{DTLrow}{28} +\setcounter{DTLrow}{30} \setcounter{blindtext}{1} \setcounter{Blindtext}{5} \setcounter{blind@countparstart}{0}