Fix TOC for book and updating whitespace

compile.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+xelatex -halt-on-error master_article.tex
+xelatex -halt-on-error master_book.tex

master_article.tex

@@ -18,50 +18,50 @@
 \begin{document}
 
 \begin{multicols}{2}
-	\input{docs/intro}
+    \input{docs/intro}
 \end{multicols}
 \begin{multicols}{3}
-	\input{toc}
+    \input{toc}
 \end{multicols}
 \hrule
 
 \begin{multicols}{2}
-	\input{docs/region}
+    \input{docs/region}
 \end{multicols}
 \hrule
 
 \begin{multicols}{2}
-	\input{docs/state}
+    \input{docs/state}
 \end{multicols}
 \hrule
 
 \begin{multicols}{2}
-	\input{docs/perks}
+    \input{docs/perks}
 \end{multicols}
 \hrule
 
 \begin{multicols}{2}
-	\input{docs/storage}
+    \input{docs/storage}
 \end{multicols}
 \hrule
 
 \begin{multicols}{2}
-	\input{docs/resources}
+    \input{docs/resources}
 \end{multicols}
 \hrule
 
 \begin{multicols}{2}
-	\input{docs/work}
+    \input{docs/work}
 \end{multicols}
 \hrule
 
 \begin{multicols}{2}
-	\input{docs/war}
+    \input{docs/war}
 \end{multicols}
 \hrule
 
 \begin{multicols}{2}
-	\input{docs/parliament}
+    \input{docs/parliament}
 \end{multicols}
 \hrule
 

master_book.tex

@@ -18,7 +18,7 @@
 \begin{document}
 \input{docs/intro}
 \input{toc}
-\hrule
+\newpage
 
 \input{docs/region}
 \hrule
@@ -44,6 +44,7 @@
 \input{docs/parliament}
 \hrule
 
+\newpage
 \input{docs/checklist}
 \hrule
 \end{document}

preamble_article.tex

@@ -9,12 +9,12 @@
 
 % set page
 \usepackage[
-	paperwidth = 17.5cm,
-	paperheight = 150cm,
-	top = 10pt,
-	right = 0pt,
-	bottom = 35pt,
-	left = 0pt
+    paperwidth = 17.5cm,
+    paperheight = 150cm,
+    top = 10pt,
+    right = 0pt,
+    bottom = 35pt,
+    left = 0pt
 ]{geometry}
 
 % Table of content
@@ -23,3 +23,26 @@
 
 % Page numbering
 \pagenumbering{gobble}
+
+% TOC title
+\usepackage{titletoc}
+\titlecontents{section}
+    [15pt]
+    {\large\rmfamily}
+    {\contentslabel{15pt}}
+    {\hspace*{-9mm}}
+    {\contentspage}[\medskip]
+
+\titlecontents{subsection}
+    [25pt]
+    {\rmfamily}
+    {\contentslabel{25pt}}
+    {\hspace*{-12mm}}
+    {\contentspage}
+
+\titlecontents{subsubsection}
+    [35pt]
+    {\rmfamily}
+    {\contentslabel{35pt}}
+    {\hspace*{-12mm}}
+    {\contentspage}

preamble_book.tex

@@ -1 +1,24 @@
 \documentclass[11pt]{article}
+
+% TOC title
+\usepackage{titletoc}
+\titlecontents{section}
+    [15pt]
+    {\bigskip\rmfamily\Large}
+    {\contentslabel{15pt}}
+    {\fbox{\hspace*{2.3em}\rule{2.3em}{2pt}}}
+    {\titlerule*[1em]{}\contentspage}
+
+\titlecontents{subsection}
+    [35pt]
+    {\rmfamily}
+    {\contentslabel{25pt}}
+    {}
+    {\titlerule*[1em]{.}\contentspage\nobreak}
+
+\titlecontents{subsubsection}
+    [55pt]
+    {\rmfamily}
+    {\contentslabel{35pt}}
+    {}
+    {\titlerule*[1em]{.}\contentspage\nobreak}

preamble_main.tex

@@ -18,8 +18,6 @@
 \usepackage{pgfplotstable}
 % Table options
 \usepackage{booktabs}
-% More list options
-\usepackage{enumitem}
 % Title
 \usepackage{titlesec}
 
@@ -28,63 +26,31 @@
 % Paragraph
 \setlength{\parskip}{0pt}
 
-% List
-\setlist{leftmargin = 20pt}
-
-% set list size
-\setitemize{%
-	noitemsep,
-	topsep = 0pt,
-	parsep = 0pt,
-	partopsep = 0pt
-}
-\setlength{\columnseprule}{0.5pt}
-
 % Font
 \usepackage[scaled]{berasans}
 \renewcommand*\familydefault{\sfdefault}
 \usepackage{tgschola}
 
-\usepackage{titletoc}
-\titlecontents{section}
-    [15pt]
-    {\large\rmfamily}
-    {\contentslabel{15pt}}
-    {\hspace*{-9mm}}
-    {\contentspage}[\medskip]
-
-\titlecontents{subsection}
-    [25pt]
-    {\rmfamily}
-    {\contentslabel{25pt}}
-    {\hspace*{-12mm}}
-    {\contentspage}
 
-\titlecontents{subsubsection}
-    [35pt]
-    {\rmfamily}
-    {\contentslabel{35pt}}
-    {\hspace*{-12mm}}
-    {\contentspage}
 
 % Title
 \titleformat{\section}[runin]
-	{\rmfamily\Large\uppercase}
-	{\thesection}
-	{1ex}
-	{}
+    {\rmfamily\Large\uppercase}
+    {\thesection}
+    {1ex}
+    {}
 
 \titleformat{\subsection}[runin]
-	{\rmfamily\large\uppercase}
-	{\thesubsection}
-	{1ex}
-	{}
+    {\rmfamily\large\uppercase}
+    {\thesubsection}
+    {1ex}
+    {}
 
 \titleformat{\subsubsection}[runin]
-	{\rmfamily\normalsize\uppercase}
-	{\thesubsubsection}
-	{1ex}
-	{}
+    {\rmfamily\normalsize\uppercase}
+    {\thesubsubsection}
+    {1ex}
+    {}
 
 
 %%%%%%% Commands %%%%%%%