idk

16 files changed, 60 insertions, 50 deletions

diff --git a/zeitung/.gitignore b/zeitung/.gitignore
index 27514f8..63b68fb 100644
--- a/zeitung/.gitignore
+++ b/zeitung/.gitignore
@@ -1,7 +1,6 @@
 build/
 *.log
 svg-inkscape/
-parts/students/*/*.tex
-parts/students/figures/
-parts/test/
+parts/generated/**/*.tex
+parts/generated/students/figures/
 *.otf
diff --git a/zeitung/main.tex b/zeitung/main.tex
index 20c9af9..8aa38c9 100644
--- a/zeitung/main.tex
+++ b/zeitung/main.tex
@@ -1,13 +1,12 @@
 \documentclass[a4paper, 13pt]{article}
 
 % Packages
-\usepackage[a4paper, inner=2.5cm, outer=2.5cm, top=2.5cm, bottom=2.5cm, bindingoffset=0cm]{geometry}
+\usepackage[a4paper, inner=1.5cm, outer=1.5cm, top=1.5cm, bottom=3cm, bindingoffset=0cm]{geometry}
 \usepackage{amsmath,amsthm,amssymb,amsfonts}
 \usepackage{graphicx}
 \usepackage[colorlinks=true, allcolors=blue]{hyperref}
 \usepackage{fontspec,xunicode,xltxtra}
 \usepackage{afterpage}
-\usepackage{sectsty}
 \usepackage{float}
 \usepackage{kantlipsum,lipsum}
 \usepackage{eso-pic}
@@ -20,7 +19,6 @@
 
 % Font
 \setmainfont{"[tierra-nueva.otf]"}[BoldFont="[tierra-nueva-bold.otf]"]
-\sectionfont{\fontsize{20}{15}\selectfont}
 
 % GERMAN
 \usepackage[ngerman=ngerman-x-latest]{hyphsubst}
@@ -47,12 +45,12 @@
 \setlength{\headheight}{60pt}
 \addtolength{\topmargin}{-35pt}
 \pagestyle{fancy}
-\fancyheadoffset{2.5cm}
-\fancyfootoffset{2.5cm}
+\fancyheadoffset{1.5cm}
+\fancyfootoffset{1.5cm}
 \fancyhf{}
