From b0e62a184c2a71b3accddcffb8f42d271e35dbda Mon Sep 17 00:00:00 2001
From: Gaetano <gaetano.geck@tu-dortmund.de>
Date: Fri, 28 Feb 2020 12:23:03 +0100
Subject: [PATCH] Kaffeeliste: Anpassungen Januar-Februar 2020.

---
 Kaffeeliste/Konsum/Konsum.tex      | 30 +++++++++++++++++++++++--
 Kaffeeliste/Konsum/Konsumenten.tex | 36 ++++++++++++++----------------
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/Kaffeeliste/Konsum/Konsum.tex b/Kaffeeliste/Konsum/Konsum.tex
index 29af373..39cad2c 100644
--- a/Kaffeeliste/Konsum/Konsum.tex
+++ b/Kaffeeliste/Konsum/Konsum.tex
@@ -23,7 +23,7 @@
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Daten (Vieltrinker, Gelegenheitstrinker)
+% Daten (Könige des Kaffees, Unbeherrschte, Vieltrinker, Gelegenheitstrinker)
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \input{Konsumenten.tex}
 
@@ -39,7 +39,7 @@
 \providecommand{\Zeitraum}{??-?? ????}
 \providecommand{\Info}{}
 \providecommand{\Anzahl}[1]{\tiny #1}
-\providecommand{\AnzahlGaeste}{4}
+\providecommand{\AnzahlGaeste}{5}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \newenvironment{Titel}%
@@ -84,6 +84,15 @@
 	}%
 }
 
+\newcommand{\Label}[2][]{%
+	\ifstrempty{#1}{%
+		\def\Farbe{gray}%
+	}{%
+		\def\Farbe{gray!50!red}%
+	}%
+	\hfill\textbf{\textcolor{\Farbe}{#2}}
+}
+
 \begin{document}
 	\sffamily
 	\begin{Titel}
@@ -92,6 +101,21 @@
 	\vspace*{-8mm}%
 	\begin{center}\Info\end{center}
 
+	\Label[gray!50!red]{Kings of Coffee}
+	\foreach \name in \KingsOfCoffee {%
+		\begin{Eintrag}[colframe=gray!50!red]
+			\vspace*{-1.5mm}
+			\begin{minipage}[h]{3.0cm}
+				\Name{\name}
+			\end{minipage}
+			\begin{minipage}[h]{23cm}
+				\Kreuze{4}{8}{5}\vspace{-\baselineskip}
+			\end{minipage}
+			\vspace*{+2.4mm}
+		\end{Eintrag}
+	}%
+	\vspace*{1em}
+	\Label{Unbeherrschte}
 	\foreach \name in \Unbeherrschte {%
 		\begin{Eintrag}%[colframe=gray!50!red]
 			\vspace*{-1.5mm}
@@ -105,6 +129,7 @@
 		\end{Eintrag}
 	}%
 	\vspace*{1em}
+	\Label{Vieltrinker}
 	\foreach \name in \Vieltrinker {%
 		\begin{Eintrag}%[colframe=gray!50!blue]
 			\begin{minipage}[h]{3.0cm}
@@ -119,6 +144,7 @@
 		\vspace*{-1mm}%
 	}%
 	\vspace*{1em}
+	\Label{Gelegenheitstrinker}
 	\foreach \name in \Gelegenheitstrinker {%
 		\begin{Eintrag}
 			\begin{minipage}[h]{3.0cm}
diff --git a/Kaffeeliste/Konsum/Konsumenten.tex b/Kaffeeliste/Konsum/Konsumenten.tex
index 8c02fce..7949cb6 100644
--- a/Kaffeeliste/Konsum/Konsumenten.tex
+++ b/Kaffeeliste/Konsum/Konsumenten.tex
@@ -1,29 +1,27 @@
-\providecommand{\Zeitraum}{November -- Dezember 2019}
+\providecommand{\Zeitraum}{März -- April 2020}
 \providecommand{\Info}{30 Cent pro Tasse}
 
+\newcommand{\KingsOfCoffee}{%
+	Christopher,
+	Jesse%
+}
+
 \newcommand{\Unbeherrschte}{%
-	Christopher,%
-	Jonas S.
+	Jonas S.%
 }
 
 \newcommand{\Vieltrinker}{%
-	Gaetano,%
-	Jesse,%
-	Jos,%
-	Katja,%
-	Peter,%
-	Thomas
+	Gaetano,
+	Katja,
+	Thomas%
 }
 
 \newcommand{\Gelegenheitstrinker}{%
-	Anja,%
-	Arthur,%
-	Diana,%
-	Fabian,%
-	Gaby,%
-	Jannis,%
-	Jonas,%
-	Marco,%
-	Meliha,%
-	Philip
+	Anja,
+	Arthur,
+	Fabian,
+	Jos,
+	Marco,
+	Meliha,
+	Peter%
 }