diff --git a/Kaffeeliste/Konsum/Konsum.tex b/Kaffeeliste/Konsum/Konsum.tex index be12ba1..c501d5d 100644 --- a/Kaffeeliste/Konsum/Konsum.tex +++ b/Kaffeeliste/Konsum/Konsum.tex @@ -12,7 +12,7 @@ %\usepackage{luaotfload} %\usepackage[EU2]{fontenc} \usepackage{lmodern} -\usepackage[left=0.5cm,right=0.5cm,top=1cm,bottom=1cm]{geometry} +\usepackage[left=0.5cm,right=0.5cm,top=.5cm,bottom=.5cm]{geometry} \usepackage{tcolorbox} \usepackage{pgffor} \usepackage{ifthen} @@ -39,7 +39,7 @@ \providecommand{\Zeitraum}{??-?? ????} \providecommand{\Info}{} \providecommand{\Anzahl}[1]{\tiny #1} -\providecommand{\AnzahlGaeste}{5} +\providecommand{\AnzahlGaeste}{3} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newenvironment{Titel}% @@ -93,13 +93,31 @@ \hfill\textbf{\textcolor{\Farbe}{#2}} } +\newcommand{\Eintraege}[5]{% + \foreach \name in #1 {% + \begin{Eintrag} + \begin{minipage}[h]{3.0cm} + \vspace*{#5} + \Name{\name} + \end{minipage} + \begin{minipage}[h]{23cm} + \vspace*{#3} + \Kreuze{#2}{8}{5}\vspace{-\baselineskip} + \end{minipage} + \vspace*{#4} + \end{Eintrag} + }% +% \vspace*{.5em} +} + \begin{document} \sffamily \begin{Titel} \textbf{Kaffee} (\Zeitraum) \textbf{Coffee} \end{Titel} - \vspace*{-8mm}% - \begin{center}\Info\end{center} + + \vspace{-4mm} + {\hfill \Info \hfill} % \Label[gray!50!red]{Kings of Coffee} % \foreach \name in \KingsOfCoffee {% @@ -115,52 +133,20 @@ % \end{Eintrag} % }% % \Label{Unbeherrschte} - \foreach \name in \Unbeherrschte {% - \begin{Eintrag}%[colframe=gray!50!red] - \vspace*{-1.5mm} - \begin{minipage}[h]{3.0cm} - \Name{\name} - \end{minipage} - \begin{minipage}[h]{23cm} - \Kreuze{3}{8}{5}\vspace{-\baselineskip} - \end{minipage} - \vspace*{+1.5mm} - \end{Eintrag} - }% - \vspace*{.5em} -% \Label{Vieltrinker} - \foreach \name in \Vieltrinker {% - \begin{Eintrag}%[colframe=gray!50!blue] - \begin{minipage}[h]{3.0cm} - \Name{\name} - \end{minipage} - \begin{minipage}[h]{23cm} - \vspace*{-6.0mm} - \Kreuze{2}{8}{5}\vspace{-\baselineskip} - \vspace*{-1.5mm} - \end{minipage} - \end{Eintrag} - \vspace*{-1mm}% - }% - \vspace*{1em} -% \Label{Gelegenheitstrinker} - \foreach \name in \Gelegenheitstrinker {% - \begin{Eintrag} - \begin{minipage}[h]{3.0cm} - \vspace*{-1mm} - \Name{\name} - \vspace*{-1mm} - \end{minipage} - \begin{minipage}[h]{23cm} - \vspace*{-6.0mm} - \Kreuze{1}{8}{5}\vspace{-\baselineskip} - \vspace*{-1.5mm} - \end{minipage} - \end{Eintrag} - \vspace*{-1mm}% - }% +\textbf{Lehrstuhl Informatik 1} +%\Eintraege{\UnbeherrschteLSI}{3}{-1mm}{+1mm}{0mm} +\Eintraege{\VieltrinkerLSI}{2}{-2mm}{-2mm}{0mm} +\Eintraege{\GelegenheitstrinkerLSI}{1}{-6mm}{-6mm}{-1mm} - \vfill +\vspace{.25cm} +\textbf{Lehrstuhl Informatik 2} +%\Eintraege{\UnbeherrschteLSII}{3}{-1mm}{+1mm}{0mm} +\Eintraege{\VieltrinkerLSII}{2}{-2mm}{-2mm}{0mm} +%\Eintraege{\GelegenheitstrinkerLSI}{1}{-6mm}{-6mm}{-1mm} + +%\pagebreak +%\vfill +\vspace{.25cm} \textbf{Gäste/Guests/Add-ons} \foreach \name in {1,...,\AnzahlGaeste} {% \begin{Eintrag}[colframe=gray!70!green]% diff --git a/Kaffeeliste/Konsum/Konsumenten.tex b/Kaffeeliste/Konsum/Konsumenten.tex index 5bf8238..c755283 100644 --- a/Kaffeeliste/Konsum/Konsumenten.tex +++ b/Kaffeeliste/Konsum/Konsumenten.tex @@ -1,25 +1,37 @@ -\providecommand{\Zeitraum}{März -- April 2020} +\providecommand{\Zeitraum}{November -- Dezember 2021} \providecommand{\Info}{30 Cent pro Tasse} -\newcommand{\Unbeherrschte}{% +\newcommand{\UnbeherrschteLSI}{% +} + +\newcommand{\VieltrinkerLSI}{% Christopher, - Jesse, - Jonas S.% + Jonas S., + Thomas% } -\newcommand{\Vieltrinker}{% - Jos,% - Peter,% - Thomas -} - -\newcommand{\Gelegenheitstrinker}{% +\newcommand{\GelegenheitstrinkerLSI}{% Anja,% - Arthur,% Diana,% - Fabian,% Gaby,% + Jesse, Jonas,% Marco,% Meliha } + +%\newcommand{\UnbeherrschteLSI}{% +% + +\newcommand{\VieltrinkerLSII}{% + Bea, + Joon, + Jean, + Oli, + Max, + ACO, + Maurice +} + +%\newcommand{\GelegenheitstrinkerLSII}{% +%}