texlive[50626] Master/texmf-dist: uantwerpendocs (28mar19)

commits+karl at tug.org commits+karl at tug.org
Thu Mar 28 21:58:25 CET 2019


Revision: 50626
          http://tug.org/svn/texlive?view=revision&revision=50626
Author:   karl
Date:     2019-03-28 21:58:25 +0100 (Thu, 28 Mar 2019)
Log Message:
-----------
uantwerpendocs (28mar19)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/LICENSE
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/README
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpendocs.pdf
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.pdf
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.pdf
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.tex
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.pdf
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.pdf
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.pdf
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex
    trunk/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx
    trunk/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.ins
    trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
    trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls
    trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls
    trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls
    trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.pdf
    trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex
    trunk/Master/texmf-dist/tex/latex/uantwerpendocs/keyboard.jpg
    trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/LICENSE
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/LICENSE	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/LICENSE	2019-03-28 20:58:25 UTC (rev 50626)
@@ -9,7 +9,7 @@
 The latest version of this license is in
   http://www.latex-project.org/lppl.txt.
 
-The logos of 4E_PMS302_BR_XXX_YYY.{eps,pdf} and UA_HOR_XXX_CMYK.{eps,pdf
+The logos of 4E_PMS302_BR_XXX_YYY.{eps,pdf} and UA_HOR_XXX_CMYK.{eps,pdf}
 are copyright of Universiteit Antwerpen, but have been added to this
 package with permission.
 

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/README	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/README	2019-03-28 20:58:25 UTC (rev 50626)
@@ -17,15 +17,13 @@
   - there's an error in compliancy w.r.t. the house style,
   - there's a feature missing in this class file,
   - there's a bug in this class file,
-please, contact us through e-mail (paul.levrie at uantwerpen.be or
-walter.daems at uantwerpen.be). We'll provide you with an answer
-and if (and as soon as) possible with a solution to the 
-problem you spotted.
+please, contact us through e-mail (walter.daems at uantwerpen.be).
+We'll provide you with an answer and if (and as soon as)
+possible with a solution to the problem you spotted.
 
 Do you like this class file? You're welcome to send us 
 beer, wine, or just kind words.
 
-
 License
 =======
 

Added: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.pdf	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.pdf	2019-03-28 20:58:25 UTC (rev 50626)

Property changes on: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex	2019-03-28 20:58:25 UTC (rev 50626)
@@ -0,0 +1,91 @@
+%%
+%% This is file `uantwerpenbamathesis-example.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% uantwerpendocs.dtx  (with options: `bmt-example')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2013-2019  by Walter Daems <walter.daems at uantwerpen.be>
+%% 
+%% This work may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3 of this license
+%% or (at your option) any later version.  The latest version of this
+%% license is in:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% and version 1.3 or later is part of all distributions of LaTeX version
+%% 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is Walter Daems.
+%% 
+\def\fileversion{2.3}
+\def\filedate{2019/03/27}
+\documentclass[a4paper,11pt,twoside,openright,english]{uantwerpenbamathesis}
+
+\usepackage[english]{babel} % or dutch if your text is in Dutch
+\usepackage{lipsum}  % this is just for some dummy text, please remove
+
+\title{Minimax optimisatie voor performantieruimtemodellering}
+\author{Bert Bibber}
+
+\supervisori{Prof. dr. ir. Kumulus}{Universiteit Antwerpen}
+\supervisorii{Prof. dr. Hilarius Warwinkel}{TNT-Bang, N.V.}
+\supervisoriii{ing. Piet Pienter}{POM}
+
+\facultyacronym{TI}
+\academicyear{2015-2016}
+\diploma{BA-IW-EM}
+\defenselocation{Antwerpen}
+\defensedate{juni 2016}
+
+\begin{document}
+
+\maketitle
+
+\frontmatter
+
+\tableofcontents
+
+\mainmatter
+\chapter*{Inleiding}
+
+\lipsum[1]
+
+\chapter{Onderzoeksvraag}
+
+\section{Het gebeuren}
+
+\lipsum[2]
+
+\begin{equation}
+  e^{-j\pi} + 1 = 0
+\end{equation}
+
+\lipsum[3]
+
+\chapter{Literatuurstudie}
+
+\chapter{Theoretische achtergrond}
+
+\chapter{Eigen realisatie}
+
+\chapter{Besluit}
+
+\appendix
+
+\chapter{Symbolen}
+\chapter{Referentielijst}
+
+\makefinalpage
+
+\end{document}
+
+\endinput
+%%
+%% End of file `uantwerpenbamathesis-example.tex'.


Property changes on: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex	2019-03-28 20:58:25 UTC (rev 50626)
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2013-2018  by Walter Daems <walter.daems at uantwerpen.be>
+%% Copyright (C) 2013-2019  by Walter Daems <walter.daems at uantwerpen.be>
 %% 
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3 of this license
@@ -24,8 +24,8 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{2.2}
-\def\filedate{2018/10/23}
+\def\fileversion{2.3}
+\def\filedate{2019/03/27}
 \documentclass[a4paper,11pt,oneside,openright,english,qr,copyright]{uantwerpencoursetext}
 
 \usepackage[english,dutch]{babel}

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpendocs.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex	2019-03-28 20:58:25 UTC (rev 50626)
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2013-2018  by Walter Daems <walter.daems at uantwerpen.be>
+%% Copyright (C) 2013-2019  by Walter Daems <walter.daems at uantwerpen.be>
 %% 
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3 of this license
@@ -24,8 +24,8 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{2.2}
-\def\filedate{2018/10/23}
+\def\fileversion{2.3}
+\def\filedate{2019/03/27}
 \documentclass[a4paper,10pt]{uantwerpenexam}
 \usepackage{newpxtext} % demonstration of some fine font packages
 \usepackage{newpxmath}
@@ -45,7 +45,7 @@
 \tstart{08h30}
 \tend{12h30}
 \rooms{G.U.025}
-\extrainfo{
+\extrainfo[firstpage]{
   Belangrijke informatie:\\\par
   Het volledige Onderwijs- en Examenregelement (OER) is van toepassing
   op dit examen.
@@ -66,10 +66,6 @@
     voorziene vak. Op de andere bladen schrijf je je naam
     \emph{niet}. Je examenopgave heeft een uniek nummer dat toelaat het
     te identificeren.
-  \item Neem je tijd om \emph{alle vragen schriftelijk te
-      beantwoorden}. Het puntengewicht van een vraag is bovenaan de vraag
-    op de opgavebladen vermeld. Wees volledig in je antwoord, maar ter
-    zake. Houd rekening met de beschikbare tijd.
   \item Op het einde van het examen geef je \emph{alle} bladen weer af
     aan de aanwezige docent.
   \end{enumerate}

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex	2019-03-28 20:58:25 UTC (rev 50626)
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2013-2018  by Walter Daems <walter.daems at uantwerpen.be>
+%% Copyright (C) 2013-2019  by Walter Daems <walter.daems at uantwerpen.be>
 %% 
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3 of this license
@@ -24,8 +24,8 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{2.2}
-\def\filedate{2018/10/23}
+\def\fileversion{2.3}
+\def\filedate{2019/03/27}
 \documentclass[a4paper,10pt]{uantwerpenexam}
 \usepackage{newpxtext} % demonstration of some fine font packages
 \usepackage{newpxmath}
@@ -51,34 +51,24 @@
     The Education and Examination Regulations (EER) hold for this
     examination in full.
     However, before starting, I'd like to set some rules straight:
-    \begin{enumerate}
+  }
+  {
+    Belangrijke informatie:\\\par
+    Het volledige Onderwijs- en Examenregelement (OER) is van toepassing
+    op dit examen.
+    Toch wil ik vooraf nog een aantal regels duidelijk stellen:
+  }
+  \engdut{
+    \begin{itemize}
     \item \emph{Can be used:} (1) writing gear (\emph{not} in a pencil
       case); you don't need paper; there's plenty of paper in your exam
       copy;
       (2) your calculator (without alphanumerical data and without memory
       cards); (3) the formula collection.
-    \item \emph{May not be used:} all equipment with memory or
-      communications facilities, like cell phones, smart phones, smart
-      watches, music players, \ldots
-      Your bag must be put in the front of the room. Put your coat on the
-      hallstand or next to your bag.
-    \item Write your name on the title page. Don't write your name on
-      the subsequent pages. Your copy has a unique number to identify it
-      as yours.
-    \item Take your time to \emph{answer all questions in writing}. The
-      point weights are listed above every question. Be complete in your
-      answer, but stick to the point. Take into account the available time.
-    \item Hand in \emph{all} papers to the staff member on duty, at the
-      end of the examination.
-    \end{enumerate}
-    Success!
+    \end{itemize}
   }
   {
-    Belangrijke informatie:\\\par
-    Het volledige Onderwijs- en Examenregelement (OER) is van toepassing
-    op dit examen.
-    Toch wil ik vooraf nog een aantal regels duidelijk stellen:
-    \begin{enumerate}
+    \begin{itemize}
     \item Mogen op je tafeltje aanwezig zijn:
       (1) schrijfgerief, los d.w.z. \emph{niet} in een pennenzak (geen
       papier; er zit examenpapier bij de opgaven),
@@ -85,24 +75,71 @@
       (2) je rekenmachine (zonder alfanumerieke data en zonder
       geheugenkaarten),
       (3) het formularium.
+    \end{itemize}
+  }
+  \engdut{
+    \begin{itemize}
+    \item \emph{May not be used:} all equipment with memory or
+      communications facilities, like cell phones, smart phones, smart
+      watches, music players, \ldots
+      Your bag must be put in the front of the room. Put your coat on the
+      hallstand or next to your bag.
+    \end{itemize}
+  }
+  {
+    \begin{itemize}
     \item Volledig \emph{verboden te gebruiken}: alle apparatuur met
       geheugen- of communicatiefunctionaliteit zoals GSM, smartphone,
       smartwatch, muziekspeler, \ldots
       Je tas staat vooraan in het lokaal. Hang je jas aan de kapstok of
       leg hem bij je tas.
+    \end{itemize}
+  }
+  \engdut{
+    \begin{itemize}
+    \item Write your name on the title page. Don't write your name on
+      the subsequent pages. Your copy has a unique number to identify it
+      as yours.
+    \end{itemize}
+  }
+  {
+    \begin{itemize}
     \item Schrijf je naam op het titelblad van de opgave in het daartoe
       voorziene vak. Op de andere bladen schrijf je je naam
       \emph{niet}. Je examenopgave heeft een uniek nummer dat toelaat het
       te identificeren.
+    \end{itemize}
+  }
+  \engdut{
+    \begin{itemize}
+    \item Take your time to \emph{answer all questions in writing}. The
+      point weights are listed above every question. Be complete in your
+      answer, but stick to the point. Take into account the available time.
+    \end{itemize}
+  }
+  {
+    \begin{itemize}
     \item Neem je tijd om \emph{alle vragen schriftelijk te
         beantwoorden}. Het puntengewicht van een vraag is bovenaan de vraag
       op de opgavebladen vermeld. Wees volledig in je antwoord, maar ter
       zake. Houd rekening met de beschikbare tijd.
+    \end{itemize}
+  }
+  \engdut{
+    \begin{itemize}
+    \item Hand in \emph{all} papers to the staff member on duty, at the
+      end of the examination.
+    \end{itemize}
+    Success!
+  }
+  {
+    \begin{itemize}
     \item Op het einde van het examen geef je \emph{alle} bladen weer af
       aan de aanwezige docent.
-    \end{enumerate}
+    \end{itemize}
     Succes!
   }
+  \clearpage
 }
 
 \studentnr{29}

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.tex	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.tex	2019-03-28 20:58:25 UTC (rev 50626)
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2013-2018  by Walter Daems <walter.daems at uantwerpen.be>
+%% Copyright (C) 2013-2019  by Walter Daems <walter.daems at uantwerpen.be>
 %% 
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3 of this license
@@ -24,8 +24,8 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{2.2}
-\def\filedate{2018/10/23}
+\def\fileversion{2.3}
+\def\filedate{2019/03/27}
 \documentclass[a4paper]{uantwerpenletter}
 
 %% As a good UAntwerpen citizen, you would use the calibri font.

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex	2019-03-28 20:58:25 UTC (rev 50626)
@@ -24,8 +24,8 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{2.2}
-\def\filedate{2018/10/23}
+\def\fileversion{2.3}
+\def\filedate{2019/02/15}
 \documentclass[a4paper,11pt,twoside,openright,english]{uantwerpenmasterthesis}
 
 \usepackage[english]{babel} % or dutch if your text is in Dutch

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex	2019-03-28 20:58:25 UTC (rev 50626)
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2013-2018  by Walter Daems <walter.daems at uantwerpen.be>
+%% Copyright (C) 2013-2019  by Walter Daems <walter.daems at uantwerpen.be>
 %% 
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3 of this license
@@ -24,8 +24,8 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{2.2}
-\def\filedate{2018/10/23}
+\def\fileversion{2.3}
+\def\filedate{2019/03/27}
 \documentclass[b5paper,10pt,twoside,openright,filled]{uantwerpenphdthesis}
 
 \usepackage{mathptmx}

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex	2019-03-28 20:58:25 UTC (rev 50626)
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2013-2018  by Walter Daems <walter.daems at uantwerpen.be>
+%% Copyright (C) 2013-2019  by Walter Daems <walter.daems at uantwerpen.be>
 %% 
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3 of this license
@@ -24,8 +24,8 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{2.2}
-\def\filedate{2018/10/23}
+\def\fileversion{2.3}
+\def\filedate{2019/03/27}
 \documentclass[b5paper,10pt,twoside,openright,filled]{uantwerpenphdthesis}
 
 \usepackage{newpxtext}

Modified: trunk/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx	2019-03-28 20:58:25 UTC (rev 50626)
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2013-2018 by Walter Daems <walter.daems at uantwerpen.be>
+% Copyright (C) 2013-2019 by Walter Daems <walter.daems at uantwerpen.be>
 %
 % This work may be distributed and/or modified under the conditions of
 % the LaTeX Project Public License, either version 1.3 of this license
@@ -24,16 +24,18 @@
 %<*driver>
 \ProvidesFile{uantwerpendocs.dtx}
 %</driver>
-%<ct|mt|le|ex>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+%<ct|bmt|mt|le|ex>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<ct>\ProvidesClass{uantwerpencoursetext}
 %<mt>\ProvidesClass{uantwerpenmasterthesis}
+%<bmt>\ProvidesClass{uantwerpenbamathesis}
 %<pt>\ProvidesClass{uantwerpenphdthesis}
 %<le>\ProvidesClass{uantwerpenletter}
 %<ex>\ProvidesClass{uantwerpenexam}
-%<ct|mt|pt|le|ex>    [2018/10/23 v2.2 .dtx skeleton file]
+%<ct|bmt|mt|pt|le|ex>    [2019/03/27 v2.3 .dtx skeleton file]
 %
-\def\fileversion{2.2}
-\def\filedate{2018/10/23}
+%<mt>\errmessage{This class is obsolete, use the uantwerpenbamathesis class instead !}
+\def\fileversion{2.3}
+\def\filedate{2019/03/27}
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage{makeidx}
@@ -95,6 +97,7 @@
 % on research day}
 % \changes{v2.2}{2018/10/23}{\@ Improved visibility of chapter numbers
 % by adding a white outline}
+% \changes{v2.3}{2019/03/27}{\@ Reworked masterthesis to bamathesis and minor bug fixes}
 %
 %
 % \DoNotIndex{\newcommand,\newenvironment}
@@ -131,7 +134,7 @@
 % or just kind words.
 %
 % \section{Synopsis}
-% The |coursetext|, |masterthesis| and |phdthesis|
+% The |coursetext|, |bamathesis| and |phdthesis|
 % classes\footnote{For readability the class names have been
 % abbreviated by omitting the |uantwerpen| prefix} are 
 % an extension of the standard \LaTeX{} |book| class.  They are
@@ -223,10 +226,11 @@
 % The available faculty acronyms are listed in a table on page
 % \pageref{acronyms}. 
 %
-% \subsubsection{\texttt{uantwerpenmasterthesis} class}
-% Use the following harness for your \LaTeX{} master's thesis:
+% \subsubsection{\texttt{uantwerpenbamathesis} class}
+% Use the following harness for your \LaTeX{} bachelor or master's
+% thesis: 
 % \begin{verbatim}
-% \documentclass[a4paper]{uantwerpenmasterthesis}
+% \documentclass[a4paper]{uantwerpenbamathesis}
 %
 % \usepackage{<include any packages you require here>}
 %
@@ -375,7 +379,7 @@
 %   that copy to students and suppressing the fillout pages.
 %
 % \DescribeMacro{filled} [letter / coursetext /
-% masterthesis / phdthesis]\\ 
+% bamathesis / phdthesis]\\ 
 %   This option causes the text to be filled (simultaneous left and
 %   right alignment). Though this setting is not recommended, it is
 %   provided because the default |\raggedright| cannot be undone. The
@@ -384,13 +388,13 @@
 %   your text, you shouldn't use this option.
 %
 % \DescribeMacro{titlepagenoartwork} [coursetext /
-% masterthesis / phdthesis]\\
+% bamathesis / phdthesis]\\
 %   This option forces the title pages to be typeset without circle graphics and
 %   logo. This allows for printing on a pre-printed color sheet that
 %   already contains circle graphics and logo;
 %
 % \DescribeMacro{titlepagetableonly} [coursetext /
-% masterthesis / phdthesis]\\ 
+% bamathesis / phdthesis]\\ 
 %   This option forces the title-page data to be printed in table form
 %   as first page. Some publishers require the manuscript to be
 %   delivered in this form. They perform the entire typesetting of the
@@ -429,7 +433,7 @@
 % applies (between square brackets), and whether it is mandatory or not.
 %
 % \DescribeMacro{\facultyacronym} [coursetext /
-% masterthesis / phdthesis / exam] (mandatory)\\
+% bamathesis / phdthesis / exam] (mandatory)\\
 % \label{md-facultyacronym}
 % This macro sets the acronym of the faculty.
 % This macro also sets the faculty name according to the specified
@@ -475,15 +479,15 @@
 % \end{tabular}
 % \end{center}
 %
-% \subsubsection{Macros for the coursetext, masterthesis, phdthesis
+% \subsubsection{Macros for the coursetext, bamathesis, phdthesis
 % classes}
 %
-% \DescribeMacro{\academicyear} [coursetext / masterthesis]
+% \DescribeMacro{\academicyear} [coursetext / bamathesis]
 % (mandatory)\\
 % Use this macro to specify the academic year in full, i.e. in the
 % form |XXXX-YYYY|. 
 % 
-% \DescribeMacro{\author} [coursetext / masterthesis / phdthesis ] (mandatory)\\ 
+% \DescribeMacro{\author} [coursetext / bamathesis / phdthesis ] (mandatory)\\ 
 % This macro sets the author of the document.
 % It also sets the |pdfauthor| tag of the hyperref package, so that
 % the PDF-document meta-information is correct.
@@ -533,12 +537,12 @@
 % This macro indicates which version of the course this is.
 %
 %
-% \DescribeMacro{\defensedate} [masterthesis / phdthesis] (mandatory)\\
-% Date of the masterthesis defense in Dutch, in the form 'month year',
+% \DescribeMacro{\defensedate} [bamathesis / phdthesis] (mandatory)\\
+% Date of the bamathesis defense in Dutch, in the form 'month year',
 % e.g. ``juni 2012''. In case of a PhD thesis, only the year should be
 % mentioned. 
 % 
-% \DescribeMacro{\defenselocation} [masterthesis / phdthesis]
+% \DescribeMacro{\defenselocation} [bamathesis / phdthesis]
 % (optional)\\ 
 % Location of the defense. Defaults to ``Antwerpen''.
 %
@@ -546,7 +550,8 @@
 % \changes{v1.6}{2016/02/04}{Added diploma code documentation}
 % \changes{v2.0}{2018/05/16}{Updated diploma code documentation to
 % incorporate PhD degrees}
-% \DescribeMacro{\diploma} [masterthesis] (mandatory)\\
+% \changes{v2.3}{2019/03/27}{Introduced bachelor level codes to allow for bachelor theses}
+% \DescribeMacro{\diploma} [bamathesis] (mandatory)\\
 % This must be the official title, in Dutch. To avoid errors, we chose
 % to use specific codes, that will expand to the correct description.
 % These codes are specific for the Faculty of Applied Engineering. If
@@ -560,6 +565,17 @@
 %       \multicolumn{2}{c}{Faculteit Toegepaste
 %       Ingenieurswetenschappen}\\ 
 %     \midrule
+%     \midrule
+%     |BA-IW-BK| 
+%     & Bachelor of Science in de industri\"ele wetenschappen: bouwkunde\\
+%     |BA-IW-BCH| 
+%     & Bachelor of Science in de industri\"ele wetenschappen: biochemie\\
+%     |BA-IW-CH|
+%     & Bachelor of Science in de industri\"ele wetenschappen: chemie\\
+%     |BA-IW-EI|
+%     & Bachelor of Science in de industri\"ele wetenschappen: elektronica-ICT\\
+%     |BA-IW-EM|
+%     & Bachelor of Science in de industri\"ele wetenschappen: elektromechanica\\
 %     |MA-IW-BK| 
 %     & Master of Science in de industri\"ele wetenschappen: bouwkunde\\
 %     |MA-IW-BCH| 
@@ -575,27 +591,27 @@
 %     & Master of Science in de industri\"ele wetenschappen: elektronica-ICT,
 %     afstudeerrichting ICT\\
 %     |MA-IW-EM-AE|
-%     & Master of Science in de industri\"ele wetenschappen: Elektromechanica,
+%     & Master of Science in de industri\"ele wetenschappen: elektromechanica,
 %     afstudeerrichting Automotive Engineering\\
 %     |MA-IW-EM-AU|
-%     & Master of Science in de industri\"ele wetenschappen: Elektromechanica,
+%     & Master of Science in de industri\"ele wetenschappen: elektromechanica,
 %     afstudeerrichting Automatisering\\
 %     |MA-IW-EM-EM|
-%     & Master of Science in de industri\"ele wetenschappen: Elektromechanica,
+%     & Master of Science in de industri\"ele wetenschappen: elektromechanica,
 %     afstudeerrichting Elektromechanica\\
 %     |MA-IW-EM-EN|
-%     & Master of Science in de industri\"ele wetenschappen: Elektromechanica,
+%     & Master of Science in de industri\"ele wetenschappen: elektromechanica,
 %         afstudeerrichting Energie\\
 %     |PHD-TI-BK|
-%     & Doctor in de Toegepaste Ingenieurwetenschappen: Bouwkunde\\
+%     & Doctor in de Toegepaste Ingenieurwetenschappen: bouwkunde\\
 %     |PHD-TI-BCH|
-%     & Doctor in de Toegepaste Ingenieurwetenschappen: Biochemie\\
+%     & Doctor in de Toegepaste Ingenieurwetenschappen: biochemie\\
 %     |PHD-TI-CH|
-%     & Doctor in de Toegepaste Ingenieurwetenschappen: Chemie\\
+%     & Doctor in de Toegepaste Ingenieurwetenschappen: chemie\\
 %     |PHD-TI-EI|
-%     & Doctor in de Toegepaste Ingenieurwetenschappen: Elektronica-ICT\\
+%     & Doctor in de Toegepaste Ingenieurwetenschappen: elektronica-ICT\\
 %     |PHD-TI-EM|
-%     & Doctor in de Toegepaste Ingenieurwetenschappen: Elektromechanica\\
+%     & Doctor in de Toegepaste Ingenieurwetenschappen: elektromechanica\\
 %     \midrule
 %       \multicolumn{2}{c}{Faculteit Toegepaste Economische
 %       Wetenschappen}\\
@@ -668,12 +684,12 @@
 % This macro also sets the |subject| tag of the hyperref package,
 % so that the PDF-document meta-information is correct.
 %
-% \DescribeMacro{\supervisor} [masterthesis / phdthesis] (mandatory)\\
+% \DescribeMacro{\supervisor} [bamathesis / phdthesis] (mandatory)\\
 % This is the name of the person that promotes/supervises the thesis.
 % Please, use the macros |\supervisori|, |\supervisorii|, |\supervisoriii|,
 % |\supervisoriv|. 
 %
-% \DescribeMacro{\title} [coursetext / masterthesis / phdthesis] (mandatory)\\ 
+% \DescribeMacro{\title} [coursetext / bamathesis / phdthesis] (mandatory)\\ 
 % This macro sets the title of the document.
 % It also sets the |pdftitle| tag of the hyperref package, so that
 % the PDF-document meta-information is correct.
@@ -814,6 +830,10 @@
 % specifies the extra information that appears on the back of the
 % title page, regarding the materials that can be used during the
 % examination and cautioning the students not to commit fraude.
+% You can specify an optional first argument 'firstpage', such that
+% your extra info starts on the first page, below the title block. In
+% that case the extra info will also not be terminated with a
+% clearpage (as we assume you want to conserve space).
 %
 % \DescribeMacro{\programme} [exam] (mandatory)\\
 % see description of |\programme| macro on page~\pageref{dm-programme}.
@@ -945,11 +965,11 @@
 % \end{verbatim}
 % 
 % 
-% \subsubsection{\texttt{uantwerpenmasterthesis}}
+% \subsubsection{\texttt{uantwerpenbamathesis}}
 % 
 % \begin{verbatim}
-%<*mt-example> 
-\documentclass[a4paper,11pt,twoside,openright,english]{uantwerpenmasterthesis}
+%<*bmt-example> 
+\documentclass[a4paper,11pt,twoside,openright,english]{uantwerpenbamathesis}
 
 \usepackage[english]{babel} % or dutch if your text is in Dutch
 \usepackage{lipsum}  % this is just for some dummy text, please remove
@@ -963,7 +983,7 @@
 
 \facultyacronym{TI}
 \academicyear{2015-2016}
-\diploma{MA-IW-EI-ICT}
+\diploma{BA-IW-EM}
 \defenselocation{Antwerpen}
 \defensedate{juni 2016}
 
@@ -1008,7 +1028,7 @@
 \makefinalpage
 
 \end{document}
-%</mt-example> 
+%</bmt-example> 
 % \end{verbatim}
 % 
 %
@@ -1356,7 +1376,7 @@
 \tstart{08h30}
 \tend{12h30}
 \rooms{G.U.025}
-\extrainfo{
+\extrainfo[firstpage]{
   Belangrijke informatie:\\\par
   Het volledige Onderwijs- en Examenregelement (OER) is van toepassing
   op dit examen. 
@@ -1377,10 +1397,6 @@
     voorziene vak. Op de andere bladen schrijf je je naam
     \emph{niet}. Je examenopgave heeft een uniek nummer dat toelaat het
     te identificeren.
-  \item Neem je tijd om \emph{alle vragen schriftelijk te
-      beantwoorden}. Het puntengewicht van een vraag is bovenaan de vraag
-    op de opgavebladen vermeld. Wees volledig in je antwoord, maar ter
-    zake. Houd rekening met de beschikbare tijd.
   \item Op het einde van het examen geef je \emph{alle} bladen weer af
     aan de aanwezige docent.
   \end{enumerate}
@@ -1463,34 +1479,24 @@
     The Education and Examination Regulations (EER) hold for this
     examination in full.
     However, before starting, I'd like to set some rules straight:
-    \begin{enumerate}
+  }
+  {
+    Belangrijke informatie:\\\par
+    Het volledige Onderwijs- en Examenregelement (OER) is van toepassing
+    op dit examen. 
+    Toch wil ik vooraf nog een aantal regels duidelijk stellen:
+  }
+  \engdut{
+    \begin{itemize}
     \item \emph{Can be used:} (1) writing gear (\emph{not} in a pencil
       case); you don't need paper; there's plenty of paper in your exam
       copy;
       (2) your calculator (without alphanumerical data and without memory
       cards); (3) the formula collection.
-    \item \emph{May not be used:} all equipment with memory or
-      communications facilities, like cell phones, smart phones, smart
-      watches, music players, \ldots
-      Your bag must be put in the front of the room. Put your coat on the
-      hallstand or next to your bag.
-    \item Write your name on the title page. Don't write your name on
-      the subsequent pages. Your copy has a unique number to identify it
-      as yours.
-    \item Take your time to \emph{answer all questions in writing}. The
-      point weights are listed above every question. Be complete in your
-      answer, but stick to the point. Take into account the available time.
-    \item Hand in \emph{all} papers to the staff member on duty, at the
-      end of the examination.
-    \end{enumerate} 
-    Success!
+    \end{itemize}
   }
   {
-    Belangrijke informatie:\\\par
-    Het volledige Onderwijs- en Examenregelement (OER) is van toepassing
-    op dit examen. 
-    Toch wil ik vooraf nog een aantal regels duidelijk stellen:
-    \begin{enumerate}
+    \begin{itemize}
     \item Mogen op je tafeltje aanwezig zijn:
       (1) schrijfgerief, los d.w.z. \emph{niet} in een pennenzak (geen
       papier; er zit examenpapier bij de opgaven), 
@@ -1497,24 +1503,71 @@
       (2) je rekenmachine (zonder alfanumerieke data en zonder
       geheugenkaarten),
       (3) het formularium.
+    \end{itemize}
+  }
+  \engdut{
+    \begin{itemize}
+    \item \emph{May not be used:} all equipment with memory or
+      communications facilities, like cell phones, smart phones, smart
+      watches, music players, \ldots
+      Your bag must be put in the front of the room. Put your coat on the
+      hallstand or next to your bag.
+    \end{itemize}
+  }
+  {
+    \begin{itemize}
     \item Volledig \emph{verboden te gebruiken}: alle apparatuur met
       geheugen- of communicatiefunctionaliteit zoals GSM, smartphone,
       smartwatch, muziekspeler, \ldots
       Je tas staat vooraan in het lokaal. Hang je jas aan de kapstok of
       leg hem bij je tas.
+    \end{itemize}
+  }
+  \engdut{
+    \begin{itemize}
+    \item Write your name on the title page. Don't write your name on
+      the subsequent pages. Your copy has a unique number to identify it
+      as yours.
+    \end{itemize}
+  }
+  {
+    \begin{itemize}
     \item Schrijf je naam op het titelblad van de opgave in het daartoe
       voorziene vak. Op de andere bladen schrijf je je naam
       \emph{niet}. Je examenopgave heeft een uniek nummer dat toelaat het
       te identificeren.
+    \end{itemize}
+  }
+  \engdut{
+    \begin{itemize}
+    \item Take your time to \emph{answer all questions in writing}. The
+      point weights are listed above every question. Be complete in your
+      answer, but stick to the point. Take into account the available time.
+    \end{itemize}
+  }
+  {
+    \begin{itemize}
     \item Neem je tijd om \emph{alle vragen schriftelijk te
         beantwoorden}. Het puntengewicht van een vraag is bovenaan de vraag
       op de opgavebladen vermeld. Wees volledig in je antwoord, maar ter
       zake. Houd rekening met de beschikbare tijd.
+    \end{itemize}
+  }
+  \engdut{
+    \begin{itemize}
+    \item Hand in \emph{all} papers to the staff member on duty, at the
+      end of the examination.
+    \end{itemize}
+    Success!
+  }
+  {
+    \begin{itemize}
     \item Op het einde van het examen geef je \emph{alle} bladen weer af
       aan de aanwezige docent.
-    \end{enumerate}
+    \end{itemize}
     Succes!
   }
+  \clearpage
 }
 
 \studentnr{29}
@@ -1614,16 +1667,16 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-%<*ct|mt|pt>
+%<*ct|bmt|pt>
 \newif\if at titlepagenoartwork
 \DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
 \newif\if at titlepagetableonly
 \DeclareOption{titlepagetableonly}{\@titlepagetableonlytrue}
-%</ct|mt|pt>
-%<*ct|mt|pt|le>
+%</ct|bmt|pt>
+%<*ct|bmt|pt|le>
 \newif\if at filled
 \DeclareOption{filled}{\@filledtrue}
-%</ct|mt|pt|le>
+%</ct|bmt|pt|le>
 %<*ex>
 \newif\if at examiner
 \DeclareOption{examiner}{\@examinertrue}
@@ -1634,11 +1687,11 @@
 % We execute some standard options:
 % We load the |book| class for course texts and master theses.
 %    \begin{macrocode}
-%<*ct|mt|pt> 
+%<*ct|bmt|pt> 
 \ExecuteOptions{a4paper,11pt,final,oneside,openright}
 \ProcessOptions
 \LoadClassWithOptions{book}
-%</ct|mt|pt>
+%</ct|bmt|pt>
 % We load the |letter| class for letters
 %<*le> 
 \ExecuteOptions{a4paper,10pt,final,oneside,openright}
@@ -1659,11 +1712,11 @@
 % and with a decent paragraph spacing.
 % 
 %    \begin{macrocode}
-%<*ct|mt|pt|le|ex>      
+%<*ct|bmt|pt|le|ex>      
 \setlength{\parindent}{0pt}
 \addtolength{\parskip}{0.75\baselineskip}
 \setcounter{secnumdepth}{3}
-%</ct|mt|pt|le|ex> 
+%</ct|bmt|pt|le|ex> 
 %    \end{macrocode}
 % 
 % \subsection{Auxiliary packages}
@@ -1673,9 +1726,9 @@
 % \subsubsection{Geometry}
 % Let's reduce the margins to 1 inch each.
 %    \begin{macrocode}
-%<*ct|mt|pt|ex>      
+%<*ct|bmt|pt|ex>      
 \RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry}
-%</ct|mt|pt|ex> 
+%</ct|bmt|pt|ex> 
 %<*le>      
 \RequirePackage[top=1in, bottom=1in, left=1.34in, right=1in]{geometry}
 \RequirePackage[normalem]{ulem}
@@ -1694,9 +1747,9 @@
 % \changes{v1.3}{2015/12/31}{Abandoned use of cmbright - no more
 % font dictatorship for theses and courses}
 %    \begin{macrocode}
-%<*ct|mt|pt|le>      
+%<*ct|bmt|pt|le>      
 % no more font code
-%</ct|mt|pt|le>
+%</ct|bmt|pt|le>
 %    \end{macrocode}
 %
 % \subsubsection{Boilerplate packages}
@@ -1710,12 +1763,13 @@
 % \changes{v1.9}{2018/03/02}{Added etoolbox for convenience reasons}
 % \changes{v2.0}{2018/03/14}{Removed package ifmtarg because unreliable}
 %    \begin{macrocode}
-%<*ct|mt|pt|le|ex>      
+%<*ct|bmt|pt|le|ex>
+\RequirePackage{xstring}
 \RequirePackage{etoolbox}
 \RequirePackage{ifthen}
 \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{}
 \newcommand{\@emptymacro}{}
-%</ct|mt|pt|le|ex> 
+%</ct|bmt|pt|le|ex> 
 %    \end{macrocode}
 % 
 % \subsubsection{Graphics packages}
@@ -1723,16 +1777,16 @@
 % Graphics packages that are required for the title page, but may come
 % in handy for regular use as well.
 %
-% Some packages for coursetext and masterthesis:
+% Some packages for coursetext and bamathesis:
 % \changes{v1.3}{2015/12/31}{Added inclusion of background package}
 %    \begin{macrocode}
-%<*ct|mt|pt|le|ex>      
+%<*ct|bmt|pt|le|ex>      
 \RequirePackage{graphicx}
 \RequirePackage{color}
 \RequirePackage{tikz}
 \usetikzlibrary{positioning}
 \RequirePackage{eso-pic}
-%</ct|mt|pt|le|ex>
+%</ct|bmt|pt|le|ex>
 %<*ct>
 \if at copyright
 \RequirePackage[firstpage=false,contents={Copyright University of Antwerp, All Rights Reserved},color=lightgray,scale=3]{background}
@@ -1761,15 +1815,15 @@
 % 
 % The de-facto standard for headers and footers:
 %    \begin{macrocode}
-%<*ct|mt|pt|le|ex>      
+%<*ct|bmt|pt|le|ex>      
 \RequirePackage{fancyhdr}
-%</ct|mt|pt|le|ex> 
+%</ct|bmt|pt|le|ex> 
 %    \end{macrocode}
 % 
 % \subsection{Colors}
 %
 %    \begin{macrocode}
-%<*ct|mt|pt|le|ex> 
+%<*ct|bmt|pt|le|ex> 
 \definecolor{uacorpbord}{cmyk}     {0.00,1.00,0.60,0.37}
 \definecolor{uacorpblue}{cmyk}     {1.00,0.25,0.00,0.50}
 \definecolor{uacorplightblue}{cmyk}{1.00,0.00,0.08,0.13}
@@ -1779,7 +1833,7 @@
 \definecolor{lightgray}{cmyk}      {0.00,0.00,0.00,0.05}
 \definecolor{darkgray}{cmyk}       {0.00,0.00,0.00,0.80}
 \definecolor{watermark}{cmyk}      {0.00,0.00,0.00,0.05}
-%</ct|mt|pt|le|ex>
+%</ct|bmt|pt|le|ex>
 %    \end{macrocode}
 %
 % \subsection{Babel provisions}
@@ -1787,54 +1841,55 @@
 % \changes{v1.7}{2016/05/01}{Added babel tags of elements
 % of master's thesis title page}
 %    \begin{macrocode}
-%<*ct|mt|pt|le|ex>
-\newcommand{\uaname}{University of Antwerp}
-\newcommand{\logoname}{UA_HOR_ENG_CMYK}
-\newcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-\newcommand{\arrname}{All rights reserved}
-\newcommand{\orname}{of}
-\newcommand{\domainname}{uantwerp.be}
-\newcommand{\datename}{Date}
-\newcommand{\subjectname}{Subject}
-\newcommand{\academicyearname}{Academic year}
-\newcommand{\masterthesisname}{Master's thesis}
-\newcommand{\supervisorsname}{Supervisors}
-\newcommand{\juryname}{Jury}
-\newcommand{\jurymembersname}{Members}
-\newcommand{\jurychairmanname}{Chairman}
-\newcommand{\mthesisname}{Thesis to obtain the degree of}
-\newcommand{\pthesisnamei}{Thesis submitted in fulfilment of the
+%<*ct|bmt|pt|le|ex>
+\newcommand\uaname{University of Antwerp}
+\newcommand\logoname{UA_HOR_ENG_CMYK}
+\newcommand\footername{4E_PMS302_BR_ENG_RGB}
+\newcommand\arrname{All rights reserved}
+\newcommand\orname{of}
+\newcommand\domainname{uantwerp.be}
+\newcommand\datename{Date}
+\newcommand\subjectname{Subject}
+\newcommand\academicyearname{Academic year}
+\newcommand\masterthesisname{Master's thesis}
+\newcommand\bachelorthesisname{Bachelor's thesis}
+\newcommand\supervisorsname{Supervisors}
+\newcommand\juryname{Jury}
+\newcommand\jurymembersname{Members}
+\newcommand\jurychairmanname{Chairman}
+\newcommand\bmthesisname{Thesis to obtain the degree of}
+\newcommand\pthesisnamei{Thesis submitted in fulfilment of the
   requirements for the degree of}
-\newcommand{\pthesisnameii}{at University of Antwerp}
-\newcommand{\@faculty}{< Specify faculty using \textbackslash{}facultyacronym\{ABC\} >}
-\newcommand{\faccpg}{
+\newcommand\pthesisnameii{at University of Antwerp}
+\newcommand\@faculty{< Specify faculty using \textbackslash{}facultyacronym\{ABC\} >}
+\newcommand\faccpg{
   \renewcommand\@faculty{Centre Pieter Gillis}}
-\newcommand{\facfbd}{
+\newcommand\facfbd{
   \renewcommand\@faculty{
     Faculty of Pharmaceutical, Biomedical and Veterinary Sciences}}
-\newcommand{\facggw}{
+\newcommand\facggw{
   \renewcommand\@faculty{Faculty of Medicine and Health Sciences}} 
-\newcommand{\insiob}{
+\newcommand\insiob{
   \renewcommand\@faculty{Insitute of Development Policy}}
-\newcommand{\insoiw}{
+\newcommand\insoiw{
   \renewcommand\@faculty{Institute of Educations and Information Sciences}}
-\newcommand{\asoe}{
+\newcommand\asoe{
   \renewcommand\@faculty{Antwerp School of Education}}
-\newcommand{\faclw}{
+\newcommand\faclw{
   \renewcommand\@faculty{Faculty of Arts}}
-\newcommand{\facow}{
+\newcommand\facow{
   \renewcommand\@faculty{Faculty of Design Sciences}}
-\newcommand{\facsw}{
+\newcommand\facsw{
   \renewcommand\@faculty{Faculty of Social Sciences}}
-\newcommand{\facrec}{
+\newcommand\facrec{
   \renewcommand\@faculty{Faculty of Law}}
-\newcommand{\factew}{
+\newcommand\factew{
   \renewcommand\@faculty{Faculty of Applied Economics}} 
-\newcommand{\facti}{
+\newcommand\facti{
   \renewcommand\@faculty{Faculty of Applied Engineering}}
-\newcommand{\facwet}{
+\newcommand\facwet{
   \renewcommand\@faculty{Faculty of Science}}
-\newcommand{\weightname}{Weight}
+\newcommand\weightname{Weight}
 \AtBeginDocument{
   \@ifpackageloaded{babel}{
     \addto\captionsdutch{%
@@ -1848,11 +1903,12 @@
       \renewcommand\datename{Datum}%
       \renewcommand\academicyearname{Academiejaar}
       \renewcommand\masterthesisname{Masterproef}
+      \renewcommand\bachelorthesisname{Bachelorproef}
       \renewcommand\supervisorsname{Promotoren}
       \renewcommand\juryname{Jury}
       \renewcommand\jurymembersname{Leden}
       \renewcommand\jurychairmanname{Voorzitter}
-      \renewcommand\mthesisname{Proefschrift tot het behalen van de
+      \renewcommand\bmthesisname{Proefschrift tot het behalen van de
         graad van}
       \renewcommand\pthesisnamei{Proefschrift voorgelegd tot het
         behalen van de graad van}
@@ -1870,197 +1926,200 @@
       \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}} 
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}} 
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}} 
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Gewicht}
+      \renewcommand\weightname{Gewicht}
     }
     \addto\captionsgerman{%
-      \renewcommand{\uaname}{Universit\"at Antwerpen}
-      \renewcommand{\logoname}{UA_HOR_DUI_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_NED_RGB}
-      \renewcommand{\arrname}{Alle Rechte vorbehalten}
-      \renewcommand{\orname}{von}
-      \renewcommand{\domainname}{uantwerpen.be}
-      \renewcommand{\subjectname}{Betreff}%
-      \renewcommand{\datename}{Datum}%
-      \renewcommand{\academicyearname}{Akademisches Jahr}
-      \renewcommand{\masterthesisname}{Masterdissertation}
-      \renewcommand{\supervisorsname}{Veranstalter}
-      \renewcommand{\juryname}{Jury}
-      \renewcommand{\jurymembersname}{Mitglieder}
-      \renewcommand{\jurychairmanname}{Vorsitzender}
-      \renewcommand{\mthesisname}{Dissertation zur Erreichung des
+      \renewcommand\uaname{Universit\"at Antwerpen}
+      \renewcommand\logoname{UA_HOR_DUI_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_NED_RGB}
+      \renewcommand\arrname{Alle Rechte vorbehalten}
+      \renewcommand\orname{von}
+      \renewcommand\domainname{uantwerpen.be}
+      \renewcommand\subjectname{Betreff}%
+      \renewcommand\datename{Datum}%
+      \renewcommand\academicyearname{Akademisches Jahr}
+      \renewcommand\masterthesisname{Masterdissertation}
+      \renewcommand\bachelorthesisname{Bachelordissertation}
+      \renewcommand\supervisorsname{Veranstalter}
+      \renewcommand\juryname{Jury}
+      \renewcommand\jurymembersname{Mitglieder}
+      \renewcommand\jurychairmanname{Vorsitzender}
+      \renewcommand\bmthesisname{Dissertation zur Erreichung des
         Grades der}
-      \renewcommand{\pthesisnamei}{Dissertation zur Erreiching des
+      \renewcommand\pthesisnamei{Dissertation zur Erreiching des
         Grades der}
-      \renewcommand{\pthesisnameii}{an die \uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{an die \uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}} 
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}} 
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}} 
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}} 
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}} 
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Gewicht}
+      \renewcommand\weightname{Gewicht}
     }
     \addto\captionsfrench{%
-      \renewcommand{\uaname}{Universit\'e d'Anvers}
-      \renewcommand{\logoname}{UA_HOR_FRA_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-      \renewcommand{\arrname}{Tous les droits sont r\'eserv\'es}
-      \renewcommand{\orname}{de}
-      \renewcommand{\domainname}{uanvers.be}
-      \renewcommand{\subjectname}{Objet}%
-      \renewcommand{\datename}{Date}%
-      \renewcommand{\academicyearname}{Ann\'ee acad\'emique}
-      \renewcommand{\masterthesisname}{Th\`ese de master}
-      \renewcommand{\supervisorsname}{Promoteurs} 
-      \renewcommand{\juryname}{Jury}
-      \renewcommand{\jurymembersname}{Membres}
-      \renewcommand{\jurychairmanname}{Pr\'esident}
-      \renewcommand{\mthesisname}{Th\`ese \`a l'atteinte du degr\'e de}
-      \renewcommand{\pthesisnamei}{Th\`ese Doctorale \`a l'atteinte du
+      \renewcommand\uaname{Universit\'e d'Anvers}
+      \renewcommand\logoname{UA_HOR_FRA_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_ENG_RGB}
+      \renewcommand\arrname{Tous les droits sont r\'eserv\'es}
+      \renewcommand\orname{de}
+      \renewcommand\domainname{uanvers.be}
+      \renewcommand\subjectname{Objet}%
+      \renewcommand\datename{Date}%
+      \renewcommand\academicyearname{Ann\'ee acad\'emique}
+      \renewcommand\masterthesisname{Th\`ese de master}
+      \renewcommand\bachelorthesisname{Th\`ese de baccalaur\'eat}
+      \renewcommand\supervisorsname{Promoteurs} 
+      \renewcommand\juryname{Jury}
+      \renewcommand\jurymembersname{Membres}
+      \renewcommand\jurychairmanname{Pr\'esident}
+      \renewcommand\bmthesisname{Th\`ese \`a l'atteinte du degr\'e de}
+      \renewcommand\pthesisnamei{Th\`ese Doctorale \`a l'atteinte du
         degr\'e de}
-      \renewcommand{\pthesisnameii}{\`a l'\uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{\`a l'\uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}} 
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}} 
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}} 
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}} 
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}} 
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Poids}
+      \renewcommand\weightname{Poids}
     }
     \addto\captionsspanish{%
-      \renewcommand{\uaname}{Universidad de Amberes}
-      \renewcommand{\logoname}{UA_HOR_SPA_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-      \renewcommand{\arrname}{Todos los derechos reservados}
-      \renewcommand{\orname}{de}
-      \renewcommand{\domainname}{uantwerp.be}
-      \renewcommand{\subjectname}{Asunto}%
-      \renewcommand{\datename}{Fecha}%
-      \renewcommand{\academicyearname}{A\~no acad\'emico}
-      \renewcommand{\masterthesisname}{Tesis de maestr\'\i{}a}
-      \renewcommand{\supervisorsname}{Promotores}
-      \renewcommand{\juryname}{Jurado}
-      \renewcommand{\jurymembersname}{Miembros}
-      \renewcommand{\jurychairmanname}{Presidente}
-      \renewcommand{\mthesisname}{Disertaci\'on a la consecuci\'on del
+      \renewcommand\uaname{Universidad de Amberes}
+      \renewcommand\logoname{UA_HOR_SPA_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_ENG_RGB}
+      \renewcommand\arrname{Todos los derechos reservados}
+      \renewcommand\orname{de}
+      \renewcommand\domainname{uantwerp.be}
+      \renewcommand\subjectname{Asunto}%
+      \renewcommand\datename{Fecha}%
+      \renewcommand\academicyearname{A\~no acad\'emico}
+      \renewcommand\masterthesisname{Tesis de maestr\'\i{}a}
+      \renewcommand\bachelorthesisname{Tesis de bachiller}
+      \renewcommand\supervisorsname{Promotores}
+      \renewcommand\juryname{Jurado}
+      \renewcommand\jurymembersname{Miembros}
+      \renewcommand\jurychairmanname{Presidente}
+      \renewcommand\bmthesisname{Disertaci\'on a la consecuci\'on del
         grado de}
-      \renewcommand{\pthesisnamei}{Disertaici\'on a la consecuci\'on del
+      \renewcommand\pthesisnamei{Disertaici\'on a la consecuci\'on del
         grado de}
-      \renewcommand{\pthesisnameii}{a l'\uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{a l'\uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}} 
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}} 
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}} 
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}} 
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}} 
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Peso}
+      \renewcommand\weightname{Peso}
     }
   }
   {}
 }
-%</ct|mt|pt|le|ex> 
+%</ct|bmt|pt|le|ex> 
 %    \end{macrocode}
 %
 % \subsection{Tags}
@@ -2072,7 +2131,7 @@
 %   correctly.
 %
 %    \begin{macrocode}
-%<*ct|mt|pt|le|ex>      
+%<*ct|bmt|pt|le|ex>      
 \newcommand{\@facultyacronym}{}
 \newcommand{\facultyacronym}[1]{
   \renewcommand{\@facultyacronym}{#1}
@@ -2093,7 +2152,7 @@
       \errmessage{Error: wrong faculty acronym; choose one of CPG, FBD, GGW,
         IOB, IOIW, ASoE, LW, OW, SW, REC, TEW, TI, WET}}}}}}}}}}}}}}}
 }
-%</ct|mt|pt|le|ex>
+%</ct|bmt|pt|le|ex>
 %    \end{macrocode}
 % \end{macro}
 % 
@@ -2129,9 +2188,9 @@
 %   the title page, in the header/footer and to set the appropriate
 %   |hyperref| tag.
 %    \begin{macrocode}
-%<*mt>
+%<*bmt>
 \newcommand{\@subtitle}{Master's thesis}
-%</mt>
+%</bmt>
 %<*ct|pt>      
 \newcommand{\@subtitle}{~}
 \newcommand{\@qrsubtitle}{}
@@ -2320,7 +2379,7 @@
 %   This macro sets many |\@supervisor| tags (max. 4) that later will be used on
 %   the title page.
 %    \begin{macrocode}
-%<*mt|pt>      
+%<*bmt|pt>      
 \newcommand\@supervisori{\errmessage{Please define a supervisor of
     your thesiswork using the \textbackslash{}supervisori to iv
     commands} in the preamble of your document.}
@@ -2335,7 +2394,7 @@
 \newcommand{\supervisorii}[2]{\renewcommand\@supervisorii{#1}\renewcommand\@supervisoriiaff{#2}}
 \newcommand{\supervisoriii}[2]{\renewcommand\@supervisoriii{#1}\renewcommand\@supervisoriiiaff{#2}}
 \newcommand{\supervisoriv}[2]{\renewcommand\@supervisoriv{#1}\renewcommand\@supervisorivaff{#2}}
-%</mt|pt> 
+%</bmt|pt> 
 %    \end{macrocode}
 % \end{macro}
 % 
@@ -2544,18 +2603,31 @@
 % \end{macro}
 % 
 % \begin{macro}{\diploma}
-%   This macro sets the |\@diploma| tags that later will
-%   be used on the title page. 
+%   This macro sets the |\@diplomalevel| and |\@diploma| tags that
+%   later will be used on the title page. 
 %   \changes{v1.1}{2013/05/21}{Fixed typo on programme's name
 %   (e-umlaut)}
-% \changes{v1.6}{2016/02/04}{Added diploma codes}
+%   \changes{v1.6}{2016/02/04}{Added diploma codes}
+%   \changes{v2.3}{2019/03/27}{Added diploma level}
 %    \begin{macrocode}
-%<*mt|pt>
+%<*bmt|pt>
+\newcommand{\@diplomalevel}{ERROR}
 \newcommand{\@diploma}{ERROR}
 \newcommand{\diploma}[1]{
   \newcommand{\MoSIW}{Master of Science in de industri\"ele wetenschappen}
+  \newcommand{\BoSIW}{Bachelor of Science in de industri\"ele wetenschappen}
   \newcommand{\MoSTEW}{Master of Science in de toegepaste economische wetenschappen}
   \renewcommand{\@diploma}{
+    \ifthenelse{\equal{#1}{BA-IW-BK}}
+                          {\BoSIW: bouwkunde}{
+    \ifthenelse{\equal{#1}{BA-IW-BCH}}
+                          {\BoSIW: biochemie}{
+    \ifthenelse{\equal{#1}{BA-IW-CH}}
+                          {\BoSIW: chemie}{
+    \ifthenelse{\equal{#1}{BA-IW-EI}}
+                          {\BoSIW: elektronica-ICT}{
+    \ifthenelse{\equal{#1}{BA-IW-EM}}
+                          {\BoSIW: elektromechanica}{
     \ifthenelse{\equal{#1}{MA-IW-BK}}
                           {\MoSIW: bouwkunde}{
     \ifthenelse{\equal{#1}{MA-IW-BCH}}
@@ -2585,11 +2657,13 @@
     \ifthenelse{\equal{#1}{MA-TEW-BK}}
                           {\MoSTEW: bedrijfskunde}
     {\errmessage{Error in argument to macro diploma: must be one of
-        MA-IW-XXX with XXX one of BCH, CH, EI, EI-AE, EI-ICT, EM-AE,
-        EM-AU, EM-EM, EM-EN, MA-TEW-YYY with YYY one of HI, HIBI, EB, BK! <<}}}}}}}}}}}}}}}
+        BA-IW-XXX with XXX one of BK, BCH, CH, EI or EM, or MA-IW-XXX with XXX one of BK, BCH, CH, EI, EI-AE, EI-ICT, EM-AE, EM-AU, EM-EM, EM-EN, MA-TEW-YYY with YYY one of HI, HIBI, EB, BK! <<}}}}}}}}}}}}}}}}}}}}
+  }
+  \newcommand\thesisname{ERROR}
+  \IfSubStr{#1}{MA-}{\renewcommand\thesisname{\masterthesisname}}{}
+  \IfSubStr{#1}{BA-}{\renewcommand\thesisname{\bachelorthesisname}}{}
 }
-}
-%</mt|pt> 
+%</bmt|pt> 
 %    \end{macrocode}
 % \end{macro}
 % 
@@ -2597,10 +2671,10 @@
 %   This macro sets the |\@defensedate| tags that later will
 %   be used on the title page. 
 %    \begin{macrocode}
-%<*mt|pt>      
+%<*bmt|pt>      
 \newcommand\@defensedate{ERROR}
 \newcommand{\defensedate}[1]{\renewcommand\@defensedate{#1}}
-%</mt|pt> 
+%</bmt|pt> 
 %    \end{macrocode}
 % \end{macro}
 % 
@@ -2608,10 +2682,10 @@
 %   This macro sets the |\@defenselocation| tags that later will
 %   be used on the title page. 
 %    \begin{macrocode}
-%<*mt|pt>      
+%<*bmt|pt>      
 \newcommand\@defenselocation{Antwerpen}
 \newcommand{\defenselocation}[1]{\renewcommand\@defenselocation{#1}}
-%</mt|pt> 
+%</bmt|pt> 
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2630,11 +2704,11 @@
 %
 % \begin{macro}{\isbn}
 %   This macro sets the |\@isbn| tags that later will
-%   be used on the data page. 
+%   be used on the data page. If you don't have an ISBN number, just
+%   don't specify one (i.e. don't use this macro).
 %    \begin{macrocode}
 %<*pt>      
-\newcommand{\@isbn}{\errmessage{Please, specify an ISBN number using
-    the \textbackslash{}isbn command in your preamble.}}
+\newcommand{\@isbn}{}
 \newcommand{\isbn}[1]{\renewcommand{\@isbn}{#1}}
 %</pt> 
 %    \end{macrocode}
@@ -2657,10 +2731,10 @@
 %   This macro sets the |\@academicyear| tag that later will be used on
 %   the title page.
 %    \begin{macrocode}
-%<*ct|mt|ex>      
+%<*ct|bmt|ex>      
 \newcommand{\@academicyear}{XXX-YYYY}
 \newcommand{\academicyear}[1]{\renewcommand{\@academicyear}{#1}}
-%</ct|mt|ex> 
+%</ct|bmt|ex> 
 %    \end{macrocode}
 % \end{macro}
 % 
@@ -2966,11 +3040,36 @@
 % \begin{macro}{\extrainfo}
 %   This macro will set the |\@extrainfo| tag that will be used on
 %   the back of the exam title page.
+%   When as (optional) first argument 'firstpage' is given, the extra
+%   info will start on the first page below the title block. In that
+%   case, we assume that conservation of space is your concern, so the
+%   extra info will also not be terminated with a 'clearpage'.
+%   If no optional first argument is given (or the default
+%   'separatepage' is given), the extra info will start on a new page
+%   an will be terminated by a clearpage.
 %   \changes{v2.1}{2018/06/20}{Changed default to empty}
+%   \changes{v2.3}{2019/03/27}{The command \textbackslash{}extrainfo
+%   now allows for an extra (optional)  first argument 'firstpage'}
 %    \begin{macrocode}
 %<*ex>
 \newcommand{\@extrainfo}{}
-\newcommand{\extrainfo}[1]{\renewcommand{\@extrainfo}{#1}}
+\newcommand\extrainfo[2][separatepage]{
+  \ifthenelse{\equal{#1}{separatepage}}{
+    % then
+    \renewcommand{\@extrainfo}{\clearpage #2 \clearpage}
+  }
+  {
+    % else
+    \ifthenelse{\equal{#1}{firstpage}}
+    {
+      \renewcommand{\@extrainfo}{#2}
+    }
+    {
+      \errmessage{Error: '\extrainfo' - first (optional) argument can
+        only be 'separatepage' or 'firstpage'}
+    }
+  }
+}
 %</ex> 
 %    \end{macrocode}
 % \end{macro}
@@ -3010,10 +3109,10 @@
 %</ct> 
 %    \end{macrocode}
 % 
-% The header and footer of the |uantwerpenmasterthesis| class are
+% The header and footer of the |uantwerpenbamathesis| class are
 % defined to be: 
 %    \begin{macrocode}
-%<*mt|pt>
+%<*bmt|pt>
 \if at twoside
   \lhead[\thepage]{\slshape\rightmark}
   \chead[]{}
@@ -3029,7 +3128,7 @@
   \cfoot[]{}
   \rfoot[]{}
 \fi
-%</mt|pt>
+%</bmt|pt>
 %    \end{macrocode}
 %
 % The header and footer of the |uantwerpenletter| class are
@@ -3200,7 +3299,7 @@
 % coordinate system origins at the left bottom.
 % Therefore:
 %    \begin{macrocode}
-%<*ct|mt>
+%<*ct|bmt>
 \pgfmathsetmacro{\ua at Wh}{\paperwidth}
 \pgfmathsetmacro{\ua at Xh}{0.2\paperheight}
 \pgfmathsetmacro{\ua at Yh}{0.125\paperheight}
@@ -3207,7 +3306,7 @@
 \pgfmathsetmacro{\ua at XMYh}{\ua at Xh-\ua at Yh}
 \pgfmathsetmacro{\ua at Rh}{0.5*\ua at Wh/\ua at XMYh*\ua at Wh+0.5*\ua at XMYh}
 \pgfmathsetmacro{\ua at Qh}{\ua at Rh-\ua at Xh+\paperheight}
-%</ct|mt>
+%</ct|bmt>
 %    \end{macrocode}
 %
 % \paragraph{Bottom circle A:} the bottom circle with the largest
@@ -3234,13 +3333,13 @@
 % |ua@| and a suffix ba (from 'bottom a').
 % Therefore:
 %    \begin{macrocode}
-%<*ct|mt>
+%<*ct|bmt>
 \pgfmathsetmacro{\ua at Wba}{0.4*\paperwidth}
 \pgfmathsetmacro{\ua at Sba}{0.125*\paperheight}
 \pgfmathsetmacro{\ua at XMYba}{0.02\paperheight}
 \pgfmathsetmacro{\ua at Rba}{0.5*\ua at Wba/\ua at XMYba*\ua at Wba+0.5*\ua at XMYba}
 \pgfmathsetmacro{\ua at Qba}{\ua at Rba+\ua at Sba}
-%</ct|mt>
+%</ct|bmt>
 %    \end{macrocode}
 %
 %
@@ -3248,13 +3347,13 @@
 % radius. The same reasoning leads to:
 %
 %    \begin{macrocode}
-%<*ct|mt>
+%<*ct|bmt>
 \pgfmathsetmacro{\ua at Wbb}{0.65*\paperwidth}
 \pgfmathsetmacro{\ua at Sbb}{0.14*\paperheight}
 \pgfmathsetmacro{\ua at XMYbb}{0.06\paperheight}
 \pgfmathsetmacro{\ua at Rbb}{0.5*\ua at Wbb/\ua at XMYbb*\ua at Wbb+0.5*\ua at XMYbb}
 \pgfmathsetmacro{\ua at Qbb}{\ua at Rbb+\ua at Sbb}
-%</ct|mt>
+%</ct|bmt>
 %    \end{macrocode}
 %
 % \paragraph{Text alignment:} The text is aligned around an imaginary
@@ -3261,12 +3360,12 @@
 % vertical line around 2/5 page width distance from the left edge.
 %  
 %    \begin{macrocode}
-%<*ct|mt>
+%<*ct|bmt>
 \pgfmathsetmacro{\ua at ll}{0.15*\paperwidth}
 \pgfmathsetmacro{\ua at l}{0.4*\paperwidth}
 \pgfmathsetmacro{\ua at d}{0.1in}
 \pgfmathsetmacro{\ua at rr}{0.85*\paperwidth}
-%</ct|mt>
+%</ct|bmt>
 %    \end{macrocode}
 %
 % Below, one can find the code for the title page of the
@@ -3475,7 +3574,7 @@
 %   \changes{v1.7}{2016/05/01}{Embedded babel translations of keywords
 %   into title page}
 %    \begin{macrocode}
-%<*mt>      
+%<*bmt>      
 \renewcommand\maketitle{%
   \pagestyle{empty}
   \begin{titlepage}
@@ -3498,7 +3597,7 @@
             \uppercase\expandafter{\uaname}\\~\\
             \academicyearname{} \@academicyear\\~\\
             {\large \@faculty{}}\\~\\
-            \masterthesisname{}\\[0.05\paperheight]
+            \thesisname{}\\[0.05\paperheight]
             {\Large \bf \@title{}}}
           (\ua at ll pt,0.55\paperheight)
           node [anchor = north west, text width = 0.7\paperwidth] {
@@ -3512,7 +3611,7 @@
             \end{tabular}
           }
           (\ua at ll pt,0.3\paperheight) node [anchor=north west, text width = 0.7\paperwidth]{%
-            \mthesisname\\
+            \bmthesisname\\
             \@diploma\\
             \@defenselocation, \@defensedate
           };
@@ -3532,7 +3631,7 @@
   \pagestyle{fancy}
   \thispagestyle{empty}
 }
-%</mt>
+%</bmt>
 %    \end{macrocode}
 % \end{macro}
 %
@@ -3541,7 +3640,7 @@
 %   |uantwerpenmasterthesis| class: 
 %   \changes{v1.3}{2015/12/31}{Changed eso-pic for tikz}
 %    \begin{macrocode}
-%<*mt>
+%<*bmt>
 \newcommand\makefinalpage{
   \cleardoublepage
   \thispagestyle{empty}
@@ -3556,7 +3655,7 @@
     };
   \end{tikzpicture}
 }
-%</mt> 
+%</bmt> 
 %    \end{macrocode}
 % \end{macro}
 %
@@ -3874,6 +3973,9 @@
 % \subsection{Title page for the exam class}
 %
 % \changes{v2.1}{2018/06/20}{Corrected spacing in title + exampart}
+% \changes{v2.3}{2019}{2019/03/27}{Now Groep has been replaced by Reeks
+% to be consistent with UAntwerpen PC-room nomenclature}
+% \changes{v2.3}{2019/03/27}{Added boxes to fill out name and docket number}
 % \begin{macro}{\maketitle}
 % The title page of the exam class is generated using the |\maketitle|
 % command. 
@@ -3890,22 +3992,33 @@
             \clip (0,0) rectangle (21,29.7);
             \draw 
             ( 3,9.7) -- ( 3,23.7)
-            ( 0,23.7) -- (21,23.7)
-            ( 3,19.7) -- (21,19.7)
-            ( 3,17.7) -- (21,17.7)
-            ( 3,15.7) -- (21,15.7)
-            (14,11.7) -- (14,15.7)
-            ( 3,13.7) -- (21,13.7)
-            ( 3,11.7) -- (21,11.7)
-            ( 0,9.7) -- (21,9.7);
+            ( 0,23.7) -- +(21,0)
+            ( 3,20.8) -- +(21,0)
+            ( 3,18.8) -- +(21,0)
+            ( 3,16.8) -- +(21,0)
+            (14,9.7) -- (14,13.7)
+            ( 3,13.7) -- +(21,0)
+            ( 3,11.7) -- +(21,0)
+            ( 0,9.7) -- +(21,0);
             
             \draw[ultra thick]
-            ( 3,15.7) +(0,-0.5) -- +(0,0) -- +(0.5,0)
+            ( 3,16.8) +(0,-0.5) -- +(0,0) -- +(0.5,0)
             ( 3,13.7) +(0,+0.5) -- +(0,0) -- +(0.5,0)
-            (14,15.7) +(-0.5,0) -- +(0,0) +(0,-0.5) -- +(0,0) --  +(0.5,0)
-            (14,13.7) +(-0.5,0) -- +(0,0) +(0,+0.5) -- +(0,0) --  +(0.5,0)
-            (21,15.7) +(0,-0.5) -- +(0,0) -- +(-0.5,0)
+            (21,16.8) +(0,-0.5) -- +(0,0) -- +(-0.5,0)
             (21,13.7) +(0,+0.5) -- +(0,0) -- +(-0.5,0);
+%            (14,15.7) +(-0.5,0) -- +(0,0) +(0,-0.5) -- +(0,0) --  +(0.5,0)
+%            (14,11.7) +(-0.5,0) -- +(0,0) +(0,+0.5) -- +(0,0) --  +(0.5,0)
+
+            \foreach \nn in {0,1,...,7} {
+              \draw (16.5,13.9) ++({0.5*\nn},0) rectangle +(0.5,0.8);
+            }
+
+            \foreach \nn in {0,1,...,33} {
+              \draw (3.5,15.3) ++({0.5*\nn},0) rectangle +(0.5,0.8);
+            }
+            \foreach \nn in {0,1,...,23} {
+              \draw (3.5,13.9) ++({0.5*\nn},0) rectangle +(0.5,0.8);
+            }
             
             \path
             (3,25.2) node[anchor=north west] {
@@ -3917,25 +4030,22 @@
                 \ifx\@programmeq\@emptymacro\else--- \@programmeq\fi
               }
             }
-            (3.3,23.0) node[anchor=north west] { 
-              \parbox{14cm}{
-                \fontfamily{phv}\fontsize{12}{15}\selectfont
-              }
-            }
-            (3.3,21.9) node[anchor=north west] {
+            (3.3,23) node[anchor=north west] {
               \parbox{16cm}{
                 \fontfamily{phv}\fontsize{18}{22}\fontseries{b}\fontshape{n}\selectfont
-                \raggedright \@coursei{} --- \@exampart
+                \raggedright \@coursei{}
+                \ifx\@exampart\@emptymacro
+                \else --- \@exampart\fi
                 \fontfamily{phv}\fontsize{12}{18}\fontseries{m}\fontshape{n}\selectfont\\
-                Groep \@examgroupnumber{} \hfill \@examdate{} }
+                Reeks \@examgroupnumber{} \hfill \@examdate{} }
             }
-            (3.3,19) node[anchor=north west] {
+            (3.3,20.1) node[anchor=north west] {
               \parbox{14cm}{
                 \fontfamily{phv}\fontsize{12}{15}\fontseries{m}\selectfont
                 \@coursecodei
               }
             }
-            (3.3,17.5) node[anchor=north west] { 
+            (3.3,18.6) node[anchor=north west] { 
               \parbox{14cm}{
                 \fontfamily{phv}\fontsize{12}{18}\fontseries{m}\fontshape{n}\selectfont
                 \raggedright \ifdef{\dateenglish}{Professor(s) --- }{}Titularis(sen):\\
@@ -3943,25 +4053,33 @@
                 \raggedright \@author{}
               }
             }
-            (3.3,15.5) node[anchor=north west] { 
+            (3.3,16.7) node[anchor=north west] { 
               \parbox{10cm}{
                 \fontfamily{phv}\fontsize{12}{15}\fontseries{m}\fontshape{n}\selectfont
-                \raggedright \ifdef{\dateenglish}{Last name/First name
+                \raggedright \ifdef{\dateenglish}{Last name
                   --- }{}
-                Naam/Voornaam:}
+                Naam:}
             }
-            (14.3,15.5) node[anchor=north west] { 
+            (3.3,15.25) node[anchor=north west] { 
+              \parbox{10cm}{
+                \fontfamily{phv}\fontsize{12}{15}\fontseries{m}\fontshape{n}\selectfont
+                \raggedright \ifdef{\dateenglish}{First name
+                  --- }{}
+                Voornaam:}
+            }
+            (16.3,15.25) node[anchor=north west] { 
               \parbox{5cm}{
                 \fontfamily{phv}\fontsize{12}{15}\fontseries{m}\fontshape{n}\selectfont
-                \raggedright \ifdef{\dateenglish}{Registration No. --- }{}Rolnr.:}
+                \raggedright \ifdef{\dateenglish}{Docket No. --- }{}Rolnr.:}
             }
-            (3.3,13.5) node[anchor=north west] { 
+            
+            (3.3,11.5) node[anchor=north west] { 
               \parbox{14cm}{
                 \fontfamily{phv}\fontsize{12}{21}\fontseries{m}\fontshape{n}\selectfont
                 \raggedright \ifdef{\dateenglish}{Exam duration --- }{}Duur van het examen: \@examlength\\
               }
             }
-            (14.3,13.5) node[anchor=north west] { 
+            (14.3,11.5) node[anchor=north west] { 
               \parbox{5cm}{
                 \fontfamily{phv}\fontsize{12}{15}\fontseries{m}\fontshape{n}\selectfont
                 \raggedright \ifdef{\dateenglish}{Start --- }{}Begin: \@tstart \\[1ex]
@@ -3968,7 +4086,7 @@
                 \raggedright \ifdef{\dateenglish}{End --- }{}Einde~: \@tend
               }
             }
-            (3.3,11.5) node[anchor=north west] { 
+            (3.3,13.5) node[anchor=north west] { 
               \parbox{14cm}{
                 \fontfamily{phv}\fontsize{12}{21}\fontseries{m}\fontshape{n}\selectfont
                 \raggedright \ifdef{\dateenglish}{Room --- }{}Lokaal: \@rooms
@@ -3975,13 +4093,6 @@
                 
               }
             }
-            (2,9.5) node[anchor=north west] { 
-              \parbox{19cm}{
-                \fontfamily{phv}\fontsize{10}{13}\fontseries{m}\fontshape{n}\selectfont
-                \ifdef{\dateenglish}{\raggedright Extra information: read the back of this page\\}{}
-                \raggedright Extra informatie: zie achterkant
-              }
-            }
             (3,27.7) node[anchor=north west] {
               \includegraphics[width=7cm]{\@logo}
             };
@@ -3990,12 +4101,10 @@
       \end{tikzpicture}
     }
   }
-  \vspace*{15cm}
-  \clearpage
+  \vspace*{17cm}
   \ifx\@qrtitle\@emptymacro
   \else
   \@extrainfo
-  \clearpage
   \fi
 }
 %</ex>
@@ -4205,9 +4314,9 @@
 %
 % \subsection{References}
 %    \begin{macrocode}
-%<*ct|mt|pt>
+%<*ct|bmt|pt>
 \IfFileExists{varioref.sty}{\RequirePackage{varioref}}{}
-%</ct|mt|pt>
+%</ct|bmt|pt>
 %
 %<*ct>
 \IfFileExists{hyperref.sty}{
@@ -4237,7 +4346,7 @@
 %</ct>
 %
 %
-%<*mt|pt>
+%<*bmt|pt>
 \IfFileExists{hyperref.sty}{
     \RequirePackage{hyperref}
     \hypersetup{
@@ -4262,7 +4371,7 @@
       }
     }
 }{}
-%</mt|pt> 
+%</bmt|pt> 
 %    \end{macrocode}
 %
 % \Finale

Modified: trunk/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.ins	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.ins	2019-03-28 20:58:25 UTC (rev 50626)
@@ -1,4 +1,4 @@
-%% Copyright (C) 2013-2018 by Walter Daems <walter.daems at uantwerpen.be>
+%% Copyright (C) 2013-2019 by Walter Daems <walter.daems at uantwerpen.be>
 %%
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3 of this license
@@ -24,7 +24,7 @@
 
 This is a generated file.
 
-Copyright (C) 2013-2018  by Walter Daems <walter.daems at uantwerpen.be>
+Copyright (C) 2013-2019  by Walter Daems <walter.daems at uantwerpen.be>
 
 This work may be distributed and/or modified under the conditions of
 the LaTeX Project Public License, either version 1.3 of this license
@@ -46,7 +46,8 @@
 \generate{\file{uantwerpencoursetext-example.tex}{\from{uantwerpendocs.dtx}{ct-example}}}
 
 \generate{\file{uantwerpenmasterthesis.cls}{\from{uantwerpendocs.dtx}{mt}}}
-\generate{\file{uantwerpenmasterthesis-example.tex}{\from{uantwerpendocs.dtx}{mt-example}}}
+\generate{\file{uantwerpenbamathesis.cls}{\from{uantwerpendocs.dtx}{bmt}}}
+\generate{\file{uantwerpenbamathesis-example.tex}{\from{uantwerpendocs.dtx}{bmt-example}}}
 
 \generate{\file{uantwerpenphdthesis.cls}{\from{uantwerpendocs.dtx}{pt}}}
 \generate{\file{uantwerpenphdthesis-example1.tex}{\from{uantwerpendocs.dtx}{pt-example1}}}
@@ -68,6 +69,7 @@
 \Msg{*                                                              *}
 \Msg{*     uantwerpencoursetext.cls                                 *}
 \Msg{*     uantwerpenmasterthesis.cls                               *}
+\Msg{*     uantwerpenbamathesis.cls                                 *}
 \Msg{*     uantwerpenphdthesis.cls                                  *}
 \Msg{*     uantwerpenletter.cls                                     *}
 \Msg{*     uantwerpenexam.cls                                       *}

Added: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/keyboard.jpg
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/keyboard.jpg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/uantwerpendocs/keyboard.jpg	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/tex/latex/uantwerpendocs/keyboard.jpg	2019-03-28 20:58:25 UTC (rev 50626)

Property changes on: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/keyboard.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls	2019-03-28 20:58:25 UTC (rev 50626)
@@ -0,0 +1,568 @@
+%%
+%% This is file `uantwerpenbamathesis.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% uantwerpendocs.dtx  (with options: `bmt')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2013-2019  by Walter Daems <walter.daems at uantwerpen.be>
+%% 
+%% This work may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3 of this license
+%% or (at your option) any later version.  The latest version of this
+%% license is in:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% and version 1.3 or later is part of all distributions of LaTeX version
+%% 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is Walter Daems.
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesClass{uantwerpenbamathesis}
+    [2019/03/27 v2.3 .dtx skeleton file]
+\def\fileversion{2.3}
+\def\filedate{2019/03/27}
+\newif\if at titlepagenoartwork
+\DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
+\newif\if at titlepagetableonly
+\DeclareOption{titlepagetableonly}{\@titlepagetableonlytrue}
+\newif\if at filled
+\DeclareOption{filled}{\@filledtrue}
+\ExecuteOptions{a4paper,11pt,final,oneside,openright}
+\ProcessOptions
+\LoadClassWithOptions{book}
+\setlength{\parindent}{0pt}
+\addtolength{\parskip}{0.75\baselineskip}
+\setcounter{secnumdepth}{3}
+\RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry}
+\RequirePackage{xstring}
+\RequirePackage{etoolbox}
+\RequirePackage{ifthen}
+\IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{}
+\newcommand{\@emptymacro}{}
+\RequirePackage{graphicx}
+\RequirePackage{color}
+\RequirePackage{tikz}
+\usetikzlibrary{positioning}
+\RequirePackage{eso-pic}
+\RequirePackage{fancyhdr}
+\definecolor{uacorpbord}{cmyk}     {0.00,1.00,0.60,0.37}
+\definecolor{uacorpblue}{cmyk}     {1.00,0.25,0.00,0.50}
+\definecolor{uacorplightblue}{cmyk}{1.00,0.00,0.08,0.13}
+\definecolor{uacorporange}{cmyk}   {0.00,0.32,1.00,0.09}
+\definecolor{uaftifresh}{cmyk}     {0.34,1.00,0.00,0.00}
+\definecolor{uaftisober}{cmyk}     {0.10,1.00,0.00,0.49}
+\definecolor{lightgray}{cmyk}      {0.00,0.00,0.00,0.05}
+\definecolor{darkgray}{cmyk}       {0.00,0.00,0.00,0.80}
+\definecolor{watermark}{cmyk}      {0.00,0.00,0.00,0.05}
+\newcommand\uaname{University of Antwerp}
+\newcommand\logoname{UA_HOR_ENG_CMYK}
+\newcommand\footername{4E_PMS302_BR_ENG_RGB}
+\newcommand\arrname{All rights reserved}
+\newcommand\orname{of}
+\newcommand\domainname{uantwerp.be}
+\newcommand\datename{Date}
+\newcommand\subjectname{Subject}
+\newcommand\academicyearname{Academic year}
+\newcommand\masterthesisname{Master's thesis}
+\newcommand\bachelorthesisname{Bachelor's thesis}
+\newcommand\supervisorsname{Supervisors}
+\newcommand\juryname{Jury}
+\newcommand\jurymembersname{Members}
+\newcommand\jurychairmanname{Chairman}
+\newcommand\bmthesisname{Thesis to obtain the degree of}
+\newcommand\pthesisnamei{Thesis submitted in fulfilment of the
+  requirements for the degree of}
+\newcommand\pthesisnameii{at University of Antwerp}
+\newcommand\@faculty{< Specify faculty using \textbackslash{}facultyacronym\{ABC\} >}
+\newcommand\faccpg{
+  \renewcommand\@faculty{Centre Pieter Gillis}}
+\newcommand\facfbd{
+  \renewcommand\@faculty{
+    Faculty of Pharmaceutical, Biomedical and Veterinary Sciences}}
+\newcommand\facggw{
+  \renewcommand\@faculty{Faculty of Medicine and Health Sciences}}
+\newcommand\insiob{
+  \renewcommand\@faculty{Insitute of Development Policy}}
+\newcommand\insoiw{
+  \renewcommand\@faculty{Institute of Educations and Information Sciences}}
+\newcommand\asoe{
+  \renewcommand\@faculty{Antwerp School of Education}}
+\newcommand\faclw{
+  \renewcommand\@faculty{Faculty of Arts}}
+\newcommand\facow{
+  \renewcommand\@faculty{Faculty of Design Sciences}}
+\newcommand\facsw{
+  \renewcommand\@faculty{Faculty of Social Sciences}}
+\newcommand\facrec{
+  \renewcommand\@faculty{Faculty of Law}}
+\newcommand\factew{
+  \renewcommand\@faculty{Faculty of Applied Economics}}
+\newcommand\facti{
+  \renewcommand\@faculty{Faculty of Applied Engineering}}
+\newcommand\facwet{
+  \renewcommand\@faculty{Faculty of Science}}
+\newcommand\weightname{Weight}
+\AtBeginDocument{
+  \@ifpackageloaded{babel}{
+    \addto\captionsdutch{%
+      \renewcommand\uaname{Universiteit Antwerpen}
+      \renewcommand\logoname{UA_HOR_NED_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_NED_RGB}
+      \renewcommand\arrname{Alle rechten voorbehouden}
+      \renewcommand\orname{van}
+      \renewcommand\domainname{uantwerpen.be}
+      \renewcommand\subjectname{Onderwerp}%
+      \renewcommand\datename{Datum}%
+      \renewcommand\academicyearname{Academiejaar}
+      \renewcommand\masterthesisname{Masterproef}
+      \renewcommand\bachelorthesisname{Bachelorproef}
+      \renewcommand\supervisorsname{Promotoren}
+      \renewcommand\juryname{Jury}
+      \renewcommand\jurymembersname{Leden}
+      \renewcommand\jurychairmanname{Voorzitter}
+      \renewcommand\bmthesisname{Proefschrift tot het behalen van de
+        graad van}
+      \renewcommand\pthesisnamei{Proefschrift voorgelegd tot het
+        behalen van de graad van}
+      \renewcommand\pthesisnameii{aan de \uaname{} te
+        verdedigen door}
+      \renewcommand\faccpg{
+        \renewcommand\@faculty{Centrum Pieter Gillis}}
+      \renewcommand\facfbd{
+        \renewcommand\@faculty{
+          Faculteit Farmaceutische, Biomedische en Diergeneeskundige
+          Wetenschappen}}
+      \renewcommand\facggw{
+        \renewcommand\@faculty{Faculteit Geneeskunde en
+          Gezondheidswetenschappen}}
+      \renewcommand\insiob{
+        \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
+          beheer}}
+      \renewcommand\insoiw{
+        \renewcommand\@faculty{Instituut voor Onderwijs- en
+          Informatiewetenschappen}}
+      \renewcommand\asoe{
+        \renewcommand\@faculty{Antwerp School of Education}}
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
+          Letteren en Wijsbegeerte}}
+      \renewcommand\facow{
+        \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
+      \renewcommand\facsw{
+        \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
+      \renewcommand\facrec{
+        \renewcommand\@faculty{Faculteit Rechten}}
+      \renewcommand\factew{
+        \renewcommand\@faculty{Faculteit Toegepaste Economische
+          Wetenschappen}}
+      \renewcommand\facti{
+        \renewcommand\@faculty{Faculteit Toegepaste
+          Ingenieurswetenschappen}}
+      \renewcommand\facwet{
+        \renewcommand\@faculty{Faculteit Wetenschappen}}
+      \renewcommand\weightname{Gewicht}
+    }
+    \addto\captionsgerman{%
+      \renewcommand\uaname{Universit\"at Antwerpen}
+      \renewcommand\logoname{UA_HOR_DUI_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_NED_RGB}
+      \renewcommand\arrname{Alle Rechte vorbehalten}
+      \renewcommand\orname{von}
+      \renewcommand\domainname{uantwerpen.be}
+      \renewcommand\subjectname{Betreff}%
+      \renewcommand\datename{Datum}%
+      \renewcommand\academicyearname{Akademisches Jahr}
+      \renewcommand\masterthesisname{Masterdissertation}
+      \renewcommand\bachelorthesisname{Bachelordissertation}
+      \renewcommand\supervisorsname{Veranstalter}
+      \renewcommand\juryname{Jury}
+      \renewcommand\jurymembersname{Mitglieder}
+      \renewcommand\jurychairmanname{Vorsitzender}
+      \renewcommand\bmthesisname{Dissertation zur Erreichung des
+        Grades der}
+      \renewcommand\pthesisnamei{Dissertation zur Erreiching des
+        Grades der}
+      \renewcommand\pthesisnameii{an die \uaname}
+      \renewcommand\faccpg{
+        \renewcommand\@faculty{Centrum Pieter Gillis}}
+      \renewcommand\facfbd{
+        \renewcommand\@faculty{
+          Faculteit Farmaceutische, Biomedische en Diergeneeskundige
+          Wetenschappen}}
+      \renewcommand\facggw{
+        \renewcommand\@faculty{Faculteit Geneeskunde en
+          Gezondheidswetenschappen}}
+      \renewcommand\insiob{
+        \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
+          beheer}}
+      \renewcommand\insoiw{
+        \renewcommand\@faculty{Instituut voor Onderwijs- en
+          Informatiewetenschappen}}
+      \renewcommand\asoe{
+        \renewcommand\@faculty{Antwerp School of Education}}
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
+          Letteren en Wijsbegeerte}}
+      \renewcommand\facow{
+        \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
+      \renewcommand\facsw{
+        \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
+      \renewcommand\facrec{
+        \renewcommand\@faculty{Faculteit Rechten}}
+      \renewcommand\factew{
+        \renewcommand\@faculty{Faculteit Toegepaste Economische
+          Wetenschappen}}
+      \renewcommand\facti{
+        \renewcommand\@faculty{Faculteit Toegepaste
+          Ingenieurswetenschappen}}
+      \renewcommand\facwet{
+        \renewcommand\@faculty{Faculteit Wetenschappen}}
+      \renewcommand\weightname{Gewicht}
+    }
+    \addto\captionsfrench{%
+      \renewcommand\uaname{Universit\'e d'Anvers}
+      \renewcommand\logoname{UA_HOR_FRA_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_ENG_RGB}
+      \renewcommand\arrname{Tous les droits sont r\'eserv\'es}
+      \renewcommand\orname{de}
+      \renewcommand\domainname{uanvers.be}
+      \renewcommand\subjectname{Objet}%
+      \renewcommand\datename{Date}%
+      \renewcommand\academicyearname{Ann\'ee acad\'emique}
+      \renewcommand\masterthesisname{Th\`ese de master}
+      \renewcommand\bachelorthesisname{Th\`ese de baccalaur\'eat}
+      \renewcommand\supervisorsname{Promoteurs}
+      \renewcommand\juryname{Jury}
+      \renewcommand\jurymembersname{Membres}
+      \renewcommand\jurychairmanname{Pr\'esident}
+      \renewcommand\bmthesisname{Th\`ese \`a l'atteinte du degr\'e de}
+      \renewcommand\pthesisnamei{Th\`ese Doctorale \`a l'atteinte du
+        degr\'e de}
+      \renewcommand\pthesisnameii{\`a l'\uaname}
+      \renewcommand\faccpg{
+        \renewcommand\@faculty{Centrum Pieter Gillis}}
+      \renewcommand\facfbd{
+        \renewcommand\@faculty{
+          Faculteit Farmaceutische, Biomedische en Diergeneeskundige
+          Wetenschappen}}
+      \renewcommand\facggw{
+        \renewcommand\@faculty{Faculteit Geneeskunde en
+          Gezondheidswetenschappen}}
+      \renewcommand\insiob{
+        \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
+          beheer}}
+      \renewcommand\insoiw{
+        \renewcommand\@faculty{Instituut voor Onderwijs- en
+          Informatiewetenschappen}}
+      \renewcommand\asoe{
+        \renewcommand\@faculty{Antwerp School of Education}}
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
+          Letteren en Wijsbegeerte}}
+      \renewcommand\facow{
+        \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
+      \renewcommand\facsw{
+        \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
+      \renewcommand\facrec{
+        \renewcommand\@faculty{Faculteit Rechten}}
+      \renewcommand\factew{
+        \renewcommand\@faculty{Faculteit Toegepaste Economische
+          Wetenschappen}}
+      \renewcommand\facti{
+        \renewcommand\@faculty{Faculteit Toegepaste
+          Ingenieurswetenschappen}}
+      \renewcommand\facwet{
+        \renewcommand\@faculty{Faculteit Wetenschappen}}
+      \renewcommand\weightname{Poids}
+    }
+    \addto\captionsspanish{%
+      \renewcommand\uaname{Universidad de Amberes}
+      \renewcommand\logoname{UA_HOR_SPA_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_ENG_RGB}
+      \renewcommand\arrname{Todos los derechos reservados}
+      \renewcommand\orname{de}
+      \renewcommand\domainname{uantwerp.be}
+      \renewcommand\subjectname{Asunto}%
+      \renewcommand\datename{Fecha}%
+      \renewcommand\academicyearname{A\~no acad\'emico}
+      \renewcommand\masterthesisname{Tesis de maestr\'\i{}a}
+      \renewcommand\bachelorthesisname{Tesis de bachiller}
+      \renewcommand\supervisorsname{Promotores}
+      \renewcommand\juryname{Jurado}
+      \renewcommand\jurymembersname{Miembros}
+      \renewcommand\jurychairmanname{Presidente}
+      \renewcommand\bmthesisname{Disertaci\'on a la consecuci\'on del
+        grado de}
+      \renewcommand\pthesisnamei{Disertaici\'on a la consecuci\'on del
+        grado de}
+      \renewcommand\pthesisnameii{a l'\uaname}
+      \renewcommand\faccpg{
+        \renewcommand\@faculty{Centrum Pieter Gillis}}
+      \renewcommand\facfbd{
+        \renewcommand\@faculty{
+          Faculteit Farmaceutische, Biomedische en Diergeneeskundige
+          Wetenschappen}}
+      \renewcommand\facggw{
+        \renewcommand\@faculty{Faculteit Geneeskunde en
+          Gezondheidswetenschappen}}
+      \renewcommand\insiob{
+        \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
+          beheer}}
+      \renewcommand\insoiw{
+        \renewcommand\@faculty{Instituut voor Onderwijs- en
+          Informatiewetenschappen}}
+      \renewcommand\asoe{
+        \renewcommand\@faculty{Antwerp School of Education}}
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
+          Letteren en Wijsbegeerte}}
+      \renewcommand\facow{
+        \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
+      \renewcommand\facsw{
+        \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
+      \renewcommand\facrec{
+        \renewcommand\@faculty{Faculteit Rechten}}
+      \renewcommand\factew{
+        \renewcommand\@faculty{Faculteit Toegepaste Economische
+          Wetenschappen}}
+      \renewcommand\facti{
+        \renewcommand\@faculty{Faculteit Toegepaste
+          Ingenieurswetenschappen}}
+      \renewcommand\facwet{
+        \renewcommand\@faculty{Faculteit Wetenschappen}}
+      \renewcommand\weightname{Peso}
+    }
+  }
+  {}
+}
+\newcommand{\@facultyacronym}{}
+\newcommand{\facultyacronym}[1]{
+  \renewcommand{\@facultyacronym}{#1}
+  \AtBeginDocument{
+    \ifthenelse{\equal{#1}{CPG}}{\faccpg}{
+    \ifthenelse{\equal{#1}{FBD}}{\facfbd}{
+    \ifthenelse{\equal{#1}{GGW}}{\facggw}{
+    \ifthenelse{\equal{#1}{IOB}}{\insiob}{
+    \ifthenelse{\equal{#1}{IOIW}}{\insoiw}{
+    \ifthenelse{\equal{#1}{ASoE}}{\asoe}{
+    \ifthenelse{\equal{#1}{LW}}{\faclw}{
+    \ifthenelse{\equal{#1}{OW}}{\facow}{
+    \ifthenelse{\equal{#1}{SW}}{\facsw}{
+    \ifthenelse{\equal{#1}{REC}}{\facrec}{
+    \ifthenelse{\equal{#1}{TEW}}{\factew}{
+    \ifthenelse{\equal{#1}{TI}}{\facti}{
+    \ifthenelse{\equal{#1}{WET}}{\facwet}{
+      \errmessage{Error: wrong faculty acronym; choose one of CPG, FBD, GGW,
+        IOB, IOIW, ASoE, LW, OW, SW, REC, TEW, TI, WET}}}}}}}}}}}}}}}
+}
+\newcommand{\@subtitle}{Master's thesis}
+\newcommand\@supervisori{\errmessage{Please define a supervisor of
+    your thesiswork using the \textbackslash{}supervisori to iv
+    commands} in the preamble of your document.}
+\newcommand\@supervisoriaff{}
+\newcommand\@supervisorii{}
+\newcommand\@supervisoriiaff{}
+\newcommand\@supervisoriii{}
+\newcommand\@supervisoriiiaff{}
+\newcommand\@supervisoriv{}
+\newcommand\@supervisorivaff{}
+\newcommand{\supervisori}[2]{\renewcommand\@supervisori{#1}\renewcommand\@supervisoriaff{#2}}
+\newcommand{\supervisorii}[2]{\renewcommand\@supervisorii{#1}\renewcommand\@supervisoriiaff{#2}}
+\newcommand{\supervisoriii}[2]{\renewcommand\@supervisoriii{#1}\renewcommand\@supervisoriiiaff{#2}}
+\newcommand{\supervisoriv}[2]{\renewcommand\@supervisoriv{#1}\renewcommand\@supervisorivaff{#2}}
+\newcommand{\@diplomalevel}{ERROR}
+\newcommand{\@diploma}{ERROR}
+\newcommand{\diploma}[1]{
+  \newcommand{\MoSIW}{Master of Science in de industri\"ele wetenschappen}
+  \newcommand{\BoSIW}{Bachelor of Science in de industri\"ele wetenschappen}
+  \newcommand{\MoSTEW}{Master of Science in de toegepaste economische wetenschappen}
+  \renewcommand{\@diploma}{
+    \ifthenelse{\equal{#1}{BA-IW-BK}}
+                          {\BoSIW: bouwkunde}{
+    \ifthenelse{\equal{#1}{BA-IW-BCH}}
+                          {\BoSIW: biochemie}{
+    \ifthenelse{\equal{#1}{BA-IW-CH}}
+                          {\BoSIW: chemie}{
+    \ifthenelse{\equal{#1}{BA-IW-EI}}
+                          {\BoSIW: elektronica-ICT}{
+    \ifthenelse{\equal{#1}{BA-IW-EM}}
+                          {\BoSIW: elektromechanica}{
+    \ifthenelse{\equal{#1}{MA-IW-BK}}
+                          {\MoSIW: bouwkunde}{
+    \ifthenelse{\equal{#1}{MA-IW-BCH}}
+                          {\MoSIW: biochemie}{
+    \ifthenelse{\equal{#1}{MA-IW-CH}}
+                          {\MoSIW: chemie}{
+    \ifthenelse{\equal{#1}{MA-IW-EI}}
+                          {\MoSIW: elektronica-ICT}{
+    \ifthenelse{\equal{#1}{MA-IW-EI-AE}}
+                          {\MoSIW:\\elektronica-ICT, afstudeerrichting automotive engineering}{
+    \ifthenelse{\equal{#1}{MA-IW-EI-ICT}}
+                          {\MoSIW:\\elektronica-ICT, afstudeerrichting ICT}{
+    \ifthenelse{\equal{#1}{MA-IW-EM-AE}}
+                          {\MoSIW:\\elektromechanica, afstudeerrichting automotive engineering}{
+    \ifthenelse{\equal{#1}{MA-IW-EM-AU}}
+                          {\MoSIW:\\elektromechanica, afstudeerrichting automatisering}{
+    \ifthenelse{\equal{#1}{MA-IW-EM-EM}}
+                          {\MoSIW:\\elektromechanica, afstudeerrichting elektromechanica}{
+    \ifthenelse{\equal{#1}{MA-IW-EM-EN}}
+                          {\MoSIW:\\elektromechanica, afstudeerrichting energie}{
+    \ifthenelse{\equal{#1}{MA-TEW-HI}}
+                          {\MoSTEW: handelsingenieur}{
+    \ifthenelse{\equal{#1}{MA-TEW-HIBI}}
+                          {\MoSTEW:\\handelsingenieur in de beleidsinformatica}{
+    \ifthenelse{\equal{#1}{MA-TEW-EB}}
+                          {\MoSTEW: economisch beleid}{
+    \ifthenelse{\equal{#1}{MA-TEW-BK}}
+                          {\MoSTEW: bedrijfskunde}
+    {\errmessage{Error in argument to macro diploma: must be one of
+        BA-IW-XXX with XXX one of BK, BCH, CH, EI or EM, or MA-IW-XXX with XXX one of BK, BCH, CH, EI, EI-AE, EI-ICT, EM-AE, EM-AU, EM-EM, EM-EN, MA-TEW-YYY with YYY one of HI, HIBI, EB, BK! <<}}}}}}}}}}}}}}}}}}}}
+  }
+  \newcommand\thesisname{ERROR}
+  \IfSubStr{#1}{MA-}{\renewcommand\thesisname{\masterthesisname}}{}
+  \IfSubStr{#1}{BA-}{\renewcommand\thesisname{\bachelorthesisname}}{}
+}
+\newcommand\@defensedate{ERROR}
+\newcommand{\defensedate}[1]{\renewcommand\@defensedate{#1}}
+\newcommand\@defenselocation{Antwerpen}
+\newcommand{\defenselocation}[1]{\renewcommand\@defenselocation{#1}}
+\newcommand{\@academicyear}{XXX-YYYY}
+\newcommand{\academicyear}[1]{\renewcommand{\@academicyear}{#1}}
+\if at twoside
+  \lhead[\thepage]{\slshape\rightmark}
+  \chead[]{}
+  \rhead[\slshape\leftmark]{\thepage}
+  \lfoot[]{}
+  \cfoot[]{}
+  \rfoot[]{}
+\else
+  \lhead[]{\leftmark}
+  \chead[]{}
+  \rhead[]{\thepage}
+  \lfoot[]{}
+  \cfoot[]{}
+  \rfoot[]{}
+\fi
+
+\pgfmathsetmacro{\ua at Wh}{\paperwidth}
+\pgfmathsetmacro{\ua at Xh}{0.2\paperheight}
+\pgfmathsetmacro{\ua at Yh}{0.125\paperheight}
+\pgfmathsetmacro{\ua at XMYh}{\ua at Xh-\ua at Yh}
+\pgfmathsetmacro{\ua at Rh}{0.5*\ua at Wh/\ua at XMYh*\ua at Wh+0.5*\ua at XMYh}
+\pgfmathsetmacro{\ua at Qh}{\ua at Rh-\ua at Xh+\paperheight}
+\pgfmathsetmacro{\ua at Wba}{0.4*\paperwidth}
+\pgfmathsetmacro{\ua at Sba}{0.125*\paperheight}
+\pgfmathsetmacro{\ua at XMYba}{0.02\paperheight}
+\pgfmathsetmacro{\ua at Rba}{0.5*\ua at Wba/\ua at XMYba*\ua at Wba+0.5*\ua at XMYba}
+\pgfmathsetmacro{\ua at Qba}{\ua at Rba+\ua at Sba}
+\pgfmathsetmacro{\ua at Wbb}{0.65*\paperwidth}
+\pgfmathsetmacro{\ua at Sbb}{0.14*\paperheight}
+\pgfmathsetmacro{\ua at XMYbb}{0.06\paperheight}
+\pgfmathsetmacro{\ua at Rbb}{0.5*\ua at Wbb/\ua at XMYbb*\ua at Wbb+0.5*\ua at XMYbb}
+\pgfmathsetmacro{\ua at Qbb}{\ua at Rbb+\ua at Sbb}
+\pgfmathsetmacro{\ua at ll}{0.15*\paperwidth}
+\pgfmathsetmacro{\ua at l}{0.4*\paperwidth}
+\pgfmathsetmacro{\ua at d}{0.1in}
+\pgfmathsetmacro{\ua at rr}{0.85*\paperwidth}
+\renewcommand\maketitle{%
+  \pagestyle{empty}
+  \begin{titlepage}
+    \begin{tikzpicture}[remember picture,overlay]
+      \node at (current page.center) {
+        \begin{tikzpicture}[inner sep=0pt]
+          \clip (0,0) rectangle(\paperwidth,\paperheight);
+          \if at titlepagenoartwork\else
+          \filldraw [lightgray] (0.55\paperwidth,\ua at Qba pt) circle (\ua at Rba pt);
+          \filldraw [white] (0.35\paperwidth,\ua at Qbb pt) circle (\ua at Rbb pt);
+          \filldraw [lightgray] (0,\ua at Qh pt) circle (\ua at Rh pt);
+          \path
+          (0.95\paperwidth,0.1\paperheight)
+          node [anchor=north east] {
+            \includegraphics[width=0.25\paperwidth]{\logoname}};
+          \fi
+          \path
+          (\ua at ll pt,0.77\paperheight)
+          node [anchor=north west, text width=0.7\paperwidth] {
+            \uppercase\expandafter{\uaname}\\~\\
+            \academicyearname{} \@academicyear\\~\\
+            {\large \@faculty{}}\\~\\
+            \thesisname{}\\[0.05\paperheight]
+            {\Large \bf \@title{}}}
+          (\ua at ll pt,0.55\paperheight)
+          node [anchor = north west, text width = 0.7\paperwidth] {
+            {\large \bf \@author{}}\\~\\~\\
+            \begin{tabular}{@{}p{2.7cm}p{10.8cm}}
+              \textbf{\supervisorsname{}:}
+              & \@supervisori \\
+              & \@supervisorii \\
+              & \@supervisoriii \\
+              & \@supervisoriv
+            \end{tabular}
+          }
+          (\ua at ll pt,0.3\paperheight) node [anchor=north west, text width = 0.7\paperwidth]{%
+            \bmthesisname\\
+            \@diploma\\
+            \@defenselocation, \@defensedate
+          };
+        \end{tikzpicture}
+      };
+    \end{tikzpicture}
+  \end{titlepage}%
+  \clearpage
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+  \pagestyle{fancy}
+  \thispagestyle{empty}
+}
+\newcommand\makefinalpage{
+  \cleardoublepage
+  \thispagestyle{empty}
+  \begin{tikzpicture}[remember picture,overlay]
+    \node at (current page.center) {
+      \begin{tikzpicture}[inner sep=0pt]
+        \clip (0,0) rectangle(\paperwidth,\paperheight);
+        \if at titlepagenoartwork\else
+        \filldraw [lightgray] (\paperwidth,\ua at Qh pt) circle (\ua at Rh pt);
+        \fi
+      \end{tikzpicture}
+    };
+  \end{tikzpicture}
+}
+\IfFileExists{varioref.sty}{\RequirePackage{varioref}}{}
+\IfFileExists{hyperref.sty}{
+    \RequirePackage{hyperref}
+    \hypersetup{
+      backref=true,
+      breaklinks=true,
+      colorlinks=true,
+      citecolor=black,
+      filecolor=black,
+      hyperindex=true,
+      linkcolor=black,
+      pageanchor=true,
+      pagebackref=true,
+      pagecolor=black,
+      pdfpagemode=UseOutlines,
+      urlcolor=black
+    }
+    \AtBeginDocument{
+      \hypersetup{
+        pdftitle={\@title},
+        pdfsubject={\@subtitle},
+        pdfauthor={\@author}
+      }
+    }
+}{}
+\endinput
+%%
+%% End of file `uantwerpenbamathesis.cls'.


Property changes on: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls	2019-03-28 20:58:25 UTC (rev 50626)
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2013-2018  by Walter Daems <walter.daems at uantwerpen.be>
+%% Copyright (C) 2013-2019  by Walter Daems <walter.daems at uantwerpen.be>
 %% 
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3 of this license
@@ -26,9 +26,9 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{uantwerpencoursetext}
-    [2018/10/23 v2.2 .dtx skeleton file]
-\def\fileversion{2.2}
-\def\filedate{2018/10/23}
+    [2019/03/27 v2.3 .dtx skeleton file]
+\def\fileversion{2.3}
+\def\filedate{2019/03/27}
 \newif\if at copyright
 \DeclareOption{copyright}{\@copyrighttrue}
 \newif\if at qr
@@ -46,6 +46,7 @@
 \addtolength{\parskip}{0.75\baselineskip}
 \setcounter{secnumdepth}{3}
 \RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry}
+\RequirePackage{xstring}
 \RequirePackage{etoolbox}
 \RequirePackage{ifthen}
 \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{}
@@ -72,53 +73,54 @@
 \definecolor{lightgray}{cmyk}      {0.00,0.00,0.00,0.05}
 \definecolor{darkgray}{cmyk}       {0.00,0.00,0.00,0.80}
 \definecolor{watermark}{cmyk}      {0.00,0.00,0.00,0.05}
-\newcommand{\uaname}{University of Antwerp}
-\newcommand{\logoname}{UA_HOR_ENG_CMYK}
-\newcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-\newcommand{\arrname}{All rights reserved}
-\newcommand{\orname}{of}
-\newcommand{\domainname}{uantwerp.be}
-\newcommand{\datename}{Date}
-\newcommand{\subjectname}{Subject}
-\newcommand{\academicyearname}{Academic year}
-\newcommand{\masterthesisname}{Master's thesis}
-\newcommand{\supervisorsname}{Supervisors}
-\newcommand{\juryname}{Jury}
-\newcommand{\jurymembersname}{Members}
-\newcommand{\jurychairmanname}{Chairman}
-\newcommand{\mthesisname}{Thesis to obtain the degree of}
-\newcommand{\pthesisnamei}{Thesis submitted in fulfilment of the
+\newcommand\uaname{University of Antwerp}
+\newcommand\logoname{UA_HOR_ENG_CMYK}
+\newcommand\footername{4E_PMS302_BR_ENG_RGB}
+\newcommand\arrname{All rights reserved}
+\newcommand\orname{of}
+\newcommand\domainname{uantwerp.be}
+\newcommand\datename{Date}
+\newcommand\subjectname{Subject}
+\newcommand\academicyearname{Academic year}
+\newcommand\masterthesisname{Master's thesis}
+\newcommand\bachelorthesisname{Bachelor's thesis}
+\newcommand\supervisorsname{Supervisors}
+\newcommand\juryname{Jury}
+\newcommand\jurymembersname{Members}
+\newcommand\jurychairmanname{Chairman}
+\newcommand\bmthesisname{Thesis to obtain the degree of}
+\newcommand\pthesisnamei{Thesis submitted in fulfilment of the
   requirements for the degree of}
-\newcommand{\pthesisnameii}{at University of Antwerp}
-\newcommand{\@faculty}{< Specify faculty using \textbackslash{}facultyacronym\{ABC\} >}
-\newcommand{\faccpg}{
+\newcommand\pthesisnameii{at University of Antwerp}
+\newcommand\@faculty{< Specify faculty using \textbackslash{}facultyacronym\{ABC\} >}
+\newcommand\faccpg{
   \renewcommand\@faculty{Centre Pieter Gillis}}
-\newcommand{\facfbd}{
+\newcommand\facfbd{
   \renewcommand\@faculty{
     Faculty of Pharmaceutical, Biomedical and Veterinary Sciences}}
-\newcommand{\facggw}{
+\newcommand\facggw{
   \renewcommand\@faculty{Faculty of Medicine and Health Sciences}}
-\newcommand{\insiob}{
+\newcommand\insiob{
   \renewcommand\@faculty{Insitute of Development Policy}}
-\newcommand{\insoiw}{
+\newcommand\insoiw{
   \renewcommand\@faculty{Institute of Educations and Information Sciences}}
-\newcommand{\asoe}{
+\newcommand\asoe{
   \renewcommand\@faculty{Antwerp School of Education}}
-\newcommand{\faclw}{
+\newcommand\faclw{
   \renewcommand\@faculty{Faculty of Arts}}
-\newcommand{\facow}{
+\newcommand\facow{
   \renewcommand\@faculty{Faculty of Design Sciences}}
-\newcommand{\facsw}{
+\newcommand\facsw{
   \renewcommand\@faculty{Faculty of Social Sciences}}
-\newcommand{\facrec}{
+\newcommand\facrec{
   \renewcommand\@faculty{Faculty of Law}}
-\newcommand{\factew}{
+\newcommand\factew{
   \renewcommand\@faculty{Faculty of Applied Economics}}
-\newcommand{\facti}{
+\newcommand\facti{
   \renewcommand\@faculty{Faculty of Applied Engineering}}
-\newcommand{\facwet}{
+\newcommand\facwet{
   \renewcommand\@faculty{Faculty of Science}}
-\newcommand{\weightname}{Weight}
+\newcommand\weightname{Weight}
 \AtBeginDocument{
   \@ifpackageloaded{babel}{
     \addto\captionsdutch{%
@@ -132,11 +134,12 @@
       \renewcommand\datename{Datum}%
       \renewcommand\academicyearname{Academiejaar}
       \renewcommand\masterthesisname{Masterproef}
+      \renewcommand\bachelorthesisname{Bachelorproef}
       \renewcommand\supervisorsname{Promotoren}
       \renewcommand\juryname{Jury}
       \renewcommand\jurymembersname{Leden}
       \renewcommand\jurychairmanname{Voorzitter}
-      \renewcommand\mthesisname{Proefschrift tot het behalen van de
+      \renewcommand\bmthesisname{Proefschrift tot het behalen van de
         graad van}
       \renewcommand\pthesisnamei{Proefschrift voorgelegd tot het
         behalen van de graad van}
@@ -154,192 +157,195 @@
       \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Gewicht}
+      \renewcommand\weightname{Gewicht}
     }
     \addto\captionsgerman{%
-      \renewcommand{\uaname}{Universit\"at Antwerpen}
-      \renewcommand{\logoname}{UA_HOR_DUI_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_NED_RGB}
-      \renewcommand{\arrname}{Alle Rechte vorbehalten}
-      \renewcommand{\orname}{von}
-      \renewcommand{\domainname}{uantwerpen.be}
-      \renewcommand{\subjectname}{Betreff}%
-      \renewcommand{\datename}{Datum}%
-      \renewcommand{\academicyearname}{Akademisches Jahr}
-      \renewcommand{\masterthesisname}{Masterdissertation}
-      \renewcommand{\supervisorsname}{Veranstalter}
-      \renewcommand{\juryname}{Jury}
-      \renewcommand{\jurymembersname}{Mitglieder}
-      \renewcommand{\jurychairmanname}{Vorsitzender}
-      \renewcommand{\mthesisname}{Dissertation zur Erreichung des
+      \renewcommand\uaname{Universit\"at Antwerpen}
+      \renewcommand\logoname{UA_HOR_DUI_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_NED_RGB}
+      \renewcommand\arrname{Alle Rechte vorbehalten}
+      \renewcommand\orname{von}
+      \renewcommand\domainname{uantwerpen.be}
+      \renewcommand\subjectname{Betreff}%
+      \renewcommand\datename{Datum}%
+      \renewcommand\academicyearname{Akademisches Jahr}
+      \renewcommand\masterthesisname{Masterdissertation}
+      \renewcommand\bachelorthesisname{Bachelordissertation}
+      \renewcommand\supervisorsname{Veranstalter}
+      \renewcommand\juryname{Jury}
+      \renewcommand\jurymembersname{Mitglieder}
+      \renewcommand\jurychairmanname{Vorsitzender}
+      \renewcommand\bmthesisname{Dissertation zur Erreichung des
         Grades der}
-      \renewcommand{\pthesisnamei}{Dissertation zur Erreiching des
+      \renewcommand\pthesisnamei{Dissertation zur Erreiching des
         Grades der}
-      \renewcommand{\pthesisnameii}{an die \uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{an die \uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}}
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Gewicht}
+      \renewcommand\weightname{Gewicht}
     }
     \addto\captionsfrench{%
-      \renewcommand{\uaname}{Universit\'e d'Anvers}
-      \renewcommand{\logoname}{UA_HOR_FRA_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-      \renewcommand{\arrname}{Tous les droits sont r\'eserv\'es}
-      \renewcommand{\orname}{de}
-      \renewcommand{\domainname}{uanvers.be}
-      \renewcommand{\subjectname}{Objet}%
-      \renewcommand{\datename}{Date}%
-      \renewcommand{\academicyearname}{Ann\'ee acad\'emique}
-      \renewcommand{\masterthesisname}{Th\`ese de master}
-      \renewcommand{\supervisorsname}{Promoteurs}
-      \renewcommand{\juryname}{Jury}
-      \renewcommand{\jurymembersname}{Membres}
-      \renewcommand{\jurychairmanname}{Pr\'esident}
-      \renewcommand{\mthesisname}{Th\`ese \`a l'atteinte du degr\'e de}
-      \renewcommand{\pthesisnamei}{Th\`ese Doctorale \`a l'atteinte du
+      \renewcommand\uaname{Universit\'e d'Anvers}
+      \renewcommand\logoname{UA_HOR_FRA_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_ENG_RGB}
+      \renewcommand\arrname{Tous les droits sont r\'eserv\'es}
+      \renewcommand\orname{de}
+      \renewcommand\domainname{uanvers.be}
+      \renewcommand\subjectname{Objet}%
+      \renewcommand\datename{Date}%
+      \renewcommand\academicyearname{Ann\'ee acad\'emique}
+      \renewcommand\masterthesisname{Th\`ese de master}
+      \renewcommand\bachelorthesisname{Th\`ese de baccalaur\'eat}
+      \renewcommand\supervisorsname{Promoteurs}
+      \renewcommand\juryname{Jury}
+      \renewcommand\jurymembersname{Membres}
+      \renewcommand\jurychairmanname{Pr\'esident}
+      \renewcommand\bmthesisname{Th\`ese \`a l'atteinte du degr\'e de}
+      \renewcommand\pthesisnamei{Th\`ese Doctorale \`a l'atteinte du
         degr\'e de}
-      \renewcommand{\pthesisnameii}{\`a l'\uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{\`a l'\uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}}
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Poids}
+      \renewcommand\weightname{Poids}
     }
     \addto\captionsspanish{%
-      \renewcommand{\uaname}{Universidad de Amberes}
-      \renewcommand{\logoname}{UA_HOR_SPA_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-      \renewcommand{\arrname}{Todos los derechos reservados}
-      \renewcommand{\orname}{de}
-      \renewcommand{\domainname}{uantwerp.be}
-      \renewcommand{\subjectname}{Asunto}%
-      \renewcommand{\datename}{Fecha}%
-      \renewcommand{\academicyearname}{A\~no acad\'emico}
-      \renewcommand{\masterthesisname}{Tesis de maestr\'\i{}a}
-      \renewcommand{\supervisorsname}{Promotores}
-      \renewcommand{\juryname}{Jurado}
-      \renewcommand{\jurymembersname}{Miembros}
-      \renewcommand{\jurychairmanname}{Presidente}
-      \renewcommand{\mthesisname}{Disertaci\'on a la consecuci\'on del
+      \renewcommand\uaname{Universidad de Amberes}
+      \renewcommand\logoname{UA_HOR_SPA_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_ENG_RGB}
+      \renewcommand\arrname{Todos los derechos reservados}
+      \renewcommand\orname{de}
+      \renewcommand\domainname{uantwerp.be}
+      \renewcommand\subjectname{Asunto}%
+      \renewcommand\datename{Fecha}%
+      \renewcommand\academicyearname{A\~no acad\'emico}
+      \renewcommand\masterthesisname{Tesis de maestr\'\i{}a}
+      \renewcommand\bachelorthesisname{Tesis de bachiller}
+      \renewcommand\supervisorsname{Promotores}
+      \renewcommand\juryname{Jurado}
+      \renewcommand\jurymembersname{Miembros}
+      \renewcommand\jurychairmanname{Presidente}
+      \renewcommand\bmthesisname{Disertaci\'on a la consecuci\'on del
         grado de}
-      \renewcommand{\pthesisnamei}{Disertaici\'on a la consecuci\'on del
+      \renewcommand\pthesisnamei{Disertaici\'on a la consecuci\'on del
         grado de}
-      \renewcommand{\pthesisnameii}{a l'\uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{a l'\uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}}
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Peso}
+      \renewcommand\weightname{Peso}
     }
   }
   {}

Modified: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls	2019-03-28 20:58:25 UTC (rev 50626)
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2013-2018  by Walter Daems <walter.daems at uantwerpen.be>
+%% Copyright (C) 2013-2019  by Walter Daems <walter.daems at uantwerpen.be>
 %% 
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3 of this license
@@ -26,9 +26,9 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{uantwerpenexam}
-    [2018/10/23 v2.2 .dtx skeleton file]
-\def\fileversion{2.2}
-\def\filedate{2018/10/23}
+    [2019/03/27 v2.3 .dtx skeleton file]
+\def\fileversion{2.3}
+\def\filedate{2019/03/27}
 \newif\if at examiner
 \DeclareOption{examiner}{\@examinertrue}
 \ExecuteOptions{a4paper,twoside,10pt}
@@ -38,6 +38,7 @@
 \addtolength{\parskip}{0.75\baselineskip}
 \setcounter{secnumdepth}{3}
 \RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry}
+\RequirePackage{xstring}
 \RequirePackage{etoolbox}
 \RequirePackage{ifthen}
 \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{}
@@ -57,53 +58,54 @@
 \definecolor{lightgray}{cmyk}      {0.00,0.00,0.00,0.05}
 \definecolor{darkgray}{cmyk}       {0.00,0.00,0.00,0.80}
 \definecolor{watermark}{cmyk}      {0.00,0.00,0.00,0.05}
-\newcommand{\uaname}{University of Antwerp}
-\newcommand{\logoname}{UA_HOR_ENG_CMYK}
-\newcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-\newcommand{\arrname}{All rights reserved}
-\newcommand{\orname}{of}
-\newcommand{\domainname}{uantwerp.be}
-\newcommand{\datename}{Date}
-\newcommand{\subjectname}{Subject}
-\newcommand{\academicyearname}{Academic year}
-\newcommand{\masterthesisname}{Master's thesis}
-\newcommand{\supervisorsname}{Supervisors}
-\newcommand{\juryname}{Jury}
-\newcommand{\jurymembersname}{Members}
-\newcommand{\jurychairmanname}{Chairman}
-\newcommand{\mthesisname}{Thesis to obtain the degree of}
-\newcommand{\pthesisnamei}{Thesis submitted in fulfilment of the
+\newcommand\uaname{University of Antwerp}
+\newcommand\logoname{UA_HOR_ENG_CMYK}
+\newcommand\footername{4E_PMS302_BR_ENG_RGB}
+\newcommand\arrname{All rights reserved}
+\newcommand\orname{of}
+\newcommand\domainname{uantwerp.be}
+\newcommand\datename{Date}
+\newcommand\subjectname{Subject}
+\newcommand\academicyearname{Academic year}
+\newcommand\masterthesisname{Master's thesis}
+\newcommand\bachelorthesisname{Bachelor's thesis}
+\newcommand\supervisorsname{Supervisors}
+\newcommand\juryname{Jury}
+\newcommand\jurymembersname{Members}
+\newcommand\jurychairmanname{Chairman}
+\newcommand\bmthesisname{Thesis to obtain the degree of}
+\newcommand\pthesisnamei{Thesis submitted in fulfilment of the
   requirements for the degree of}
-\newcommand{\pthesisnameii}{at University of Antwerp}
-\newcommand{\@faculty}{< Specify faculty using \textbackslash{}facultyacronym\{ABC\} >}
-\newcommand{\faccpg}{
+\newcommand\pthesisnameii{at University of Antwerp}
+\newcommand\@faculty{< Specify faculty using \textbackslash{}facultyacronym\{ABC\} >}
+\newcommand\faccpg{
   \renewcommand\@faculty{Centre Pieter Gillis}}
-\newcommand{\facfbd}{
+\newcommand\facfbd{
   \renewcommand\@faculty{
     Faculty of Pharmaceutical, Biomedical and Veterinary Sciences}}
-\newcommand{\facggw}{
+\newcommand\facggw{
   \renewcommand\@faculty{Faculty of Medicine and Health Sciences}}
-\newcommand{\insiob}{
+\newcommand\insiob{
   \renewcommand\@faculty{Insitute of Development Policy}}
-\newcommand{\insoiw}{
+\newcommand\insoiw{
   \renewcommand\@faculty{Institute of Educations and Information Sciences}}
-\newcommand{\asoe}{
+\newcommand\asoe{
   \renewcommand\@faculty{Antwerp School of Education}}
-\newcommand{\faclw}{
+\newcommand\faclw{
   \renewcommand\@faculty{Faculty of Arts}}
-\newcommand{\facow}{
+\newcommand\facow{
   \renewcommand\@faculty{Faculty of Design Sciences}}
-\newcommand{\facsw}{
+\newcommand\facsw{
   \renewcommand\@faculty{Faculty of Social Sciences}}
-\newcommand{\facrec}{
+\newcommand\facrec{
   \renewcommand\@faculty{Faculty of Law}}
-\newcommand{\factew}{
+\newcommand\factew{
   \renewcommand\@faculty{Faculty of Applied Economics}}
-\newcommand{\facti}{
+\newcommand\facti{
   \renewcommand\@faculty{Faculty of Applied Engineering}}
-\newcommand{\facwet}{
+\newcommand\facwet{
   \renewcommand\@faculty{Faculty of Science}}
-\newcommand{\weightname}{Weight}
+\newcommand\weightname{Weight}
 \AtBeginDocument{
   \@ifpackageloaded{babel}{
     \addto\captionsdutch{%
@@ -117,11 +119,12 @@
       \renewcommand\datename{Datum}%
       \renewcommand\academicyearname{Academiejaar}
       \renewcommand\masterthesisname{Masterproef}
+      \renewcommand\bachelorthesisname{Bachelorproef}
       \renewcommand\supervisorsname{Promotoren}
       \renewcommand\juryname{Jury}
       \renewcommand\jurymembersname{Leden}
       \renewcommand\jurychairmanname{Voorzitter}
-      \renewcommand\mthesisname{Proefschrift tot het behalen van de
+      \renewcommand\bmthesisname{Proefschrift tot het behalen van de
         graad van}
       \renewcommand\pthesisnamei{Proefschrift voorgelegd tot het
         behalen van de graad van}
@@ -139,192 +142,195 @@
       \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Gewicht}
+      \renewcommand\weightname{Gewicht}
     }
     \addto\captionsgerman{%
-      \renewcommand{\uaname}{Universit\"at Antwerpen}
-      \renewcommand{\logoname}{UA_HOR_DUI_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_NED_RGB}
-      \renewcommand{\arrname}{Alle Rechte vorbehalten}
-      \renewcommand{\orname}{von}
-      \renewcommand{\domainname}{uantwerpen.be}
-      \renewcommand{\subjectname}{Betreff}%
-      \renewcommand{\datename}{Datum}%
-      \renewcommand{\academicyearname}{Akademisches Jahr}
-      \renewcommand{\masterthesisname}{Masterdissertation}
-      \renewcommand{\supervisorsname}{Veranstalter}
-      \renewcommand{\juryname}{Jury}
-      \renewcommand{\jurymembersname}{Mitglieder}
-      \renewcommand{\jurychairmanname}{Vorsitzender}
-      \renewcommand{\mthesisname}{Dissertation zur Erreichung des
+      \renewcommand\uaname{Universit\"at Antwerpen}
+      \renewcommand\logoname{UA_HOR_DUI_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_NED_RGB}
+      \renewcommand\arrname{Alle Rechte vorbehalten}
+      \renewcommand\orname{von}
+      \renewcommand\domainname{uantwerpen.be}
+      \renewcommand\subjectname{Betreff}%
+      \renewcommand\datename{Datum}%
+      \renewcommand\academicyearname{Akademisches Jahr}
+      \renewcommand\masterthesisname{Masterdissertation}
+      \renewcommand\bachelorthesisname{Bachelordissertation}
+      \renewcommand\supervisorsname{Veranstalter}
+      \renewcommand\juryname{Jury}
+      \renewcommand\jurymembersname{Mitglieder}
+      \renewcommand\jurychairmanname{Vorsitzender}
+      \renewcommand\bmthesisname{Dissertation zur Erreichung des
         Grades der}
-      \renewcommand{\pthesisnamei}{Dissertation zur Erreiching des
+      \renewcommand\pthesisnamei{Dissertation zur Erreiching des
         Grades der}
-      \renewcommand{\pthesisnameii}{an die \uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{an die \uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}}
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Gewicht}
+      \renewcommand\weightname{Gewicht}
     }
     \addto\captionsfrench{%
-      \renewcommand{\uaname}{Universit\'e d'Anvers}
-      \renewcommand{\logoname}{UA_HOR_FRA_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-      \renewcommand{\arrname}{Tous les droits sont r\'eserv\'es}
-      \renewcommand{\orname}{de}
-      \renewcommand{\domainname}{uanvers.be}
-      \renewcommand{\subjectname}{Objet}%
-      \renewcommand{\datename}{Date}%
-      \renewcommand{\academicyearname}{Ann\'ee acad\'emique}
-      \renewcommand{\masterthesisname}{Th\`ese de master}
-      \renewcommand{\supervisorsname}{Promoteurs}
-      \renewcommand{\juryname}{Jury}
-      \renewcommand{\jurymembersname}{Membres}
-      \renewcommand{\jurychairmanname}{Pr\'esident}
-      \renewcommand{\mthesisname}{Th\`ese \`a l'atteinte du degr\'e de}
-      \renewcommand{\pthesisnamei}{Th\`ese Doctorale \`a l'atteinte du
+      \renewcommand\uaname{Universit\'e d'Anvers}
+      \renewcommand\logoname{UA_HOR_FRA_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_ENG_RGB}
+      \renewcommand\arrname{Tous les droits sont r\'eserv\'es}
+      \renewcommand\orname{de}
+      \renewcommand\domainname{uanvers.be}
+      \renewcommand\subjectname{Objet}%
+      \renewcommand\datename{Date}%
+      \renewcommand\academicyearname{Ann\'ee acad\'emique}
+      \renewcommand\masterthesisname{Th\`ese de master}
+      \renewcommand\bachelorthesisname{Th\`ese de baccalaur\'eat}
+      \renewcommand\supervisorsname{Promoteurs}
+      \renewcommand\juryname{Jury}
+      \renewcommand\jurymembersname{Membres}
+      \renewcommand\jurychairmanname{Pr\'esident}
+      \renewcommand\bmthesisname{Th\`ese \`a l'atteinte du degr\'e de}
+      \renewcommand\pthesisnamei{Th\`ese Doctorale \`a l'atteinte du
         degr\'e de}
-      \renewcommand{\pthesisnameii}{\`a l'\uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{\`a l'\uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}}
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Poids}
+      \renewcommand\weightname{Poids}
     }
     \addto\captionsspanish{%
-      \renewcommand{\uaname}{Universidad de Amberes}
-      \renewcommand{\logoname}{UA_HOR_SPA_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-      \renewcommand{\arrname}{Todos los derechos reservados}
-      \renewcommand{\orname}{de}
-      \renewcommand{\domainname}{uantwerp.be}
-      \renewcommand{\subjectname}{Asunto}%
-      \renewcommand{\datename}{Fecha}%
-      \renewcommand{\academicyearname}{A\~no acad\'emico}
-      \renewcommand{\masterthesisname}{Tesis de maestr\'\i{}a}
-      \renewcommand{\supervisorsname}{Promotores}
-      \renewcommand{\juryname}{Jurado}
-      \renewcommand{\jurymembersname}{Miembros}
-      \renewcommand{\jurychairmanname}{Presidente}
-      \renewcommand{\mthesisname}{Disertaci\'on a la consecuci\'on del
+      \renewcommand\uaname{Universidad de Amberes}
+      \renewcommand\logoname{UA_HOR_SPA_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_ENG_RGB}
+      \renewcommand\arrname{Todos los derechos reservados}
+      \renewcommand\orname{de}
+      \renewcommand\domainname{uantwerp.be}
+      \renewcommand\subjectname{Asunto}%
+      \renewcommand\datename{Fecha}%
+      \renewcommand\academicyearname{A\~no acad\'emico}
+      \renewcommand\masterthesisname{Tesis de maestr\'\i{}a}
+      \renewcommand\bachelorthesisname{Tesis de bachiller}
+      \renewcommand\supervisorsname{Promotores}
+      \renewcommand\juryname{Jurado}
+      \renewcommand\jurymembersname{Miembros}
+      \renewcommand\jurychairmanname{Presidente}
+      \renewcommand\bmthesisname{Disertaci\'on a la consecuci\'on del
         grado de}
-      \renewcommand{\pthesisnamei}{Disertaici\'on a la consecuci\'on del
+      \renewcommand\pthesisnamei{Disertaici\'on a la consecuci\'on del
         grado de}
-      \renewcommand{\pthesisnameii}{a l'\uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{a l'\uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}}
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Peso}
+      \renewcommand\weightname{Peso}
     }
   }
   {}
@@ -427,7 +433,23 @@
 \newcommand{\@rooms}{TBD}
 \newcommand{\rooms}[1]{\renewcommand{\@rooms}{#1}}
 \newcommand{\@extrainfo}{}
-\newcommand{\extrainfo}[1]{\renewcommand{\@extrainfo}{#1}}
+\newcommand\extrainfo[2][separatepage]{
+  \ifthenelse{\equal{#1}{separatepage}}{
+    % then
+    \renewcommand{\@extrainfo}{\clearpage #2 \clearpage}
+  }
+  {
+    % else
+    \ifthenelse{\equal{#1}{firstpage}}
+    {
+      \renewcommand{\@extrainfo}{#2}
+    }
+    {
+      \errmessage{Error: '\extrainfo' - first (optional) argument can
+        only be 'separatepage' or 'firstpage'}
+    }
+  }
+}
 \newcommand{\@studentnr}{0}
 \newcommand{\studentnr}[1]{\renewcommand{\@studentnr}{#1}}
 \lhead[]{}
@@ -457,23 +479,32 @@
             \clip (0,0) rectangle (21,29.7);
             \draw
             ( 3,9.7) -- ( 3,23.7)
-            ( 0,23.7) -- (21,23.7)
-            ( 3,19.7) -- (21,19.7)
-            ( 3,17.7) -- (21,17.7)
-            ( 3,15.7) -- (21,15.7)
-            (14,11.7) -- (14,15.7)
-            ( 3,13.7) -- (21,13.7)
-            ( 3,11.7) -- (21,11.7)
-            ( 0,9.7) -- (21,9.7);
+            ( 0,23.7) -- +(21,0)
+            ( 3,20.8) -- +(21,0)
+            ( 3,18.8) -- +(21,0)
+            ( 3,16.8) -- +(21,0)
+            (14,9.7) -- (14,13.7)
+            ( 3,13.7) -- +(21,0)
+            ( 3,11.7) -- +(21,0)
+            ( 0,9.7) -- +(21,0);
 
             \draw[ultra thick]
-            ( 3,15.7) +(0,-0.5) -- +(0,0) -- +(0.5,0)
+            ( 3,16.8) +(0,-0.5) -- +(0,0) -- +(0.5,0)
             ( 3,13.7) +(0,+0.5) -- +(0,0) -- +(0.5,0)
-            (14,15.7) +(-0.5,0) -- +(0,0) +(0,-0.5) -- +(0,0) --  +(0.5,0)
-            (14,13.7) +(-0.5,0) -- +(0,0) +(0,+0.5) -- +(0,0) --  +(0.5,0)
-            (21,15.7) +(0,-0.5) -- +(0,0) -- +(-0.5,0)
+            (21,16.8) +(0,-0.5) -- +(0,0) -- +(-0.5,0)
             (21,13.7) +(0,+0.5) -- +(0,0) -- +(-0.5,0);
 
+            \foreach \nn in {0,1,...,7} {
+              \draw (16.5,13.9) ++({0.5*\nn},0) rectangle +(0.5,0.8);
+            }
+
+            \foreach \nn in {0,1,...,33} {
+              \draw (3.5,15.3) ++({0.5*\nn},0) rectangle +(0.5,0.8);
+            }
+            \foreach \nn in {0,1,...,23} {
+              \draw (3.5,13.9) ++({0.5*\nn},0) rectangle +(0.5,0.8);
+            }
+
             \path
             (3,25.2) node[anchor=north west] {
               \parbox{14cm}{
@@ -484,25 +515,22 @@
                 \ifx\@programmeq\@emptymacro\else--- \@programmeq\fi
               }
             }
-            (3.3,23.0) node[anchor=north west] {
-              \parbox{14cm}{
-                \fontfamily{phv}\fontsize{12}{15}\selectfont
-              }
-            }
-            (3.3,21.9) node[anchor=north west] {
+            (3.3,23) node[anchor=north west] {
               \parbox{16cm}{
                 \fontfamily{phv}\fontsize{18}{22}\fontseries{b}\fontshape{n}\selectfont
-                \raggedright \@coursei{} --- \@exampart
+                \raggedright \@coursei{}
+                \ifx\@exampart\@emptymacro
+                \else --- \@exampart\fi
                 \fontfamily{phv}\fontsize{12}{18}\fontseries{m}\fontshape{n}\selectfont\\
-                Groep \@examgroupnumber{} \hfill \@examdate{} }
+                Reeks \@examgroupnumber{} \hfill \@examdate{} }
             }
-            (3.3,19) node[anchor=north west] {
+            (3.3,20.1) node[anchor=north west] {
               \parbox{14cm}{
                 \fontfamily{phv}\fontsize{12}{15}\fontseries{m}\selectfont
                 \@coursecodei
               }
             }
-            (3.3,17.5) node[anchor=north west] {
+            (3.3,18.6) node[anchor=north west] {
               \parbox{14cm}{
                 \fontfamily{phv}\fontsize{12}{18}\fontseries{m}\fontshape{n}\selectfont
                 \raggedright \ifdef{\dateenglish}{Professor(s) --- }{}Titularis(sen):\\
@@ -510,25 +538,33 @@
                 \raggedright \@author{}
               }
             }
-            (3.3,15.5) node[anchor=north west] {
+            (3.3,16.7) node[anchor=north west] {
               \parbox{10cm}{
                 \fontfamily{phv}\fontsize{12}{15}\fontseries{m}\fontshape{n}\selectfont
-                \raggedright \ifdef{\dateenglish}{Last name/First name
+                \raggedright \ifdef{\dateenglish}{Last name
                   --- }{}
-                Naam/Voornaam:}
+                Naam:}
             }
-            (14.3,15.5) node[anchor=north west] {
+            (3.3,15.25) node[anchor=north west] {
+              \parbox{10cm}{
+                \fontfamily{phv}\fontsize{12}{15}\fontseries{m}\fontshape{n}\selectfont
+                \raggedright \ifdef{\dateenglish}{First name
+                  --- }{}
+                Voornaam:}
+            }
+            (16.3,15.25) node[anchor=north west] {
               \parbox{5cm}{
                 \fontfamily{phv}\fontsize{12}{15}\fontseries{m}\fontshape{n}\selectfont
-                \raggedright \ifdef{\dateenglish}{Registration No. --- }{}Rolnr.:}
+                \raggedright \ifdef{\dateenglish}{Docket No. --- }{}Rolnr.:}
             }
-            (3.3,13.5) node[anchor=north west] {
+
+            (3.3,11.5) node[anchor=north west] {
               \parbox{14cm}{
                 \fontfamily{phv}\fontsize{12}{21}\fontseries{m}\fontshape{n}\selectfont
                 \raggedright \ifdef{\dateenglish}{Exam duration --- }{}Duur van het examen: \@examlength\\
               }
             }
-            (14.3,13.5) node[anchor=north west] {
+            (14.3,11.5) node[anchor=north west] {
               \parbox{5cm}{
                 \fontfamily{phv}\fontsize{12}{15}\fontseries{m}\fontshape{n}\selectfont
                 \raggedright \ifdef{\dateenglish}{Start --- }{}Begin: \@tstart \\[1ex]
@@ -535,7 +571,7 @@
                 \raggedright \ifdef{\dateenglish}{End --- }{}Einde~: \@tend
               }
             }
-            (3.3,11.5) node[anchor=north west] {
+            (3.3,13.5) node[anchor=north west] {
               \parbox{14cm}{
                 \fontfamily{phv}\fontsize{12}{21}\fontseries{m}\fontshape{n}\selectfont
                 \raggedright \ifdef{\dateenglish}{Room --- }{}Lokaal: \@rooms
@@ -542,13 +578,6 @@
 
               }
             }
-            (2,9.5) node[anchor=north west] {
-              \parbox{19cm}{
-                \fontfamily{phv}\fontsize{10}{13}\fontseries{m}\fontshape{n}\selectfont
-                \ifdef{\dateenglish}{\raggedright Extra information: read the back of this page\\}{}
-                \raggedright Extra informatie: zie achterkant
-              }
-            }
             (3,27.7) node[anchor=north west] {
               \includegraphics[width=7cm]{\@logo}
             };
@@ -557,12 +586,10 @@
       \end{tikzpicture}
     }
   }
-  \vspace*{15cm}
-  \clearpage
+  \vspace*{17cm}
   \ifx\@qrtitle\@emptymacro
   \else
   \@extrainfo
-  \clearpage
   \fi
 }
 \newcounter{question}

Modified: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls	2019-03-28 20:58:25 UTC (rev 50626)
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2013-2018  by Walter Daems <walter.daems at uantwerpen.be>
+%% Copyright (C) 2013-2019  by Walter Daems <walter.daems at uantwerpen.be>
 %% 
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3 of this license
@@ -26,9 +26,9 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{uantwerpenletter}
-    [2018/10/23 v2.2 .dtx skeleton file]
-\def\fileversion{2.2}
-\def\filedate{2018/10/23}
+    [2019/03/27 v2.3 .dtx skeleton file]
+\def\fileversion{2.3}
+\def\filedate{2019/03/27}
 \newif\if at filled
 \DeclareOption{filled}{\@filledtrue}
 \ExecuteOptions{a4paper,10pt,final,oneside,openright}
@@ -41,6 +41,7 @@
 \RequirePackage[top=1in, bottom=1in, left=1.34in, right=1in]{geometry}
 \RequirePackage[normalem]{ulem}
 \RequirePackage{atbegshi}
+\RequirePackage{xstring}
 \RequirePackage{etoolbox}
 \RequirePackage{ifthen}
 \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{}
@@ -60,53 +61,54 @@
 \definecolor{lightgray}{cmyk}      {0.00,0.00,0.00,0.05}
 \definecolor{darkgray}{cmyk}       {0.00,0.00,0.00,0.80}
 \definecolor{watermark}{cmyk}      {0.00,0.00,0.00,0.05}
-\newcommand{\uaname}{University of Antwerp}
-\newcommand{\logoname}{UA_HOR_ENG_CMYK}
-\newcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-\newcommand{\arrname}{All rights reserved}
-\newcommand{\orname}{of}
-\newcommand{\domainname}{uantwerp.be}
-\newcommand{\datename}{Date}
-\newcommand{\subjectname}{Subject}
-\newcommand{\academicyearname}{Academic year}
-\newcommand{\masterthesisname}{Master's thesis}
-\newcommand{\supervisorsname}{Supervisors}
-\newcommand{\juryname}{Jury}
-\newcommand{\jurymembersname}{Members}
-\newcommand{\jurychairmanname}{Chairman}
-\newcommand{\mthesisname}{Thesis to obtain the degree of}
-\newcommand{\pthesisnamei}{Thesis submitted in fulfilment of the
+\newcommand\uaname{University of Antwerp}
+\newcommand\logoname{UA_HOR_ENG_CMYK}
+\newcommand\footername{4E_PMS302_BR_ENG_RGB}
+\newcommand\arrname{All rights reserved}
+\newcommand\orname{of}
+\newcommand\domainname{uantwerp.be}
+\newcommand\datename{Date}
+\newcommand\subjectname{Subject}
+\newcommand\academicyearname{Academic year}
+\newcommand\masterthesisname{Master's thesis}
+\newcommand\bachelorthesisname{Bachelor's thesis}
+\newcommand\supervisorsname{Supervisors}
+\newcommand\juryname{Jury}
+\newcommand\jurymembersname{Members}
+\newcommand\jurychairmanname{Chairman}
+\newcommand\bmthesisname{Thesis to obtain the degree of}
+\newcommand\pthesisnamei{Thesis submitted in fulfilment of the
   requirements for the degree of}
-\newcommand{\pthesisnameii}{at University of Antwerp}
-\newcommand{\@faculty}{< Specify faculty using \textbackslash{}facultyacronym\{ABC\} >}
-\newcommand{\faccpg}{
+\newcommand\pthesisnameii{at University of Antwerp}
+\newcommand\@faculty{< Specify faculty using \textbackslash{}facultyacronym\{ABC\} >}
+\newcommand\faccpg{
   \renewcommand\@faculty{Centre Pieter Gillis}}
-\newcommand{\facfbd}{
+\newcommand\facfbd{
   \renewcommand\@faculty{
     Faculty of Pharmaceutical, Biomedical and Veterinary Sciences}}
-\newcommand{\facggw}{
+\newcommand\facggw{
   \renewcommand\@faculty{Faculty of Medicine and Health Sciences}}
-\newcommand{\insiob}{
+\newcommand\insiob{
   \renewcommand\@faculty{Insitute of Development Policy}}
-\newcommand{\insoiw}{
+\newcommand\insoiw{
   \renewcommand\@faculty{Institute of Educations and Information Sciences}}
-\newcommand{\asoe}{
+\newcommand\asoe{
   \renewcommand\@faculty{Antwerp School of Education}}
-\newcommand{\faclw}{
+\newcommand\faclw{
   \renewcommand\@faculty{Faculty of Arts}}
-\newcommand{\facow}{
+\newcommand\facow{
   \renewcommand\@faculty{Faculty of Design Sciences}}
-\newcommand{\facsw}{
+\newcommand\facsw{
   \renewcommand\@faculty{Faculty of Social Sciences}}
-\newcommand{\facrec}{
+\newcommand\facrec{
   \renewcommand\@faculty{Faculty of Law}}
-\newcommand{\factew}{
+\newcommand\factew{
   \renewcommand\@faculty{Faculty of Applied Economics}}
-\newcommand{\facti}{
+\newcommand\facti{
   \renewcommand\@faculty{Faculty of Applied Engineering}}
-\newcommand{\facwet}{
+\newcommand\facwet{
   \renewcommand\@faculty{Faculty of Science}}
-\newcommand{\weightname}{Weight}
+\newcommand\weightname{Weight}
 \AtBeginDocument{
   \@ifpackageloaded{babel}{
     \addto\captionsdutch{%
@@ -120,11 +122,12 @@
       \renewcommand\datename{Datum}%
       \renewcommand\academicyearname{Academiejaar}
       \renewcommand\masterthesisname{Masterproef}
+      \renewcommand\bachelorthesisname{Bachelorproef}
       \renewcommand\supervisorsname{Promotoren}
       \renewcommand\juryname{Jury}
       \renewcommand\jurymembersname{Leden}
       \renewcommand\jurychairmanname{Voorzitter}
-      \renewcommand\mthesisname{Proefschrift tot het behalen van de
+      \renewcommand\bmthesisname{Proefschrift tot het behalen van de
         graad van}
       \renewcommand\pthesisnamei{Proefschrift voorgelegd tot het
         behalen van de graad van}
@@ -142,192 +145,195 @@
       \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Gewicht}
+      \renewcommand\weightname{Gewicht}
     }
     \addto\captionsgerman{%
-      \renewcommand{\uaname}{Universit\"at Antwerpen}
-      \renewcommand{\logoname}{UA_HOR_DUI_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_NED_RGB}
-      \renewcommand{\arrname}{Alle Rechte vorbehalten}
-      \renewcommand{\orname}{von}
-      \renewcommand{\domainname}{uantwerpen.be}
-      \renewcommand{\subjectname}{Betreff}%
-      \renewcommand{\datename}{Datum}%
-      \renewcommand{\academicyearname}{Akademisches Jahr}
-      \renewcommand{\masterthesisname}{Masterdissertation}
-      \renewcommand{\supervisorsname}{Veranstalter}
-      \renewcommand{\juryname}{Jury}
-      \renewcommand{\jurymembersname}{Mitglieder}
-      \renewcommand{\jurychairmanname}{Vorsitzender}
-      \renewcommand{\mthesisname}{Dissertation zur Erreichung des
+      \renewcommand\uaname{Universit\"at Antwerpen}
+      \renewcommand\logoname{UA_HOR_DUI_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_NED_RGB}
+      \renewcommand\arrname{Alle Rechte vorbehalten}
+      \renewcommand\orname{von}
+      \renewcommand\domainname{uantwerpen.be}
+      \renewcommand\subjectname{Betreff}%
+      \renewcommand\datename{Datum}%
+      \renewcommand\academicyearname{Akademisches Jahr}
+      \renewcommand\masterthesisname{Masterdissertation}
+      \renewcommand\bachelorthesisname{Bachelordissertation}
+      \renewcommand\supervisorsname{Veranstalter}
+      \renewcommand\juryname{Jury}
+      \renewcommand\jurymembersname{Mitglieder}
+      \renewcommand\jurychairmanname{Vorsitzender}
+      \renewcommand\bmthesisname{Dissertation zur Erreichung des
         Grades der}
-      \renewcommand{\pthesisnamei}{Dissertation zur Erreiching des
+      \renewcommand\pthesisnamei{Dissertation zur Erreiching des
         Grades der}
-      \renewcommand{\pthesisnameii}{an die \uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{an die \uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}}
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Gewicht}
+      \renewcommand\weightname{Gewicht}
     }
     \addto\captionsfrench{%
-      \renewcommand{\uaname}{Universit\'e d'Anvers}
-      \renewcommand{\logoname}{UA_HOR_FRA_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-      \renewcommand{\arrname}{Tous les droits sont r\'eserv\'es}
-      \renewcommand{\orname}{de}
-      \renewcommand{\domainname}{uanvers.be}
-      \renewcommand{\subjectname}{Objet}%
-      \renewcommand{\datename}{Date}%
-      \renewcommand{\academicyearname}{Ann\'ee acad\'emique}
-      \renewcommand{\masterthesisname}{Th\`ese de master}
-      \renewcommand{\supervisorsname}{Promoteurs}
-      \renewcommand{\juryname}{Jury}
-      \renewcommand{\jurymembersname}{Membres}
-      \renewcommand{\jurychairmanname}{Pr\'esident}
-      \renewcommand{\mthesisname}{Th\`ese \`a l'atteinte du degr\'e de}
-      \renewcommand{\pthesisnamei}{Th\`ese Doctorale \`a l'atteinte du
+      \renewcommand\uaname{Universit\'e d'Anvers}
+      \renewcommand\logoname{UA_HOR_FRA_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_ENG_RGB}
+      \renewcommand\arrname{Tous les droits sont r\'eserv\'es}
+      \renewcommand\orname{de}
+      \renewcommand\domainname{uanvers.be}
+      \renewcommand\subjectname{Objet}%
+      \renewcommand\datename{Date}%
+      \renewcommand\academicyearname{Ann\'ee acad\'emique}
+      \renewcommand\masterthesisname{Th\`ese de master}
+      \renewcommand\bachelorthesisname{Th\`ese de baccalaur\'eat}
+      \renewcommand\supervisorsname{Promoteurs}
+      \renewcommand\juryname{Jury}
+      \renewcommand\jurymembersname{Membres}
+      \renewcommand\jurychairmanname{Pr\'esident}
+      \renewcommand\bmthesisname{Th\`ese \`a l'atteinte du degr\'e de}
+      \renewcommand\pthesisnamei{Th\`ese Doctorale \`a l'atteinte du
         degr\'e de}
-      \renewcommand{\pthesisnameii}{\`a l'\uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{\`a l'\uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}}
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Poids}
+      \renewcommand\weightname{Poids}
     }
     \addto\captionsspanish{%
-      \renewcommand{\uaname}{Universidad de Amberes}
-      \renewcommand{\logoname}{UA_HOR_SPA_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-      \renewcommand{\arrname}{Todos los derechos reservados}
-      \renewcommand{\orname}{de}
-      \renewcommand{\domainname}{uantwerp.be}
-      \renewcommand{\subjectname}{Asunto}%
-      \renewcommand{\datename}{Fecha}%
-      \renewcommand{\academicyearname}{A\~no acad\'emico}
-      \renewcommand{\masterthesisname}{Tesis de maestr\'\i{}a}
-      \renewcommand{\supervisorsname}{Promotores}
-      \renewcommand{\juryname}{Jurado}
-      \renewcommand{\jurymembersname}{Miembros}
-      \renewcommand{\jurychairmanname}{Presidente}
-      \renewcommand{\mthesisname}{Disertaci\'on a la consecuci\'on del
+      \renewcommand\uaname{Universidad de Amberes}
+      \renewcommand\logoname{UA_HOR_SPA_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_ENG_RGB}
+      \renewcommand\arrname{Todos los derechos reservados}
+      \renewcommand\orname{de}
+      \renewcommand\domainname{uantwerp.be}
+      \renewcommand\subjectname{Asunto}%
+      \renewcommand\datename{Fecha}%
+      \renewcommand\academicyearname{A\~no acad\'emico}
+      \renewcommand\masterthesisname{Tesis de maestr\'\i{}a}
+      \renewcommand\bachelorthesisname{Tesis de bachiller}
+      \renewcommand\supervisorsname{Promotores}
+      \renewcommand\juryname{Jurado}
+      \renewcommand\jurymembersname{Miembros}
+      \renewcommand\jurychairmanname{Presidente}
+      \renewcommand\bmthesisname{Disertaci\'on a la consecuci\'on del
         grado de}
-      \renewcommand{\pthesisnamei}{Disertaici\'on a la consecuci\'on del
+      \renewcommand\pthesisnamei{Disertaici\'on a la consecuci\'on del
         grado de}
-      \renewcommand{\pthesisnameii}{a l'\uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{a l'\uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}}
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Peso}
+      \renewcommand\weightname{Peso}
     }
   }
   {}

Modified: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls	2019-03-28 20:58:25 UTC (rev 50626)
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2013-2018  by Walter Daems <walter.daems at uantwerpen.be>
+%% Copyright (C) 2013-2019  by Walter Daems <walter.daems at uantwerpen.be>
 %% 
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3 of this license
@@ -26,407 +26,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{uantwerpenmasterthesis}
-    [2018/10/23 v2.2 .dtx skeleton file]
-\def\fileversion{2.2}
-\def\filedate{2018/10/23}
-\newif\if at titlepagenoartwork
-\DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
-\newif\if at titlepagetableonly
-\DeclareOption{titlepagetableonly}{\@titlepagetableonlytrue}
-\newif\if at filled
-\DeclareOption{filled}{\@filledtrue}
-\ExecuteOptions{a4paper,11pt,final,oneside,openright}
-\ProcessOptions
-\LoadClassWithOptions{book}
-\setlength{\parindent}{0pt}
-\addtolength{\parskip}{0.75\baselineskip}
-\setcounter{secnumdepth}{3}
-\RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry}
-\RequirePackage{etoolbox}
-\RequirePackage{ifthen}
-\IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{}
-\newcommand{\@emptymacro}{}
-\RequirePackage{graphicx}
-\RequirePackage{color}
-\RequirePackage{tikz}
-\usetikzlibrary{positioning}
-\RequirePackage{eso-pic}
-\RequirePackage{fancyhdr}
-\definecolor{uacorpbord}{cmyk}     {0.00,1.00,0.60,0.37}
-\definecolor{uacorpblue}{cmyk}     {1.00,0.25,0.00,0.50}
-\definecolor{uacorplightblue}{cmyk}{1.00,0.00,0.08,0.13}
-\definecolor{uacorporange}{cmyk}   {0.00,0.32,1.00,0.09}
-\definecolor{uaftifresh}{cmyk}     {0.34,1.00,0.00,0.00}
-\definecolor{uaftisober}{cmyk}     {0.10,1.00,0.00,0.49}
-\definecolor{lightgray}{cmyk}      {0.00,0.00,0.00,0.05}
-\definecolor{darkgray}{cmyk}       {0.00,0.00,0.00,0.80}
-\definecolor{watermark}{cmyk}      {0.00,0.00,0.00,0.05}
-\newcommand{\uaname}{University of Antwerp}
-\newcommand{\logoname}{UA_HOR_ENG_CMYK}
-\newcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-\newcommand{\arrname}{All rights reserved}
-\newcommand{\orname}{of}
-\newcommand{\domainname}{uantwerp.be}
-\newcommand{\datename}{Date}
-\newcommand{\subjectname}{Subject}
-\newcommand{\academicyearname}{Academic year}
-\newcommand{\masterthesisname}{Master's thesis}
-\newcommand{\supervisorsname}{Supervisors}
-\newcommand{\juryname}{Jury}
-\newcommand{\jurymembersname}{Members}
-\newcommand{\jurychairmanname}{Chairman}
-\newcommand{\mthesisname}{Thesis to obtain the degree of}
-\newcommand{\pthesisnamei}{Thesis submitted in fulfilment of the
-  requirements for the degree of}
-\newcommand{\pthesisnameii}{at University of Antwerp}
-\newcommand{\@faculty}{< Specify faculty using \textbackslash{}facultyacronym\{ABC\} >}
-\newcommand{\faccpg}{
-  \renewcommand\@faculty{Centre Pieter Gillis}}
-\newcommand{\facfbd}{
-  \renewcommand\@faculty{
-    Faculty of Pharmaceutical, Biomedical and Veterinary Sciences}}
-\newcommand{\facggw}{
-  \renewcommand\@faculty{Faculty of Medicine and Health Sciences}}
-\newcommand{\insiob}{
-  \renewcommand\@faculty{Insitute of Development Policy}}
-\newcommand{\insoiw}{
-  \renewcommand\@faculty{Institute of Educations and Information Sciences}}
-\newcommand{\asoe}{
-  \renewcommand\@faculty{Antwerp School of Education}}
-\newcommand{\faclw}{
-  \renewcommand\@faculty{Faculty of Arts}}
-\newcommand{\facow}{
-  \renewcommand\@faculty{Faculty of Design Sciences}}
-\newcommand{\facsw}{
-  \renewcommand\@faculty{Faculty of Social Sciences}}
-\newcommand{\facrec}{
-  \renewcommand\@faculty{Faculty of Law}}
-\newcommand{\factew}{
-  \renewcommand\@faculty{Faculty of Applied Economics}}
-\newcommand{\facti}{
-  \renewcommand\@faculty{Faculty of Applied Engineering}}
-\newcommand{\facwet}{
-  \renewcommand\@faculty{Faculty of Science}}
-\newcommand{\weightname}{Weight}
-\AtBeginDocument{
-  \@ifpackageloaded{babel}{
-    \addto\captionsdutch{%
-      \renewcommand\uaname{Universiteit Antwerpen}
-      \renewcommand\logoname{UA_HOR_NED_CMYK}
-      \renewcommand\footername{4E_PMS302_BR_NED_RGB}
-      \renewcommand\arrname{Alle rechten voorbehouden}
-      \renewcommand\orname{van}
-      \renewcommand\domainname{uantwerpen.be}
-      \renewcommand\subjectname{Onderwerp}%
-      \renewcommand\datename{Datum}%
-      \renewcommand\academicyearname{Academiejaar}
-      \renewcommand\masterthesisname{Masterproef}
-      \renewcommand\supervisorsname{Promotoren}
-      \renewcommand\juryname{Jury}
-      \renewcommand\jurymembersname{Leden}
-      \renewcommand\jurychairmanname{Voorzitter}
-      \renewcommand\mthesisname{Proefschrift tot het behalen van de
-        graad van}
-      \renewcommand\pthesisnamei{Proefschrift voorgelegd tot het
-        behalen van de graad van}
-      \renewcommand\pthesisnameii{aan de \uaname{} te
-        verdedigen door}
-      \renewcommand\faccpg{
-        \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand\facfbd{
-        \renewcommand\@faculty{
-          Faculteit Farmaceutische, Biomedische en Diergeneeskundige
-          Wetenschappen}}
-      \renewcommand\facggw{
-        \renewcommand\@faculty{Faculteit Geneeskunde en
-          Gezondheidswetenschappen}}
-      \renewcommand\insiob{
-        \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
-          beheer}}
-      \renewcommand{\insoiw}{
-        \renewcommand\@faculty{Instituut voor Onderwijs- en
-          Informatiewetenschappen}}
-      \renewcommand{\asoe}{
-        \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
-          Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
-        \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
-        \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
-        \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
-        \renewcommand\@faculty{Faculteit Toegepaste Economische
-          Wetenschappen}}
-      \renewcommand{\facti}{
-        \renewcommand\@faculty{Faculteit Toegepaste
-          Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
-        \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Gewicht}
-    }
-    \addto\captionsgerman{%
-      \renewcommand{\uaname}{Universit\"at Antwerpen}
-      \renewcommand{\logoname}{UA_HOR_DUI_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_NED_RGB}
-      \renewcommand{\arrname}{Alle Rechte vorbehalten}
-      \renewcommand{\orname}{von}
-      \renewcommand{\domainname}{uantwerpen.be}
-      \renewcommand{\subjectname}{Betreff}%
-      \renewcommand{\datename}{Datum}%
-      \renewcommand{\academicyearname}{Akademisches Jahr}
-      \renewcommand{\masterthesisname}{Masterdissertation}
-      \renewcommand{\supervisorsname}{Veranstalter}
-      \renewcommand{\juryname}{Jury}
-      \renewcommand{\jurymembersname}{Mitglieder}
-      \renewcommand{\jurychairmanname}{Vorsitzender}
-      \renewcommand{\mthesisname}{Dissertation zur Erreichung des
-        Grades der}
-      \renewcommand{\pthesisnamei}{Dissertation zur Erreiching des
-        Grades der}
-      \renewcommand{\pthesisnameii}{an die \uaname}
-      \renewcommand{\faccpg}{
-        \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
-        \renewcommand\@faculty{
-          Faculteit Farmaceutische, Biomedische en Diergeneeskundige
-          Wetenschappen}}
-      \renewcommand{\facggw}{
-        \renewcommand\@faculty{Faculteit Geneeskunde en
-          Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
-        \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
-          beheer}}
-      \renewcommand{\insoiw}{
-        \renewcommand\@faculty{Instituut voor Onderwijs- en
-          Informatiewetenschappen}}
-      \renewcommand{\asoe}{
-        \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
-          Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
-        \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
-        \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
-        \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
-        \renewcommand\@faculty{Faculteit Toegepaste Economische
-          Wetenschappen}}
-      \renewcommand{\facti}{
-        \renewcommand\@faculty{Faculteit Toegepaste
-          Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
-        \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Gewicht}
-    }
-    \addto\captionsfrench{%
-      \renewcommand{\uaname}{Universit\'e d'Anvers}
-      \renewcommand{\logoname}{UA_HOR_FRA_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-      \renewcommand{\arrname}{Tous les droits sont r\'eserv\'es}
-      \renewcommand{\orname}{de}
-      \renewcommand{\domainname}{uanvers.be}
-      \renewcommand{\subjectname}{Objet}%
-      \renewcommand{\datename}{Date}%
-      \renewcommand{\academicyearname}{Ann\'ee acad\'emique}
-      \renewcommand{\masterthesisname}{Th\`ese de master}
-      \renewcommand{\supervisorsname}{Promoteurs}
-      \renewcommand{\juryname}{Jury}
-      \renewcommand{\jurymembersname}{Membres}
-      \renewcommand{\jurychairmanname}{Pr\'esident}
-      \renewcommand{\mthesisname}{Th\`ese \`a l'atteinte du degr\'e de}
-      \renewcommand{\pthesisnamei}{Th\`ese Doctorale \`a l'atteinte du
-        degr\'e de}
-      \renewcommand{\pthesisnameii}{\`a l'\uaname}
-      \renewcommand{\faccpg}{
-        \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
-        \renewcommand\@faculty{
-          Faculteit Farmaceutische, Biomedische en Diergeneeskundige
-          Wetenschappen}}
-      \renewcommand{\facggw}{
-        \renewcommand\@faculty{Faculteit Geneeskunde en
-          Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
-        \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
-          beheer}}
-      \renewcommand{\insoiw}{
-        \renewcommand\@faculty{Instituut voor Onderwijs- en
-          Informatiewetenschappen}}
-      \renewcommand{\asoe}{
-        \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
-          Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
-        \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
-        \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
-        \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
-        \renewcommand\@faculty{Faculteit Toegepaste Economische
-          Wetenschappen}}
-      \renewcommand{\facti}{
-        \renewcommand\@faculty{Faculteit Toegepaste
-          Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
-        \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Poids}
-    }
-    \addto\captionsspanish{%
-      \renewcommand{\uaname}{Universidad de Amberes}
-      \renewcommand{\logoname}{UA_HOR_SPA_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-      \renewcommand{\arrname}{Todos los derechos reservados}
-      \renewcommand{\orname}{de}
-      \renewcommand{\domainname}{uantwerp.be}
-      \renewcommand{\subjectname}{Asunto}%
-      \renewcommand{\datename}{Fecha}%
-      \renewcommand{\academicyearname}{A\~no acad\'emico}
-      \renewcommand{\masterthesisname}{Tesis de maestr\'\i{}a}
-      \renewcommand{\supervisorsname}{Promotores}
-      \renewcommand{\juryname}{Jurado}
-      \renewcommand{\jurymembersname}{Miembros}
-      \renewcommand{\jurychairmanname}{Presidente}
-      \renewcommand{\mthesisname}{Disertaci\'on a la consecuci\'on del
-        grado de}
-      \renewcommand{\pthesisnamei}{Disertaici\'on a la consecuci\'on del
-        grado de}
-      \renewcommand{\pthesisnameii}{a l'\uaname}
-      \renewcommand{\faccpg}{
-        \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
-        \renewcommand\@faculty{
-          Faculteit Farmaceutische, Biomedische en Diergeneeskundige
-          Wetenschappen}}
-      \renewcommand{\facggw}{
-        \renewcommand\@faculty{Faculteit Geneeskunde en
-          Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
-        \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
-          beheer}}
-      \renewcommand{\insoiw}{
-        \renewcommand\@faculty{Instituut voor Onderwijs- en
-          Informatiewetenschappen}}
-      \renewcommand{\asoe}{
-        \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
-          Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
-        \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
-        \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
-        \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
-        \renewcommand\@faculty{Faculteit Toegepaste Economische
-          Wetenschappen}}
-      \renewcommand{\facti}{
-        \renewcommand\@faculty{Faculteit Toegepaste
-          Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
-        \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Peso}
-    }
-  }
-  {}
-}
-\newcommand{\@facultyacronym}{}
-\newcommand{\facultyacronym}[1]{
-  \renewcommand{\@facultyacronym}{#1}
-  \AtBeginDocument{
-    \ifthenelse{\equal{#1}{CPG}}{\faccpg}{
-    \ifthenelse{\equal{#1}{FBD}}{\facfbd}{
-    \ifthenelse{\equal{#1}{GGW}}{\facggw}{
-    \ifthenelse{\equal{#1}{IOB}}{\insiob}{
-    \ifthenelse{\equal{#1}{IOIW}}{\insoiw}{
-    \ifthenelse{\equal{#1}{ASoE}}{\asoe}{
-    \ifthenelse{\equal{#1}{LW}}{\faclw}{
-    \ifthenelse{\equal{#1}{OW}}{\facow}{
-    \ifthenelse{\equal{#1}{SW}}{\facsw}{
-    \ifthenelse{\equal{#1}{REC}}{\facrec}{
-    \ifthenelse{\equal{#1}{TEW}}{\factew}{
-    \ifthenelse{\equal{#1}{TI}}{\facti}{
-    \ifthenelse{\equal{#1}{WET}}{\facwet}{
-      \errmessage{Error: wrong faculty acronym; choose one of CPG, FBD, GGW,
-        IOB, IOIW, ASoE, LW, OW, SW, REC, TEW, TI, WET}}}}}}}}}}}}}}}
-}
-\newcommand{\@subtitle}{Master's thesis}
-\newcommand\@supervisori{\errmessage{Please define a supervisor of
-    your thesiswork using the \textbackslash{}supervisori to iv
-    commands} in the preamble of your document.}
-\newcommand\@supervisoriaff{}
-\newcommand\@supervisorii{}
-\newcommand\@supervisoriiaff{}
-\newcommand\@supervisoriii{}
-\newcommand\@supervisoriiiaff{}
-\newcommand\@supervisoriv{}
-\newcommand\@supervisorivaff{}
-\newcommand{\supervisori}[2]{\renewcommand\@supervisori{#1}\renewcommand\@supervisoriaff{#2}}
-\newcommand{\supervisorii}[2]{\renewcommand\@supervisorii{#1}\renewcommand\@supervisoriiaff{#2}}
-\newcommand{\supervisoriii}[2]{\renewcommand\@supervisoriii{#1}\renewcommand\@supervisoriiiaff{#2}}
-\newcommand{\supervisoriv}[2]{\renewcommand\@supervisoriv{#1}\renewcommand\@supervisorivaff{#2}}
-\newcommand{\@diploma}{ERROR}
-\newcommand{\diploma}[1]{
-  \newcommand{\MoSIW}{Master of Science in de industri\"ele wetenschappen}
-  \newcommand{\MoSTEW}{Master of Science in de toegepaste economische wetenschappen}
-  \renewcommand{\@diploma}{
-    \ifthenelse{\equal{#1}{MA-IW-BK}}
-                          {\MoSIW: bouwkunde}{
-    \ifthenelse{\equal{#1}{MA-IW-BCH}}
-                          {\MoSIW: biochemie}{
-    \ifthenelse{\equal{#1}{MA-IW-CH}}
-                          {\MoSIW: chemie}{
-    \ifthenelse{\equal{#1}{MA-IW-EI}}
-                          {\MoSIW: elektronica-ICT}{
-    \ifthenelse{\equal{#1}{MA-IW-EI-AE}}
-                          {\MoSIW:\\elektronica-ICT, afstudeerrichting automotive engineering}{
-    \ifthenelse{\equal{#1}{MA-IW-EI-ICT}}
-                          {\MoSIW:\\elektronica-ICT, afstudeerrichting ICT}{
-    \ifthenelse{\equal{#1}{MA-IW-EM-AE}}
-                          {\MoSIW:\\elektromechanica, afstudeerrichting automotive engineering}{
-    \ifthenelse{\equal{#1}{MA-IW-EM-AU}}
-                          {\MoSIW:\\elektromechanica, afstudeerrichting automatisering}{
-    \ifthenelse{\equal{#1}{MA-IW-EM-EM}}
-                          {\MoSIW:\\elektromechanica, afstudeerrichting elektromechanica}{
-    \ifthenelse{\equal{#1}{MA-IW-EM-EN}}
-                          {\MoSIW:\\elektromechanica, afstudeerrichting energie}{
-    \ifthenelse{\equal{#1}{MA-TEW-HI}}
-                          {\MoSTEW: handelsingenieur}{
-    \ifthenelse{\equal{#1}{MA-TEW-HIBI}}
-                          {\MoSTEW:\\handelsingenieur in de beleidsinformatica}{
-    \ifthenelse{\equal{#1}{MA-TEW-EB}}
-                          {\MoSTEW: economisch beleid}{
-    \ifthenelse{\equal{#1}{MA-TEW-BK}}
-                          {\MoSTEW: bedrijfskunde}
-    {\errmessage{Error in argument to macro diploma: must be one of
-        MA-IW-XXX with XXX one of BCH, CH, EI, EI-AE, EI-ICT, EM-AE,
-        EM-AU, EM-EM, EM-EN, MA-TEW-YYY with YYY one of HI, HIBI, EB, BK! <<}}}}}}}}}}}}}}}
-}
-}
-\newcommand\@defensedate{ERROR}
-\newcommand{\defensedate}[1]{\renewcommand\@defensedate{#1}}
-\newcommand\@defenselocation{Antwerpen}
-\newcommand{\defenselocation}[1]{\renewcommand\@defenselocation{#1}}
-\newcommand{\@academicyear}{XXX-YYYY}
-\newcommand{\academicyear}[1]{\renewcommand{\@academicyear}{#1}}
-\if at twoside
-  \lhead[\thepage]{\slshape\rightmark}
-  \chead[]{}
-  \rhead[\slshape\leftmark]{\thepage}
-  \lfoot[]{}
-  \cfoot[]{}
-  \rfoot[]{}
-\else
-  \lhead[]{\leftmark}
-  \chead[]{}
-  \rhead[]{\thepage}
-  \lfoot[]{}
-  \cfoot[]{}
-  \rfoot[]{}
-\fi
+    [2019/03/27 v2.3 .dtx skeleton file]
+\errmessage{This class is obsolete, use the uantwerpenbamathesis class instead !}
+\def\fileversion{2.3}
+\def\filedate{2019/03/27}
 
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}
@@ -435,121 +38,6 @@
 \fi
 \raggedbottom
 \onecolumn
-\pgfmathsetmacro{\ua at Wh}{\paperwidth}
-\pgfmathsetmacro{\ua at Xh}{0.2\paperheight}
-\pgfmathsetmacro{\ua at Yh}{0.125\paperheight}
-\pgfmathsetmacro{\ua at XMYh}{\ua at Xh-\ua at Yh}
-\pgfmathsetmacro{\ua at Rh}{0.5*\ua at Wh/\ua at XMYh*\ua at Wh+0.5*\ua at XMYh}
-\pgfmathsetmacro{\ua at Qh}{\ua at Rh-\ua at Xh+\paperheight}
-\pgfmathsetmacro{\ua at Wba}{0.4*\paperwidth}
-\pgfmathsetmacro{\ua at Sba}{0.125*\paperheight}
-\pgfmathsetmacro{\ua at XMYba}{0.02\paperheight}
-\pgfmathsetmacro{\ua at Rba}{0.5*\ua at Wba/\ua at XMYba*\ua at Wba+0.5*\ua at XMYba}
-\pgfmathsetmacro{\ua at Qba}{\ua at Rba+\ua at Sba}
-\pgfmathsetmacro{\ua at Wbb}{0.65*\paperwidth}
-\pgfmathsetmacro{\ua at Sbb}{0.14*\paperheight}
-\pgfmathsetmacro{\ua at XMYbb}{0.06\paperheight}
-\pgfmathsetmacro{\ua at Rbb}{0.5*\ua at Wbb/\ua at XMYbb*\ua at Wbb+0.5*\ua at XMYbb}
-\pgfmathsetmacro{\ua at Qbb}{\ua at Rbb+\ua at Sbb}
-\pgfmathsetmacro{\ua at ll}{0.15*\paperwidth}
-\pgfmathsetmacro{\ua at l}{0.4*\paperwidth}
-\pgfmathsetmacro{\ua at d}{0.1in}
-\pgfmathsetmacro{\ua at rr}{0.85*\paperwidth}
-\renewcommand\maketitle{%
-  \pagestyle{empty}
-  \begin{titlepage}
-    \begin{tikzpicture}[remember picture,overlay]
-      \node at (current page.center) {
-        \begin{tikzpicture}[inner sep=0pt]
-          \clip (0,0) rectangle(\paperwidth,\paperheight);
-          \if at titlepagenoartwork\else
-          \filldraw [lightgray] (0.55\paperwidth,\ua at Qba pt) circle (\ua at Rba pt);
-          \filldraw [white] (0.35\paperwidth,\ua at Qbb pt) circle (\ua at Rbb pt);
-          \filldraw [lightgray] (0,\ua at Qh pt) circle (\ua at Rh pt);
-          \path
-          (0.95\paperwidth,0.1\paperheight)
-          node [anchor=north east] {
-            \includegraphics[width=0.25\paperwidth]{\logoname}};
-          \fi
-          \path
-          (\ua at ll pt,0.77\paperheight)
-          node [anchor=north west, text width=0.7\paperwidth] {
-            \uppercase\expandafter{\uaname}\\~\\
-            \academicyearname{} \@academicyear\\~\\
-            {\large \@faculty{}}\\~\\
-            \masterthesisname{}\\[0.05\paperheight]
-            {\Large \bf \@title{}}}
-          (\ua at ll pt,0.55\paperheight)
-          node [anchor = north west, text width = 0.7\paperwidth] {
-            {\large \bf \@author{}}\\~\\~\\
-            \begin{tabular}{@{}p{2.7cm}p{10.8cm}}
-              \textbf{\supervisorsname{}:}
-              & \@supervisori \\
-              & \@supervisorii \\
-              & \@supervisoriii \\
-              & \@supervisoriv
-            \end{tabular}
-          }
-          (\ua at ll pt,0.3\paperheight) node [anchor=north west, text width = 0.7\paperwidth]{%
-            \mthesisname\\
-            \@diploma\\
-            \@defenselocation, \@defensedate
-          };
-        \end{tikzpicture}
-      };
-    \end{tikzpicture}
-  \end{titlepage}%
-  \clearpage
-  \setcounter{footnote}{0}%
-  \global\let\thanks\relax
-  \global\let\maketitle\relax
-  \global\let\@thanks\@empty
-  \global\let\title\relax
-  \global\let\author\relax
-  \global\let\date\relax
-  \global\let\and\relax
-  \pagestyle{fancy}
-  \thispagestyle{empty}
-}
-\newcommand\makefinalpage{
-  \cleardoublepage
-  \thispagestyle{empty}
-  \begin{tikzpicture}[remember picture,overlay]
-    \node at (current page.center) {
-      \begin{tikzpicture}[inner sep=0pt]
-        \clip (0,0) rectangle(\paperwidth,\paperheight);
-        \if at titlepagenoartwork\else
-        \filldraw [lightgray] (\paperwidth,\ua at Qh pt) circle (\ua at Rh pt);
-        \fi
-      \end{tikzpicture}
-    };
-  \end{tikzpicture}
-}
-\IfFileExists{varioref.sty}{\RequirePackage{varioref}}{}
-\IfFileExists{hyperref.sty}{
-    \RequirePackage{hyperref}
-    \hypersetup{
-      backref=true,
-      breaklinks=true,
-      colorlinks=true,
-      citecolor=black,
-      filecolor=black,
-      hyperindex=true,
-      linkcolor=black,
-      pageanchor=true,
-      pagebackref=true,
-      pagecolor=black,
-      pdfpagemode=UseOutlines,
-      urlcolor=black
-    }
-    \AtBeginDocument{
-      \hypersetup{
-        pdftitle={\@title},
-        pdfsubject={\@subtitle},
-        pdfauthor={\@author}
-      }
-    }
-}{}
 \endinput
 %%
 %% End of file `uantwerpenmasterthesis.cls'.

Modified: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls	2019-03-28 20:58:02 UTC (rev 50625)
+++ trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls	2019-03-28 20:58:25 UTC (rev 50626)
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2013-2018  by Walter Daems <walter.daems at uantwerpen.be>
+%% Copyright (C) 2013-2019  by Walter Daems <walter.daems at uantwerpen.be>
 %% 
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3 of this license
@@ -25,9 +25,9 @@
 %% The Current Maintainer of this work is Walter Daems.
 %% 
 \ProvidesClass{uantwerpenphdthesis}
-    [2018/10/23 v2.2 .dtx skeleton file]
-\def\fileversion{2.2}
-\def\filedate{2018/10/23}
+    [2019/03/27 v2.3 .dtx skeleton file]
+\def\fileversion{2.3}
+\def\filedate{2019/03/27}
 \newif\if at titlepagenoartwork
 \DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
 \newif\if at titlepagetableonly
@@ -41,6 +41,7 @@
 \addtolength{\parskip}{0.75\baselineskip}
 \setcounter{secnumdepth}{3}
 \RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry}
+\RequirePackage{xstring}
 \RequirePackage{etoolbox}
 \RequirePackage{ifthen}
 \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{}
@@ -61,53 +62,54 @@
 \definecolor{lightgray}{cmyk}      {0.00,0.00,0.00,0.05}
 \definecolor{darkgray}{cmyk}       {0.00,0.00,0.00,0.80}
 \definecolor{watermark}{cmyk}      {0.00,0.00,0.00,0.05}
-\newcommand{\uaname}{University of Antwerp}
-\newcommand{\logoname}{UA_HOR_ENG_CMYK}
-\newcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-\newcommand{\arrname}{All rights reserved}
-\newcommand{\orname}{of}
-\newcommand{\domainname}{uantwerp.be}
-\newcommand{\datename}{Date}
-\newcommand{\subjectname}{Subject}
-\newcommand{\academicyearname}{Academic year}
-\newcommand{\masterthesisname}{Master's thesis}
-\newcommand{\supervisorsname}{Supervisors}
-\newcommand{\juryname}{Jury}
-\newcommand{\jurymembersname}{Members}
-\newcommand{\jurychairmanname}{Chairman}
-\newcommand{\mthesisname}{Thesis to obtain the degree of}
-\newcommand{\pthesisnamei}{Thesis submitted in fulfilment of the
+\newcommand\uaname{University of Antwerp}
+\newcommand\logoname{UA_HOR_ENG_CMYK}
+\newcommand\footername{4E_PMS302_BR_ENG_RGB}
+\newcommand\arrname{All rights reserved}
+\newcommand\orname{of}
+\newcommand\domainname{uantwerp.be}
+\newcommand\datename{Date}
+\newcommand\subjectname{Subject}
+\newcommand\academicyearname{Academic year}
+\newcommand\masterthesisname{Master's thesis}
+\newcommand\bachelorthesisname{Bachelor's thesis}
+\newcommand\supervisorsname{Supervisors}
+\newcommand\juryname{Jury}
+\newcommand\jurymembersname{Members}
+\newcommand\jurychairmanname{Chairman}
+\newcommand\bmthesisname{Thesis to obtain the degree of}
+\newcommand\pthesisnamei{Thesis submitted in fulfilment of the
   requirements for the degree of}
-\newcommand{\pthesisnameii}{at University of Antwerp}
-\newcommand{\@faculty}{< Specify faculty using \textbackslash{}facultyacronym\{ABC\} >}
-\newcommand{\faccpg}{
+\newcommand\pthesisnameii{at University of Antwerp}
+\newcommand\@faculty{< Specify faculty using \textbackslash{}facultyacronym\{ABC\} >}
+\newcommand\faccpg{
   \renewcommand\@faculty{Centre Pieter Gillis}}
-\newcommand{\facfbd}{
+\newcommand\facfbd{
   \renewcommand\@faculty{
     Faculty of Pharmaceutical, Biomedical and Veterinary Sciences}}
-\newcommand{\facggw}{
+\newcommand\facggw{
   \renewcommand\@faculty{Faculty of Medicine and Health Sciences}}
-\newcommand{\insiob}{
+\newcommand\insiob{
   \renewcommand\@faculty{Insitute of Development Policy}}
-\newcommand{\insoiw}{
+\newcommand\insoiw{
   \renewcommand\@faculty{Institute of Educations and Information Sciences}}
-\newcommand{\asoe}{
+\newcommand\asoe{
   \renewcommand\@faculty{Antwerp School of Education}}
-\newcommand{\faclw}{
+\newcommand\faclw{
   \renewcommand\@faculty{Faculty of Arts}}
-\newcommand{\facow}{
+\newcommand\facow{
   \renewcommand\@faculty{Faculty of Design Sciences}}
-\newcommand{\facsw}{
+\newcommand\facsw{
   \renewcommand\@faculty{Faculty of Social Sciences}}
-\newcommand{\facrec}{
+\newcommand\facrec{
   \renewcommand\@faculty{Faculty of Law}}
-\newcommand{\factew}{
+\newcommand\factew{
   \renewcommand\@faculty{Faculty of Applied Economics}}
-\newcommand{\facti}{
+\newcommand\facti{
   \renewcommand\@faculty{Faculty of Applied Engineering}}
-\newcommand{\facwet}{
+\newcommand\facwet{
   \renewcommand\@faculty{Faculty of Science}}
-\newcommand{\weightname}{Weight}
+\newcommand\weightname{Weight}
 \AtBeginDocument{
   \@ifpackageloaded{babel}{
     \addto\captionsdutch{%
@@ -121,11 +123,12 @@
       \renewcommand\datename{Datum}%
       \renewcommand\academicyearname{Academiejaar}
       \renewcommand\masterthesisname{Masterproef}
+      \renewcommand\bachelorthesisname{Bachelorproef}
       \renewcommand\supervisorsname{Promotoren}
       \renewcommand\juryname{Jury}
       \renewcommand\jurymembersname{Leden}
       \renewcommand\jurychairmanname{Voorzitter}
-      \renewcommand\mthesisname{Proefschrift tot het behalen van de
+      \renewcommand\bmthesisname{Proefschrift tot het behalen van de
         graad van}
       \renewcommand\pthesisnamei{Proefschrift voorgelegd tot het
         behalen van de graad van}
@@ -143,192 +146,195 @@
       \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Gewicht}
+      \renewcommand\weightname{Gewicht}
     }
     \addto\captionsgerman{%
-      \renewcommand{\uaname}{Universit\"at Antwerpen}
-      \renewcommand{\logoname}{UA_HOR_DUI_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_NED_RGB}
-      \renewcommand{\arrname}{Alle Rechte vorbehalten}
-      \renewcommand{\orname}{von}
-      \renewcommand{\domainname}{uantwerpen.be}
-      \renewcommand{\subjectname}{Betreff}%
-      \renewcommand{\datename}{Datum}%
-      \renewcommand{\academicyearname}{Akademisches Jahr}
-      \renewcommand{\masterthesisname}{Masterdissertation}
-      \renewcommand{\supervisorsname}{Veranstalter}
-      \renewcommand{\juryname}{Jury}
-      \renewcommand{\jurymembersname}{Mitglieder}
-      \renewcommand{\jurychairmanname}{Vorsitzender}
-      \renewcommand{\mthesisname}{Dissertation zur Erreichung des
+      \renewcommand\uaname{Universit\"at Antwerpen}
+      \renewcommand\logoname{UA_HOR_DUI_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_NED_RGB}
+      \renewcommand\arrname{Alle Rechte vorbehalten}
+      \renewcommand\orname{von}
+      \renewcommand\domainname{uantwerpen.be}
+      \renewcommand\subjectname{Betreff}%
+      \renewcommand\datename{Datum}%
+      \renewcommand\academicyearname{Akademisches Jahr}
+      \renewcommand\masterthesisname{Masterdissertation}
+      \renewcommand\bachelorthesisname{Bachelordissertation}
+      \renewcommand\supervisorsname{Veranstalter}
+      \renewcommand\juryname{Jury}
+      \renewcommand\jurymembersname{Mitglieder}
+      \renewcommand\jurychairmanname{Vorsitzender}
+      \renewcommand\bmthesisname{Dissertation zur Erreichung des
         Grades der}
-      \renewcommand{\pthesisnamei}{Dissertation zur Erreiching des
+      \renewcommand\pthesisnamei{Dissertation zur Erreiching des
         Grades der}
-      \renewcommand{\pthesisnameii}{an die \uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{an die \uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}}
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Gewicht}
+      \renewcommand\weightname{Gewicht}
     }
     \addto\captionsfrench{%
-      \renewcommand{\uaname}{Universit\'e d'Anvers}
-      \renewcommand{\logoname}{UA_HOR_FRA_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-      \renewcommand{\arrname}{Tous les droits sont r\'eserv\'es}
-      \renewcommand{\orname}{de}
-      \renewcommand{\domainname}{uanvers.be}
-      \renewcommand{\subjectname}{Objet}%
-      \renewcommand{\datename}{Date}%
-      \renewcommand{\academicyearname}{Ann\'ee acad\'emique}
-      \renewcommand{\masterthesisname}{Th\`ese de master}
-      \renewcommand{\supervisorsname}{Promoteurs}
-      \renewcommand{\juryname}{Jury}
-      \renewcommand{\jurymembersname}{Membres}
-      \renewcommand{\jurychairmanname}{Pr\'esident}
-      \renewcommand{\mthesisname}{Th\`ese \`a l'atteinte du degr\'e de}
-      \renewcommand{\pthesisnamei}{Th\`ese Doctorale \`a l'atteinte du
+      \renewcommand\uaname{Universit\'e d'Anvers}
+      \renewcommand\logoname{UA_HOR_FRA_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_ENG_RGB}
+      \renewcommand\arrname{Tous les droits sont r\'eserv\'es}
+      \renewcommand\orname{de}
+      \renewcommand\domainname{uanvers.be}
+      \renewcommand\subjectname{Objet}%
+      \renewcommand\datename{Date}%
+      \renewcommand\academicyearname{Ann\'ee acad\'emique}
+      \renewcommand\masterthesisname{Th\`ese de master}
+      \renewcommand\bachelorthesisname{Th\`ese de baccalaur\'eat}
+      \renewcommand\supervisorsname{Promoteurs}
+      \renewcommand\juryname{Jury}
+      \renewcommand\jurymembersname{Membres}
+      \renewcommand\jurychairmanname{Pr\'esident}
+      \renewcommand\bmthesisname{Th\`ese \`a l'atteinte du degr\'e de}
+      \renewcommand\pthesisnamei{Th\`ese Doctorale \`a l'atteinte du
         degr\'e de}
-      \renewcommand{\pthesisnameii}{\`a l'\uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{\`a l'\uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}}
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Poids}
+      \renewcommand\weightname{Poids}
     }
     \addto\captionsspanish{%
-      \renewcommand{\uaname}{Universidad de Amberes}
-      \renewcommand{\logoname}{UA_HOR_SPA_CMYK}
-      \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
-      \renewcommand{\arrname}{Todos los derechos reservados}
-      \renewcommand{\orname}{de}
-      \renewcommand{\domainname}{uantwerp.be}
-      \renewcommand{\subjectname}{Asunto}%
-      \renewcommand{\datename}{Fecha}%
-      \renewcommand{\academicyearname}{A\~no acad\'emico}
-      \renewcommand{\masterthesisname}{Tesis de maestr\'\i{}a}
-      \renewcommand{\supervisorsname}{Promotores}
-      \renewcommand{\juryname}{Jurado}
-      \renewcommand{\jurymembersname}{Miembros}
-      \renewcommand{\jurychairmanname}{Presidente}
-      \renewcommand{\mthesisname}{Disertaci\'on a la consecuci\'on del
+      \renewcommand\uaname{Universidad de Amberes}
+      \renewcommand\logoname{UA_HOR_SPA_CMYK}
+      \renewcommand\footername{4E_PMS302_BR_ENG_RGB}
+      \renewcommand\arrname{Todos los derechos reservados}
+      \renewcommand\orname{de}
+      \renewcommand\domainname{uantwerp.be}
+      \renewcommand\subjectname{Asunto}%
+      \renewcommand\datename{Fecha}%
+      \renewcommand\academicyearname{A\~no acad\'emico}
+      \renewcommand\masterthesisname{Tesis de maestr\'\i{}a}
+      \renewcommand\bachelorthesisname{Tesis de bachiller}
+      \renewcommand\supervisorsname{Promotores}
+      \renewcommand\juryname{Jurado}
+      \renewcommand\jurymembersname{Miembros}
+      \renewcommand\jurychairmanname{Presidente}
+      \renewcommand\bmthesisname{Disertaci\'on a la consecuci\'on del
         grado de}
-      \renewcommand{\pthesisnamei}{Disertaici\'on a la consecuci\'on del
+      \renewcommand\pthesisnamei{Disertaici\'on a la consecuci\'on del
         grado de}
-      \renewcommand{\pthesisnameii}{a l'\uaname}
-      \renewcommand{\faccpg}{
+      \renewcommand\pthesisnameii{a l'\uaname}
+      \renewcommand\faccpg{
         \renewcommand\@faculty{Centrum Pieter Gillis}}
-      \renewcommand{\facfbd}{
+      \renewcommand\facfbd{
         \renewcommand\@faculty{
           Faculteit Farmaceutische, Biomedische en Diergeneeskundige
           Wetenschappen}}
-      \renewcommand{\facggw}{
+      \renewcommand\facggw{
         \renewcommand\@faculty{Faculteit Geneeskunde en
           Gezondheidswetenschappen}}
-      \renewcommand{\insiob}{
+      \renewcommand\insiob{
         \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
           beheer}}
-      \renewcommand{\insoiw}{
+      \renewcommand\insoiw{
         \renewcommand\@faculty{Instituut voor Onderwijs- en
           Informatiewetenschappen}}
-      \renewcommand{\asoe}{
+      \renewcommand\asoe{
         \renewcommand\@faculty{Antwerp School of Education}}
-      \renewcommand{\faclw}{\renewcommand\@faculty{Faculteit
+      \renewcommand\faclw{\renewcommand\@faculty{Faculteit
           Letteren en Wijsbegeerte}}
-      \renewcommand{\facow}{
+      \renewcommand\facow{
         \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}}
-      \renewcommand{\facsw}{
+      \renewcommand\facsw{
         \renewcommand\@faculty{Faculteit Sociale Wetenschappen}}
-      \renewcommand{\facrec}{
+      \renewcommand\facrec{
         \renewcommand\@faculty{Faculteit Rechten}}
-      \renewcommand{\factew}{
+      \renewcommand\factew{
         \renewcommand\@faculty{Faculteit Toegepaste Economische
           Wetenschappen}}
-      \renewcommand{\facti}{
+      \renewcommand\facti{
         \renewcommand\@faculty{Faculteit Toegepaste
           Ingenieurswetenschappen}}
-      \renewcommand{\facwet}{
+      \renewcommand\facwet{
         \renewcommand\@faculty{Faculteit Wetenschappen}}
-      \renewcommand{\weightname}{Peso}
+      \renewcommand\weightname{Peso}
     }
   }
   {}
@@ -458,11 +464,23 @@
     \ifthenelse{\equal{#2}{IW}\and\not\equal{#3}{}}
     {\renewcommand{\@programmes}{: }}{}
 }
+\newcommand{\@diplomalevel}{ERROR}
 \newcommand{\@diploma}{ERROR}
 \newcommand{\diploma}[1]{
   \newcommand{\MoSIW}{Master of Science in de industri\"ele wetenschappen}
+  \newcommand{\BoSIW}{Bachelor of Science in de industri\"ele wetenschappen}
   \newcommand{\MoSTEW}{Master of Science in de toegepaste economische wetenschappen}
   \renewcommand{\@diploma}{
+    \ifthenelse{\equal{#1}{BA-IW-BK}}
+                          {\BoSIW: bouwkunde}{
+    \ifthenelse{\equal{#1}{BA-IW-BCH}}
+                          {\BoSIW: biochemie}{
+    \ifthenelse{\equal{#1}{BA-IW-CH}}
+                          {\BoSIW: chemie}{
+    \ifthenelse{\equal{#1}{BA-IW-EI}}
+                          {\BoSIW: elektronica-ICT}{
+    \ifthenelse{\equal{#1}{BA-IW-EM}}
+                          {\BoSIW: elektromechanica}{
     \ifthenelse{\equal{#1}{MA-IW-BK}}
                           {\MoSIW: bouwkunde}{
     \ifthenelse{\equal{#1}{MA-IW-BCH}}
@@ -492,10 +510,12 @@
     \ifthenelse{\equal{#1}{MA-TEW-BK}}
                           {\MoSTEW: bedrijfskunde}
     {\errmessage{Error in argument to macro diploma: must be one of
-        MA-IW-XXX with XXX one of BCH, CH, EI, EI-AE, EI-ICT, EM-AE,
-        EM-AU, EM-EM, EM-EN, MA-TEW-YYY with YYY one of HI, HIBI, EB, BK! <<}}}}}}}}}}}}}}}
+        BA-IW-XXX with XXX one of BK, BCH, CH, EI or EM, or MA-IW-XXX with XXX one of BK, BCH, CH, EI, EI-AE, EI-ICT, EM-AE, EM-AU, EM-EM, EM-EN, MA-TEW-YYY with YYY one of HI, HIBI, EB, BK! <<}}}}}}}}}}}}}}}}}}}}
+  }
+  \newcommand\thesisname{ERROR}
+  \IfSubStr{#1}{MA-}{\renewcommand\thesisname{\masterthesisname}}{}
+  \IfSubStr{#1}{BA-}{\renewcommand\thesisname{\bachelorthesisname}}{}
 }
-}
 \newcommand\@defensedate{ERROR}
 \newcommand{\defensedate}[1]{\renewcommand\@defensedate{#1}}
 \newcommand\@defenselocation{Antwerpen}
@@ -502,8 +522,7 @@
 \newcommand{\defenselocation}[1]{\renewcommand\@defenselocation{#1}}
 \newcommand\@titlepageimage{}
 \newcommand\titlepageimage[1]{\renewcommand\@titlepageimage{#1}}
-\newcommand{\@isbn}{\errmessage{Please, specify an ISBN number using
-    the \textbackslash{}isbn command in your preamble.}}
+\newcommand{\@isbn}{}
 \newcommand{\isbn}[1]{\renewcommand{\@isbn}{#1}}
 \newcommand{\@depot}{\errmessage{Please, specify a depot number using
     the \textbackslash{}depot command in your preamble.}}



More information about the tex-live-commits mailing list