diff --git a/documents/bierbook/Makefile b/documents/bierbook/Makefile
index 3ccc22926..2d35f231e 100644
--- a/documents/bierbook/Makefile
+++ b/documents/bierbook/Makefile
@@ -1,9 +1,9 @@
all: bierbook.pdf seshbook.pdf
#If using windows uncomment this
-LATEXTOOL=pdflatex.exe
+#LATEXTOOL=pdflatex.exe
#If using linux or macos(?) uncomment this
-#LATEXTOOL=pdflatex
+LATEXTOOL=pdflatex
bierbook.pdf: bierbook.tex names.txt dates.txt bierbook-style.sty
$(LATEXTOOL) -synctex=1 -interaction=nonstopmode -shell-escape bierbook.tex
diff --git a/documents/bierbook/bierbook.tex b/documents/bierbook/bierbook.tex
index fd8eab1fd..54b87ec15 100644
--- a/documents/bierbook/bierbook.tex
+++ b/documents/bierbook/bierbook.tex
@@ -27,39 +27,77 @@
\vspace{20pt}
}
-\newcommand{\drinkstally}[2]{
-% argument is the title, second is the starting number for the tally
+\newcommand{\tallyeveryone}[3]{
+% argument is the title, second is the subtitle, third is starting number for the tally
% longtable, generated from the list of names
-% uses drinkstallyline for each line
+% uses tallyline for each line
\addcontentsline{toc}{section}{#1}
\openin\namesread=names.txt
\setcounter{linecount}{0}
\begin{longtable}{rc}
\multicolumn{2}{l}{\expoheading{#1}} \\
+\multicolumn{2}{p{\textwidth}}{#2} \\
&
-\drinkstallynumbers{#2}
+\tallynumbers{#3}
\\
\endfirsthead
+\multicolumn{2}{p{\textwidth}}{#2} \\
&
-\drinkstallynumbers{#2}
+\tallynumbers{#3}
\\
\endhead
&
-\drinkstallynumbers{#2}
+\tallynumbers{#3}
\\
\endfoot
\whiledo{\value{linecount}<\value{maxlines}}{
\stepcounter{linecount}
\read\namesread to \currentname
- \drinkstallyline{\currentname}
+ \tallyline{\currentname}
}
\end{longtable}
\clearpage
}
-\newcommand{\drinkstallyline}[1]{
+\newcounter{maxspares}
+
+\newcommand{\tallyspares}[4]{
+ % argument is the title, second is the subtitle, third is starting number for the tally, fourth is the number of lines
+ % longtable, generated from the list of names
+ % uses tallyline for each line
+ \addcontentsline{toc}{section}{#1}
+ \openin\namesread=names.txt
+ \setcounter{linecount}{0}
+ \setcounter{maxspares}{#4}
+ \begin{longtable}{rc}
+ \multicolumn{2}{l}{\expoheading{#1}} \\
+ \multicolumn{2}{p{\textwidth}}{#2} \\
+ &
+ \tallynumbers{#3}
+ \\
+ \endfirsthead
+ \multicolumn{2}{p{\textwidth}}{#2} \\
+ &
+ \tallynumbers{#3}
+ \\
+ \endhead
+ &
+ \tallynumbers{#3}
+ \\
+ \endfoot
+
+ \whiledo{\value{linecount}<\value{maxspares}}{
+ \tallyline{\ldots\ldots\ldots}
+ \stepcounter{linecount}
+ }
+
+ \end{longtable}
+ \clearpage
+}
+
+\newcommand{\tallyline}[1]{
% argument is the name on the line
% boxes are a tikz grid
\begin{tikzpicture}
@@ -85,22 +123,26 @@
\\
}
-\newcounter{drinksnumber}
+\newcounter{tallynumber}
-\newcommand{\drinkstallynumbers}[1]{
+\newcommand{\tallynumbers}[1]{
% argument is the starting number
-\setcounter{drinksnumber}{#1}
+\setcounter{tallynumber}{#1}
\begin{tikzpicture}
\pgfmathsetmacro{\wvar}{0.4}
\foreach \xvar in {0,5.5,11,16.5,22,27.5}
{
- \node at (\xvar*\wvar,0) [anchor=center] {\arabic{drinksnumber}};
+ \node at (\xvar*\wvar,0) [anchor=center] {\arabic{tallynumber}};
\node at (\xvar*\wvar,0.4) {};
- \addtocounter{drinksnumber}{10}
+ \addtocounter{tallynumber}{10}
}
\end{tikzpicture}
}
+\newcommand{\drinksssubtitle}{
+ / = G{\"o}sser, X = Limo, R = Radler, W = Weissbier, D = Dunkelbier, L = Loserbier
+}
+
\newcommand{\nightstally}[5]{
% arguments are the title, subheading information, and dates for the three weeks
% longtable, generated from the list of names
@@ -135,33 +177,42 @@
% argument is the name on the line
% boxes are a tikz grid
\begin{tikzpicture}
-\pgfmathsetmacro{\wvar}{0.5}
-\node at (0,0.3*\wvar) [anchor=east] {#1};
+\pgfmathsetmacro{\wvar}{0.4}
+\node at (0,0.6*\wvar) [anchor=east] {#1};
\node at (0,0) {};
\node at (0,\wvar) {};
\end{tikzpicture}
\and
\begin{tikzpicture}
-\pgfmathsetmacro{\wvar}{0.5}
-\foreach \yvar in {0,1,2,3,4,5,6}
+\pgfmathsetmacro{\wvar}{0.4}
+\foreach \xvar in {0,1}
{
- \draw (\yvar*\wvar,0) -- ++ (0,\wvar) -- ++ (\wvar,0) -- ++ (0,-\wvar) -- cycle;
+ \foreach \yvar in {0,1,2,3,4,5,6}
+ {
+ \draw (\yvar*\wvar,\xvar*\wvar) -- ++ (0,\wvar) -- ++ (\wvar,0) -- ++ (0,-\wvar) -- cycle;
+ }
}
\end{tikzpicture}
\and
\begin{tikzpicture}
-\pgfmathsetmacro{\wvar}{0.5}
-\foreach \yvar in {0,1,2,3,4,5,6}
+\pgfmathsetmacro{\wvar}{0.4}
+\foreach \xvar in {0,1}
{
- \draw (\yvar*\wvar,0) -- ++ (0,\wvar) -- ++ (\wvar,0) -- ++ (0,-\wvar) -- cycle;
+ \foreach \yvar in {0,1,2,3,4,5,6}
+ {
+ \draw (\yvar*\wvar,\xvar*\wvar) -- ++ (0,\wvar) -- ++ (\wvar,0) -- ++ (0,-\wvar) -- cycle;
+ }
}
\end{tikzpicture}
\and
\begin{tikzpicture}
-\pgfmathsetmacro{\wvar}{0.5}
-\foreach \yvar in {0,1,2,3,4,5,6}
+\pgfmathsetmacro{\wvar}{0.4}
+\foreach \xvar in {0,1}
{
- \draw (\yvar*\wvar,0) -- ++ (0,\wvar) -- ++ (\wvar,0) -- ++ (0,-\wvar) -- cycle;
+ \foreach \yvar in {0,1,2,3,4,5,6}
+ {
+ \draw (\yvar*\wvar,\xvar*\wvar) -- ++ (0,\wvar) -- ++ (\wvar,0) -- ++ (0,-\wvar) -- cycle;
+ }
}
\end{tikzpicture}
\\
@@ -169,7 +220,7 @@
\newcommand{\weekdays}{
\begin{tikzpicture}
- \pgfmathsetmacro{\wvar}{0.5}
+ \pgfmathsetmacro{\wvar}{0.4}
\foreach \yvar/\zvar in {0/S,1/M,2/T,3/W,4/T,5/F,6/S}
{
\node at (\yvar*\wvar,0) [anchor=center] {\zvar};
@@ -178,51 +229,9 @@
}
\newcommand{\nightssubtitle}{
+ Top line for where you spend the night:
/ = basecamp, S = stonebridge bivvy, B = bivvying elsewhere, - = not there.
-}
-
-\newcommand{\timesubtitle}{
- For boasting purposes only.
-}
-
-\newcommand{\expoweather}[1]{
-% argument is the start date of the expo
-% longtable generated from incremeting the date for 6 weeks
-% simple box in which to write what happened
-\begin{longtable}{|l|p{10cm}|}
- \multicolumn{4}{l}{\expoheading{Expo Transport}} \\
- \endfirsthead
- \expoweatherweek{}
- \expoweatherweek{}
- \expoweatherweek{}
- \expoweatherweek{}
- \expoweatherweek{}
- \expoweatherweek{}
-\end{longtable}
-}
-
-\newcommand{\expoweatherline}[1]{
-% argument is the day text
-\begin{tikzpicture}
-\pgfmathsetmacro{\wvar}{1.5}
-\node at (0,0.3*\wvar) [anchor=east] {#1};
-\node at (0,0) {};
-\node at (0,\wvar) {};
-\end{tikzpicture}
-& \\
-\midrule
-}
-
-\newcommand{\expoweatherweek}[1]{
-% argument is the start of the week
-\midrule
-\expoweatherline{Monday}
-\expoweatherline{Tuesday}
-\expoweatherline{Wednesday}
-\expoweatherline{Thursday}
-\expoweatherline{Friday}
-\expoweatherline{Saturday}
-\expoweatherline{Sunday}
+ Bottom line for time spent underground.
}
\newcommand{\expotransport}{
@@ -242,11 +251,11 @@
\end{longtable}
}
-\newcommand{\moneypaid}{
-% creates a series of pages for the money paid to individuals
-% each person gets a page as made by moneypaidperson
+\newcommand{\moneyowed}{
+% creates a series of pages for the money owed to individuals
+% each person gets a page as made by moneyowedperson
% generated from the names list
-\addcontentsline{toc}{chapter}{Money paid to ...}
+\addcontentsline{toc}{chapter}{Money owed to ...}
\openin\namesread=names.txt
\setcounter{linecount}{0}
@@ -254,45 +263,44 @@
\whiledo{\value{linecount}<\value{maxlines}}{
\stepcounter{linecount}
\read\namesread to \currentname
- \moneypaidperson{\currentname}
+ \moneyowedperson{\currentname}
}
}
-\newcommand{\moneypaidperson}[1]{
-% argument is who the money is to be paid to
+\newcommand{\moneyowedperson}[1]{
+% argument is who the money is owed to
% longtable to spread over multiple pages
% date / owed by / description
\addcontentsline{toc}{section}{#1}
-\begin{longtable}{p{2cm}|p{2cm}|p{10cm}}
- \multicolumn{3}{l}{\expoheading{Money paid to #1}} \\
- \multicolumn{3}{p{\textwidth}}{Please include each transaction only once, either as positive credit or a negative debit. \vspace{1cm}} \\
- Date & Creditor & Notes \\
+\begin{longtable}{p{2cm}|p{2cm}|p{2cm}|p{8cm}}
+ \multicolumn{4}{l}{\expoheading{Money owed to #1}} \\
+ \multicolumn{4}{p{\textwidth}}{Please include each transaction only once, either as positive credit or a negative debit. \vspace{1cm}} \\
+ Date & Who & Amount & Notes \\
\midrule
\endfirsthead
- Date & Creditor & Notes \\
+ Date & Who & Amount & Notes \\
\midrule
\endhead
- \vspace{18.3cm} & & \\
- \vspace{22cm} & & \\
+ \vspace{18.8cm} & & & \\
+ \vspace{22cm} & & & \\
\end{longtable}
\clearpage
}
-\newcommand{\moneypaidgasthof}{
-% argument is who the money is to be paid to
+\newcommand{\moneyowedgasthof}{
% longtable to spread over multiple pages
% date / owed by / description
-\addcontentsline{toc}{chapter}{Money paid to Karin}
-\begin{longtable}{p{2cm}|p{2cm}|p{10cm}}
- \multicolumn{3}{l}{\expoheading{Money paid to Karin}} \\
- Date & Creditor & Notes \\
+\addcontentsline{toc}{chapter}{Money owed to Karin (the Gasthof)}
+\begin{longtable}{p{2cm}|p{2cm}|p{2cm}|p{8cm}}
+ \multicolumn{4}{l}{\expoheading{Money owed to Karin Wilpernig (the Gasthof)}} \\
+ Date & Who & Amount & Notes \\
\midrule
\endfirsthead
- Date & Creditor & Notes \\
+ Date & Who & Amount & Notes \\
\midrule
\endhead
- \vspace{18.3cm} & & \\
- \vspace{22cm} & & \\
+ \vspace{20.3cm} & & & \\
+ \vspace{22cm} & & & \\
\end{longtable}
\clearpage
}
@@ -332,36 +340,32 @@
\expotitle
\printtoc
+
+\addcontentsline{toc}{chapter}{Drinks}
+\tallyeveryone{Drinks 1-50}{\drinksssubtitle}{0}
+\tallyspares{Spare Drinks 51-100}{\drinksssubtitle}{50}{15}
+
+\addcontentsline{toc}{chapter}{Nights}
+\nightstally{Nights and Time Underground, Weeks 1-3}{\nightssubtitle}{\firstweek}{\secondweek}{\thirdweek}
+\nightstally{Nights and Time Underground, Weeks 4-6}{\nightssubtitle}{\fourthweek}{\fifthweek}{\sixthweek}
+
\cleardoublepage
this page intentionally left blank
\clearpage
-\addcontentsline{toc}{chapter}{Drinks}
-\drinkstally{Bier 1-50}{0}
-\drinkstally{Bier 51-100}{50}
-\drinkstally{Limo 1-50}{0}
-\drinkstally{Limo 51-100}{50}
-\drinkstally{Other Drinks (specify)}{0}
-\drinkstally{Noteable farts}{0}
-
-\addcontentsline{toc}{chapter}{Nights}
-\nightstally{Nights Weeks 1-3}{\nightssubtitle}{\firstweek}{\secondweek}{\thirdweek}
-\nightstally{Nights Weeks 4-6}{\nightssubtitle}{\fourthweek}{\fifthweek}{\sixthweek}
-\nightstally{Time underground Weeks 1-3}{\timesubtitle}{\firstweek}{\secondweek}{\thirdweek}
-\nightstally{Time underground Weeks 4-6}{\timesubtitle}{\fourthweek}{\fifthweek}{\sixthweek}
-
-\moneypaid
-\moneypaidgasthof
+\moneyowed
+\moneyowedgasthof
\expotransport
-%\expoweather{arg1}
-\blankpage{Squashed Flies}
\blankpage{Toll road info}
+\blankpage{Gear left up the hill}
+\blankpage{Gear taken back to Cambridge}
+\blankpage{Top camp food bought}
+\blankpage{First Aid}
\blankpage{In Austria Jollies}
\blankpage{Suggestions for next year}
-\blankpage{Gear left up the hill}
\blankpage{Quotes}
-\end{document}
\ No newline at end of file
+\end{document}
diff --git a/documents/bierbook/seshbook.tex b/documents/bierbook/seshbook.tex
index 7010d02b4..d8dafb77f 100644
--- a/documents/bierbook/seshbook.tex
+++ b/documents/bierbook/seshbook.tex
@@ -37,7 +37,7 @@
% longtable
\begin{longtable}{p{10cm}|p{2cm}|p{2cm}}
\multicolumn{3}{l}{\expoheading{Sesh #1 - \ldots/\ldots/\the\year}} \\
-Attendee \and Amount Owed \and Amount Paid \\
+Attendee \and Amount Ordered \and Amount Paid \\
\toprule
\endhead
%
@@ -73,10 +73,10 @@ Please use this page to record details of the sesh, who ordered what, how much i
\multicolumn{5}{l}{\expoheading{Expo Dinner}} \\
\multicolumn{5}{p{\textwidth}}{Please record people's dinner choices here in advance of the expo dinner.}
\vspace{1cm}\\
-Name \and Starter \and Main \and Desert \and Notes \\
+Name \and Attending? \and Allergies? \and Dessert \and Notes \\
\toprule
\endfirsthead
-Name \and Starter \and Main \and Desert \and Notes \\
+Name \and Attending? \and Allergies? \and Dessert \and Notes \\
\toprule
\endhead
\bottomrule
@@ -92,6 +92,7 @@ Name \and Starter \and Main \and Desert \and Notes \\
%
\read\namesread to \currentname
\dinnerline{\currentname}
+\midrule
%
\end{longtable}
\clearpage
@@ -156,4 +157,4 @@ Name \and Starter \and Main \and Desert \and Notes \\
\dinnerlist
-\end{document}
\ No newline at end of file
+\end{document}