merged

Author: Chillee

README.md

@@ -37,7 +37,8 @@ To build KACTL, type `make kactl` (or `make fast`) on a \*NIX machine -- this wi
 kactl.pdf is to be kept to 25 pages + cover page.
 Occasionally the generated kactl.pdf is committed to the repo for convenience, but not too often because it makes git operations slower.
 
-Before printing KACTL for an official contest, you may want to locally change the arguments to `\team`, `\contest`, etc. in build/kactl.tex to something more fitting.
+Before printing KACTL for an official contest, you may want to locally change the arguments to `\team`, `\contest`, etc. in build/kactl.tex to something more fitting,
+You may also enable colored syntax highlighting in the same file.
 
 To upstream your changes, [send a pull request](https://help.github.com/articles/fork-a-repo/).
 

build/kactl.tex

@@ -6,14 +6,18 @@
 \team{Omogen Heap}{Simon Lindholm, Johan Sannemo, Mårten Wiman}
 % \contest{ACM-ICPC World Finals 2017}{May 24, 2017}
 \contest{\ }{\today}
+% \enablecolors
 
 \begin{document}
 	\maketeampage
 	% Small KACTL header on the first page:
 	% \maketitle{``One Last Time'' Edition}{\today}
 	\begin{multicols*}{3}
-	\setcounter{tocdepth}{0}
 	\thispagestyle{fancy}
+	% Table of contents, without subsections:
+	\setcounter{tocdepth}{0}
+	\tableofcontents
+
 	\kactlchapter{contest}
 	\kactlchapter{math}
 	\kactlchapter{data-structures}

build/kactlpkg.sty

@@ -39,9 +39,16 @@
 	\def\@unilogo{#3}
 }
 
+\newcommand{\enablecolors}{
+	\lstset{commentstyle=\color{darkgray}\normalfont\itshape}
+	\lstset{keywordstyle=\color{myblue}}
+	\lstset{identifierstyle=\color{black}}
+}
+
 % Some default config
 \subtitle{{\tiny new}KACTL}
 \title{KTH ACM Contest Template Library}
+\newcommand{\PDFColor}{0}
 
 \def\today{\number\year-\ifthenelse{\number\month<10}{0}{}\number\month-\ifthenelse{\number\day<10}{0}{}\number\day} % Defines \today as YYYY-MM-DD
 
@@ -158,6 +165,9 @@
 }
 \renewcommand*{\tilde}{\raise.17ex\hbox{$\scriptstyle\mathtt{\sim}$}}
 
+\definecolor{mygreen}{HTML}{007000}
+\definecolor{myblue}{HTML}{0000dd}
+
 % Configure source code listings
 \lstset{language=C++}
 \lstset{morekeywords={alignas,alignof}}

content/contest/.vimrc

@@ -1,6 +1,6 @@
 set cin aw ai is ts=4 sw=4 tm=50 nu noeb bg=dark ru cul
 sy on   |   im jk <esc>   |   im kj <esc>   |   no ; :
-" Select region and then type :H to hash your selection.
-" Useful for verifying that there aren't mistypes
-cmap H w !cpp -P -fpreprocessed \| tr -d '[:space:]' \
- \| md5sum \| cut -c1-6
+" Select region and then type :Hash to hash your selection.
+" Useful for verifying that there aren't mistypes.
+ca Hash w !cpp -dD -P -fpreprocessed \| tr -d '[:space:]' \
+ \| md5sum \| cut -c-6

content/contest/hash.sh

@@ -1,3 +1,3 @@
 # Hashes a file, ignoring all whitespace and comments. Use for
 # verifying that code was correctly typed.
-cpp -P -fpreprocessed | tr -d '[:space:]' | md5sum | cut -c1-6
+cpp -dD -P -fpreprocessed | tr -d '[:space:]'| md5sum |cut -c-6

fuzz-tests/ft2d.cpp renamed to fuzz-tests/data-structures/FenwickTree2d.cpp

@@ -10,7 +10,7 @@ typedef long long ll;
 typedef pair<int, int> pii;
 typedef vector<int> vi;
 
-#include "../content/data-structures/FenwickTree2d.h"
+#include "../../content/data-structures/FenwickTree2d.h"
 
 int main() {
 	rep(it,0,1000000) {

fuzz-tests/lazy-segment-tree.cpp renamed to fuzz-tests/data-structures/LazySegmentTree.cpp

@@ -10,8 +10,8 @@ typedef long long ll;
 typedef pair<int, int> pii;
 typedef vector<int> vi;
 
-#include "../content/data-structures/LazySegmentTree.h"
-// #include "../content/data-structures/old.h"
+#include "../../content/data-structures/LazySegmentTree.h"
+// #include "../../content/data-structures/old.h"
 
 static unsigned R;
 int ra() {

fuzz-tests/line-container.cpp renamed to fuzz-tests/data-structures/LineContainer.cpp

@@ -10,7 +10,7 @@ typedef long long ll;
 typedef pair<int, int> pii;
 typedef vector<int> vi;
 
-#include "../content/data-structures/LineContainer.h"
+#include "../../content/data-structures/LineContainer.h"
 
 namespace other {
 // source: https://github.com/niklasb/contest-algos/blob/master/convex_hull/dynamic.cpp

fuzz-tests/link-cut.cpp renamed to fuzz-tests/data-structures/LinkCutTree.cpp

@@ -10,8 +10,8 @@ typedef long long ll;
 typedef pair<int, int> pii;
 typedef vector<int> vi;
 
-#include "../content/graph/LinkCutTree.h"
-#include "../content/data-structures/UnionFind.h"
+#include "../../content/graph/LinkCutTree.h"
+#include "../../content/data-structures/UnionFind.h"
 
 int main() {
 	int s = (int)time(0);

fuzz-tests/rmq.cpp renamed to fuzz-tests/data-structures/RMQ.cpp

@@ -9,7 +9,7 @@ typedef long long ll;
 typedef pair<int, int> pii;
 typedef vector<int> vi;
 
-#include "../content/data-structures/RMQ.h"
+#include "../../content/data-structures/RMQ.h"
 
 int main() {
 	srand(2);