From 59b98898c12b667800d57b3d5822966f27b3e9ce Mon Sep 17 00:00:00 2001
From: Markus Re1 <markus@re1.at>
Date: Tue, 17 Apr 2018 20:41:09 +0200
Subject: [PATCH] Fix clean on make script and improve option order in class
 file

---
 make         |  3 ++-
 protocol.cls | 36 ++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/make b/make
index 4cc8c57..4506fc8 100644
--- a/make
+++ b/make
@@ -199,9 +199,10 @@ def parse(args):
         TMP[0].append("**/*.log")
     if not args.minted:     # add minted dir to temp dir list
         TMP[1].append("**/*_minted-*")
+    res = []					# assume success
     # choose a target or fall back to full compilation
     if "clean" in target:       # clean up files and directories listed in the TMP constant
-        res = clean()
+        clean()
     elif "draft" in target:     # run the tex command once
         res = [tex(*arguments, command=command, file=file, verbose=verbose, out=out, skip=skip) for file in files]
     elif "glo" in target:       # compile glossary entries
diff --git a/protocol.cls b/protocol.cls
index 5b9d60d..9b19209 100644
--- a/protocol.cls
+++ b/protocol.cls
@@ -18,28 +18,28 @@
 \DeclareOption{en}{\entrue}
 \newif\iflandscape\landscapefalse	% Landscape orientation
 \DeclareOption{landscape}{\landscapetrue\PassOptionsToClass{landscape}{article}}
-\newif\ifcolor\colortrue			% No coloured links
-\DeclareOption{nocolor}{\colorfalse}
-\newif\iftitle\titletrue			% No title page
-\DeclareOption{notitle}{\titlefalse}
-\newif\iftoc\toctrue				% No table of contents
-\DeclareOption{notoc}{\tocfalse}
-\newif\iftable\tabletrue			% No information table on page bottom
-\DeclareOption{notable}{\tablefalse}
-\newif\iflogos\logostrue			% No logos
-\DeclareOption{nologos}{\logosfalse}
-\newif\iffonts\fontstrue			% No additional fonts
-\DeclareOption{nofonts}{\fontsfalse}
-\newif\ifglo\glotrue				% Do not except glossaries
-\DeclareOption{noglo}{\glofalse}
-\newif\ifbib\bibtrue				% Do not except bibliography
-\DeclareOption{nobib}{\bibfalse}
-\newif\ifparskip\parskipfalse		% Lineskip instead of indent after blank line
-\DeclareOption{parskip}{\parskiptrue}
 \newif\ifminted\mintedfalse			% Minted for code listings
 \DeclareOption{minted}{\mintedtrue}
 \newif\ifnatbib\natbibfalse			% NatBib as bibliography backend
 \DeclareOption{natbib}{\bibtrue\natbibtrue}
+\newif\ifbib\bibtrue                % Do not except bibliography
+\DeclareOption{nobib}{\bibfalse}
+\newif\ifcolor\colortrue            % No coloured links
+\DeclareOption{nocolor}{\colorfalse}
+\newif\iffonts\fontstrue            % No additional fonts
+\DeclareOption{nofonts}{\fontsfalse}
+\newif\ifglo\glotrue                % Do not except glossaries
+\DeclareOption{noglo}{\glofalse}
+\newif\iflogos\logostrue            % No logos
+\DeclareOption{nologos}{\logosfalse}
+\newif\iftable\tabletrue            % No information table on page bottom
+\DeclareOption{notable}{\tablefalse}
+\newif\iftitle\titletrue            % No title page
+\DeclareOption{notitle}{\titlefalse}
+\newif\iftoc\toctrue                % No table of contents
+\DeclareOption{notoc}{\tocfalse}
+\newif\ifparskip\parskipfalse       % Skip a line instead of indenting after blank line
+\DeclareOption{parskip}{\parskiptrue}
 \newif\ifsans\sansfalse          	% Sans-serif fonts
 \DeclareOption{sans}{\sanstrue}
 % Pass options