-\fancyhead[L]{\hspace*{1cm}\vspace*{0.7cm}\Huge{\rightmark}}
-\fancyfoot[R]{\vspace*{-15pt}\oddflip[keepaspectratio=true, width=\paperwidth]{welle.png}}
-\fancyfoot[L]{\checkoddpage\vspace*{-1.3cm}\hspace*{\ifoddpage 3cm \else 17.5cm \fi}\Huge{\thepage}}
+\fancyhead[L]{\hspace*{1cm}\vspace*{-0.3cm}\Huge{\rightmark}}
+\fancyfoot[R]{\vspace*{0cm}\oddflip[keepaspectratio=true, width=\paperwidth]{welle.png}}
+\fancyfoot[L]{\checkoddpage\vspace*{-0.7cm}\hspace*{\ifoddpage 3cm \else 17.5cm \fi}\Huge{\thepage}}
 
 % Custom title command for header
 \renewcommand{\sectionmark}[1]{\markright{#1}}
@@ -62,6 +60,9 @@
 	\addcontentsline{toc}{section}{\protect\numberline{\thesection}#1}
 }
 
+% I don't like paragraph indentation
+\setlength{\parindent}{0pt}
+
 \begin{document}
 
 \title{ABI Zeitung 2021}
@@ -77,13 +78,14 @@
 
 \def\part#1{\input{parts/#1.tex}\newpage}
 \def\student{\input{parts/studenttemplate.tex}}
-\def\stat#1{\input{parts/stats/#1.tex}}
+\def\ranking{\input{parts/rankingtemplate.tex}}
+\def\generated#1{\input{parts/generated/#1.tex}}
 
 %\maketitle
 
 \backgroundsetup{contents={}}
 \part{titlepage}
-\backgroundsetup{contents={\oddflip[keepaspectratio=true, width=\paperwidth]{kordel.png}},scale=1.1,placement=top,opacity=1,position={0.5\textwidth, 3.3cm}}
+\backgroundsetup{contents={\oddflip[keepaspectratio=true, width=\paperwidth]{kordel.png}},scale=1.1,placement=top,opacity=1,position={0.4\textwidth, 3.3cm}}
 \part{tableofcontents}
 \part{introduction}
 \part{classphoto}
@@ -92,7 +94,7 @@
 \part{teacherranking}
 \part{secrets}
 \part{classoverview}
-%\part{studentprofiles}
+\part{studentprofiles}
 \part{studentranking}
 \part{citations}
 \part{photos}
diff --git a/zeitung/parts/stats/.gitkeep b/zeitung/parts/generated/ranking/.gitkeep
index e69de29..e69de29 100644
--- a/zeitung/parts/stats/.gitkeep
+++ b/zeitung/parts/generated/ranking/.gitkeep
diff --git a/zeitung/parts/students/TGI13.1/.gitkeep b/zeitung/parts/generated/stats/.gitkeep
index e69de29..e69de29 100644
--- a/zeitung/parts/students/TGI13.1/.gitkeep
+++ b/zeitung/parts/generated/stats/.gitkeep
diff --git a/zeitung/parts/students/TGI13.2/.gitkeep b/zeitung/parts/generated/students/TGI13.1/.gitkeep
index e69de29..e69de29 100644
--- a/zeitung/parts/students/TGI13.2/.gitkeep
+++ b/zeitung/parts/generated/students/TGI13.1/.gitkeep
diff --git a/zeitung/parts/students/TGM13.1/.gitkeep b/zeitung/parts/generated/students/TGI13.2/.gitkeep
index e69de29..e69de29 100644
--- a/zeitung/parts/students/TGM13.1/.gitkeep
+++ b/zeitung/parts/generated/students/TGI13.2/.gitkeep
diff --git a/zeitung/parts/students/TGM13.2/.gitkeep b/zeitung/parts/generated/students/TGM13.1/.gitkeep
index e69de29..e69de29 100644
--- a/zeitung/parts/students/TGM13.2/.gitkeep
+++ b/zeitung/parts/generated/students/TGM13.1/.gitkeep
diff --git a/zeitung/parts/students/TGTM13.1/.gitkeep b/zeitung/parts/generated/students/TGM13.2/.gitkeep
index e69de29..e69de29 100644
--- a/zeitung/parts/students/TGTM13.1/.gitkeep
+++ b/zeitung/parts/generated/students/TGM13.2/.gitkeep
diff --git a/zeitung/parts/generated/students/TGTM13.1/.gitkeep b/zeitung/parts/generated/students/TGTM13.1/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/zeitung/parts/generated/students/TGTM13.1/.gitkeep
diff --git a/zeitung/parts/imprint.tex b/zeitung/parts/imprint.tex
index cee13b1..4b9bb3d 100644
--- a/zeitung/parts/imprint.tex
+++ b/zeitung/parts/imprint.tex
@@ -3,13 +3,16 @@
 % TODO: Druckerei, Auflage, Verfasser (PFLICHT)
 % Alle Rechte vorbehalten
 
-\begin{tabular}{ l l }
-	\textbf{V.i.S.d.P}               & RBS TG13                                         \\ % Verantwortlich im Sinne des Presserechts
-	\textbf{\LaTeX}                  & Marvin Borner, Lars Krönner                      \\
-	\textbf{Web-Plattform}           & Lars Krönner, Marvin Borner                      \\
-	\textbf{Web-Hosting}             & Marvin Borner                                    \\
-	\textbf{Design}                  & Leia Saumweber, Tomislav Strazanac               \\
-	\textbf{Finanzierung \& Werbung} & Lars Mayer                                       \\
-	\textbf{Planung \& Organisation} & Mathias Schmiegel, Sebastian Sutor               \\
-	\textbf{Open-Source Code}        & \url{https://github.com/marvinborner/abitur2021}
-\end{tabular}
+\textbf{Hinweis:} Der Inhalt dieser Abizeitung wurde komplett dynamisch mittels \LaTeX und JavaScript generiert. Der Source-Code dazu kann hier gefunden werden: \url{https://github.com/marvinborner/abitur2021}
+\newline
+\begin{table}[b]
+	\begin{tabular}{ l l }
+		\textbf{V.i.S.d.P}               & RBS TG13                           \\ % Verantwortlich im Sinne des Presserechts
+		\textbf{\LaTeX}                  & Marvin Borner, Lars Krönner        \\
+		\textbf{Web-Plattform}           & Lars Krönner, Marvin Borner        \\
+		\textbf{Web-Hosting}             & Marvin Borner                      \\
+		\textbf{Design}                  & Leia Saumweber, Tomislav Strazanac \\
+		\textbf{Finanzierung \& Werbung} & Lars Mayer                         \\
+		\textbf{Planung \& Organisation} & Mathias Schmiegel, Sebastian Sutor \\
+	\end{tabular}
+\end{table}
diff --git a/zeitung/parts/questionnaire.tex b/zeitung/parts/questionnaire.tex
index 1c75b4c..ac5a889 100644
--- a/zeitung/parts/questionnaire.tex
+++ b/zeitung/parts/questionnaire.tex
@@ -1,7 +1,7 @@
 \title{Prozent-Fragen}
 
 \begin{center}
-\hspace{-1.5cm}\begin{tikzpicture}
-    \stat{perc}
-\end{tikzpicture}
+	\hspace{-1.5cm}\begin{tikzpicture}
+		\generated{stats/perc}
+	\end{tikzpicture}
 \end{center}
diff --git a/zeitung/parts/rankingtemplate.tex b/zeitung/parts/rankingtemplate.tex
new file mode 100644
index 0000000..e223dd0
--- /dev/null
+++ b/zeitung/parts/rankingtemplate.tex
@@ -0,0 +1,13 @@
+\providecommand\rankingquestion[1]{
+	\textbf{#1}\\
+}
+
+\providecommand\rankinganswer[2]{
+	\textbf{#1}: #2\\
+}
+
+\providecommand\rankinganswersstart{
+}
+
+\providecommand\rankinganswersstop{
+}
diff --git a/zeitung/parts/stats/perc.tex b/zeitung/parts/stats/perc.tex
deleted file mode 100644
index 8042777..0000000
--- a/zeitung/parts/stats/perc.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-\node at (0, 2.75) {Bist du Single/Vergeben?};\pie[hide number, scale font, sum=auto, text=inside, pos={0,0}, radius=2.5]{41/Single, 13/Vergeben}
-\node at (8, 2.75) {Wie kommst du hauptsächlich zur Schule?};\pie[hide number, scale font, sum=auto, text=inside, pos={8,0}, radius=2.5]{21/Bus, 21/Auto, 7/Bahn, 3/Fahrrad, 2/Fuß}
-\node at (0, 8.75) {Hast du schon einmal blau gemacht?};\pie[hide number, scale font, sum=auto, text=inside, pos={0,6}, radius=2.5]{35/Ja, 19/Nein}
-\node at (8, 8.75) {Was machst du nach der Schule?};\pie[hide number, scale font, sum=auto, text=inside, pos={8,6}, radius=2.5]{28/Studium, 10/Ausbildung, 7/Keine Ahnung, 4/Arbeit, 4/Pause, 1/Work \& Travel}
-\node at (0, 14.75) {Hast du Geschwister?};\pie[hide number, scale font, sum=auto, text=inside, pos={0,12}, radius=2.5]{53/Ja, 1/Nein}
-\node at (8, 14.75) {Rauchst du?};\pie[hide number, scale font, sum=auto, text=inside, pos={8,12}, radius=2.5]{40/Nein, 7/Ja, 7/Auf Partys}
-\node at (0, 20.75) {Hast du bewusstseinserweiternde Substanzen zu dir genommen?};\pie[hide number, scale font, sum=auto, text=inside, pos={0,18}, radius=2.5]{33/Nein, 21/Ja}
-\node at (8, 20.75) {Bist du noch Jungfrau (nicht Sternzeichen)?};\pie[hide number, scale font, sum=auto, text=inside, pos={8,18}, radius=2.5]{29/Nein, 21/Ja}
diff --git a/zeitung/parts/studentprofiles.tex b/zeitung/parts/studentprofiles.tex
index 67d69d0..05da565 100644
--- a/zeitung/parts/studentprofiles.tex
+++ b/zeitung/parts/studentprofiles.tex
@@ -2,8 +2,8 @@
 \kant[1-3]
 \newpage
 
-\inputall{parts/students/TGI13.1}
-\inputall{parts/students/TGI13.2}
-\inputall{parts/students/TGM13.1}
-\inputall{parts/students/TGM13.2}
-\inputall{parts/students/TGTM13.1}
+\inputall{parts/generated/students/TGI13.1}
+%\inputall{parts/generated/students/TGI13.2}
+%\inputall{parts/generated/students/TGM13.1}
+%\inputall{parts/generated/students/TGM13.2}
+%\inputall{parts/generated/students/TGTM13.1}
diff --git a/zeitung/parts/studenttemplate.tex b/zeitung/parts/studenttemplate.tex
index 057a85f..d02c7b3 100644
--- a/zeitung/parts/studenttemplate.tex
+++ b/zeitung/parts/studenttemplate.tex
@@ -17,18 +17,18 @@
 }
 
 % Ring
-\def\ringx{50pt}
+\def\ringx{20pt}
 \def\ringy{250pt}
 \def\ringwidth{250pt}
 \def\ringimgwidth{180pt}
 \def\ringoffset{(\ringwidth - \ringimgwidth) / 2}
 \ifoddpage\else
-	\def\ringx{-\paperwidth - 350pt} % ringwidth + 2 * ringx
+	\def\ringx{-\paperwidth - 325pt} % ringwidth + 2 * ringx % Nope, idk anymore
 \fi
 \AddToShipoutPictureBG*{
 	\AtTextUpperLeft{
 		\put(-\ringx + \ringoffset, -\ringy + \ringoffset){
-			\dfincludegraphics[keepaspectratio=true, width=\ringimgwidth]{parts/students/figures/bornerma.jpg}
+			\dfincludegraphics[keepaspectratio=true, width=\ringimgwidth]{parts/generated/students/figures/bornerma.jpg}
 		}
 		\put(-\ringx, -\ringy){
 			\oddflip[keepaspectratio=true, width=\ringwidth]{ring.png}
@@ -37,18 +37,18 @@
 }
 
 % Frame
-\def\framex{130pt}
+\def\framex{160pt}
 \def\framey{20pt}
 \def\framewidth{180pt}
 \def\frameimgwidth{160pt}
 \def\frameoffset{(\framewidth - \frameimgwidth) / 2}
 \ifoddpage\else
-	\def\framex{518pt} % paperwidth - framewidth / 2
+	\def\framex{540pt} % paperwidth - framewidth / 2 % Nope, idk anymore
 \fi
 \AddToShipoutPictureBG*{
 	\AtTextLowerLeft{
 		\put(\textwidth - \framex + \frameoffset, \framey + \frameoffset + 8pt){
-			\dfincludegraphics[keepaspectratio=true, width=\frameimgwidth]{parts/students/figures/child_\stdid.jpg}
+			\dfincludegraphics[keepaspectratio=true, width=\frameimgwidth]{parts/generated/students/figures/child_\stdid.jpg}
 		}
 		\put(\textwidth - \framex, \framey){
 			\oddflip[keepaspectratio=true, width=\framewidth]{rahmen.png}
@@ -60,7 +60,7 @@
 \ifoddpage
 	\def\tablex{0.5\linewidth}
 \else
-	\def\tablex{-1cm}
+	\def\tablex{-0cm}
 \fi
 \def\tablewidth{0.6\linewidth}
 
@@ -88,14 +88,14 @@
 % Divider
 \providecommand\divider{
 	\begin{figure}[H]
-		\hspace*{-2.5cm}\includegraphics[keepaspectratio=true, width=\paperwidth]{mittelwelle.png}
+		\hspace*{-1.5cm}\includegraphics[keepaspectratio=true, width=\paperwidth]{mittelwelle.png}
 	\end{figure}
 }
 
 % Comments
 \def\commentswidth{0.7\linewidth}
 \ifoddpage
-	\def\commentsx{-1cm}
+	\def\commentsx{-0cm}
 \else
 	\def\commentsx{\framewidth}
 \fi
diff --git a/zeitung/parts/teacherranking.tex b/zeitung/parts/teacherranking.tex
index 67b66a3..3c44a3e 100644
--- a/zeitung/parts/teacherranking.tex
+++ b/zeitung/parts/teacherranking.tex
@@ -1,2 +1,3 @@
 \title{Lehrerranking}
-\lipsum[1-2]
+
+\generated{ranking/teacher}