uantwerpendocs (30apr16)

git-svn-id: svn://tug.org/texlive/trunk@40826 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 172 insertions, 54 deletions

diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf
index d31c84d8418..93334bc2c09 100644
--- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf
+++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf
diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex
index e4fed2e8f4b..a2cc925b00f 100644
--- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex
+++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex
@@ -24,8 +24,8 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{1.6}
-\def\filedate{2016/02/04}
+\def\fileversion{1.7}
+\def\filedate{2016/05/01}
 \documentclass[a4paper,11pt,oneside,openright,english,qr,copyright]{uantwerpencoursetext}
 
 \usepackage[english,dutch]{babel}
diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpendocs.pdf b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpendocs.pdf
index 410be04cc20..31ce2291790 100644
--- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpendocs.pdf
+++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpendocs.pdf
diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf
index f80773daad4..dceabd1f750 100644
--- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf
+++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf
diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.tex b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.tex
index d0495b1c2ad..5defcab6a1e 100644
--- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.tex
+++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.tex
@@ -24,8 +24,8 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{1.6}
-\def\filedate{2016/02/04}
+\def\fileversion{1.7}
+\def\filedate{2016/05/01}
 
 \documentclass[a4paper]{uantwerpenletter}
 
@@ -45,7 +45,7 @@
 \address{
   Campus Groenenborger\\
   Groenenborgerlaan 171\\
-  B-202 Antwerpen\\
+  B-2020 Antwerpen\\
   BELGIUM}
 \email{walter.daems}{uantwerpen.be}
 \phone{+32 3 265 98 43}
diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.pdf b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.pdf
index 8fa6b8199db..1ab69781935 100644
--- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.pdf
+++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.pdf
diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex
index e2bb1576651..d1923b10661 100644
--- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex
+++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex
@@ -24,11 +24,11 @@
 %% 
 %% The Current Maintainer of this work is Walter Daems.
 %% 
-\def\fileversion{1.6}
-\def\filedate{2016/02/04}
+\def\fileversion{1.7}
+\def\filedate{2016/05/01}
 \documentclass[a4paper,11pt,twoside,openright,english]{uantwerpenmasterthesis}
 
-\usepackage[english,dutch]{babel}
+\usepackage[english]{babel} % or dutch if your text is in Dutch
 
 \title{Minimax optimisatie voor performantieruimtemodellering}
 \author{Bert Bibber}
@@ -44,7 +44,6 @@
 \defensedate{juni 2016}
 
 \begin{document}
-\selectlanguage{dutch} % or english if your text is in English
 
 \maketitle
 
diff --git a/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx b/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx
index 82091ece9a9..3977784ae62 100644
--- a/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx
+++ b/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx
@@ -28,10 +28,10 @@
 %<ct>\ProvidesClass{uantwerpencoursetext}
 %<mt>\ProvidesClass{uantwerpenmasterthesis}
 %<le>\ProvidesClass{uantwerpenletter}
-%<ct|mt>    [2016/02/04 v1.6 .dtx skeleton file]
+%<ct|mt>    [2016/05/01 v1.7 .dtx skeleton file]
 %
-\def\fileversion{1.6}
-\def\filedate{2016/02/04}
+\def\fileversion{1.7}
+\def\filedate{2016/05/01}
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage{makeidx}
@@ -79,6 +79,8 @@
 % letter by official PDF versions}
 % \changes{v1.6}{2016/02/04}{\@ Added diploma codes for Faculty of
 % Applied Economics}
+% \changes{v1.7}{2016/05/01}{\@ Added babel translations of elements
+% of master's thesis title page}
 %
 % \DoNotIndex{\newcommand,\newenvironment}
 % \setlength{\parindent}{0em}
@@ -842,7 +844,7 @@ doloribus asperiores repellat.
 %<*mt-example> 
 \documentclass[a4paper,11pt,twoside,openright,english]{uantwerpenmasterthesis}
 
-\usepackage[english,dutch]{babel}
+\usepackage[english]{babel} % or dutch if your text is in Dutch
 
 \title{Minimax optimisatie voor performantieruimtemodellering}
 \author{Bert Bibber}
@@ -858,7 +860,6 @@ doloribus asperiores repellat.
 \defensedate{juni 2016}
 
 \begin{document}
-\selectlanguage{dutch} % or english if your text is in English
 
 \maketitle
 
@@ -957,7 +958,7 @@ doloribus asperiores repellat.
 \address{
   Campus Groenenborger\\
   Groenenborgerlaan 171\\
-  B-202 Antwerpen\\
+  B-2020 Antwerpen\\
   BELGIUM}
 \email{walter.daems}{uantwerpen.be}
 \phone{+32 3 265 98 43}
@@ -1061,7 +1062,7 @@ doloribus asperiores repellat.
 \address{
   Campus Groenenborger\\
   Groenenborgerlaan 171\\
-  B-202 Antwerpen\\
+  B-2020 Antwerpen\\
   BELGIUM}
 \email{walter.daems}{uantwerpen.be}
 \phone{+32 3 265 98 43}
@@ -1207,7 +1208,7 @@ doloribus asperiores repellat.
 %</ct|mt|le>
 %<*ct>
 \if@copyright
-\RequirePackage[firstpage=false,contents={Copyright Universiteit Antwerpen, All Rights Reserved},color=lightgray,scale=3]{background}
+\RequirePackage[firstpage=false,contents={Copyright University of Antwerp, All Rights Reserved},color=lightgray,scale=3]{background}
 \fi
 %</ct>
 %    \end{macrocode}
@@ -1251,47 +1252,77 @@ doloribus asperiores repellat.
 %
 % \subsection{Babel provisions}
 %
+% \changes{v1.7}{2016/05/01}{Added babel tags of elements
+% of master's thesis title page}
 %    \begin{macrocode}
 %<*ct|mt|le>
+\newcommand{\uaname}{University of Antwerp}
 \newcommand{\logoname}{UA_HOR_ENG_CMYK}
 \newcommand{\footername}{4E_PMS302_BR_ENG_RGB}
 \newcommand{\orname}{of}
 \newcommand{\domainname}{uantwerp.be}
 \newcommand{\datename}{Date}
 \newcommand{\subjectname}{Subject}
+\newcommand{\academicyearname}{Academic year}
+\newcommand{\masterthesisname}{Master's thesis}
+\newcommand{\promotorsname}{Promoters}
+\newcommand{\thesisname}{Thesis to obtain the degree of}
 \AtBeginDocument{
   \@ifpackageloaded{babel}{
     \addto\captionsdutch{%
+      \renewcommand{\uaname}{Universiteit Antwerpen}
       \renewcommand{\logoname}{UA_HOR_NED_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_NED_RGB}
       \renewcommand{\orname}{van}
       \renewcommand{\domainname}{uantwerpen.be}
       \renewcommand{\subjectname}{Onderwerp}%
       \renewcommand{\datename}{Datum}%
+      \renewcommand{\academicyearname}{Academiejaar}
+      \renewcommand{\masterthesisname}{Masterproef}
+      \renewcommand{\promotorsname}{Promotoren}
+      \renewcommand{\thesisname}{Proefschrift tot het behalen van de
+        graad van}
     }
     \addto\captionsgerman{%
+      \renewcommand{\uaname}{Universit\"at Antwerpen}
       \renewcommand{\logoname}{UA_HOR_DUI_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_NED_RGB}
       \renewcommand{\orname}{von}
       \renewcommand{\domainname}{uantwerpen.be}
       \renewcommand{\subjectname}{Betreff}%
       \renewcommand{\datename}{Datum}%
+      \renewcommand{\academicyearname}{Akademisches Jahr}
+      \renewcommand{\masterthesisname}{Masterdissertation}
+      \renewcommand{\promotorsname}{Veranstalter}
+      \renewcommand{\thesisname}{Dissertation zur Erreichung des
+        Grades der}
     }
     \addto\captionsfrench{%
+      \renewcommand{\uaname}{Universit\'e d'Anvers}
       \renewcommand{\logoname}{UA_HOR_FRA_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
       \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{\promotorsname}{Promoteurs}
+      \renewcommand{\thesisname}{Th\`ese \`a l'atteinte du degr\'e de}
     }
     \addto\captionsspanish{%
+      \renewcommand{\uaname}{Universidad de Amberes}
       \renewcommand{\logoname}{UA_HOR_SPA_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
       \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{\promotorsname}{Promotores}
+      \renewcommand{\thesisname}{Disertaci\'on a la consecuci\'on del
+        grado de}
     }
   }
   {}
@@ -1439,7 +1470,7 @@ doloribus asperiores repellat.
 %   the title page.
 %    \begin{macrocode}
 %<*ct>      
-\newcommand{\@publisher}{Universiteit Antwerpen\\
+\newcommand{\@publisher}{\uaname\\
 Cursusdienst en reprografie\\
 Campus Groenenborger, G.U.027\\
 Groenenborgerlaan 171\\
@@ -1989,7 +2020,7 @@ E cursusdienst.cgb@uantwerpen.be}
 \lhead[\thepage]{\slshape\rightmark}
 \chead[]{}
 \rhead[\slshape\leftmark]{\thepage}
-\lfoot[Universiteit Antwerpen -- \@facultyacronym]{\@courseversion}
+\lfoot[\uaname{} -- \@facultyacronym]{\@courseversion}
 \cfoot[]{}
 \rfoot[]{\@title{}\@ifmtarg{\@subtitle}{}{ --- \@subtitle}}
 \else
@@ -2011,7 +2042,7 @@ E cursusdienst.cgb@uantwerpen.be}
   \lhead[\thepage]{\slshape\rightmark}
   \chead[]{}
   \rhead[\slshape\leftmark]{\thepage}
-  \lfoot[Universiteit Antwerpen -- \@facultyacronym]{}
+  \lfoot[\uaname{} -- \@facultyacronym]{}
   \cfoot[]{}
   \rfoot[]{\@title{}}
 \else
@@ -2082,7 +2113,7 @@ E cursusdienst.cgb@uantwerpen.be}
 
   CONFIDENTIAL AND PROPRIETARY.
 
-  \copyright{} \@versionyear{} Universiteit Antwerpen, All rights reserved.
+  \copyright{} \@versionyear{} University of Antwerp, All rights reserved.
 }
 %</ct>
 %    \end{macrocode}
@@ -2222,6 +2253,8 @@ L: \@qrlectureri
 %    \end{macrocode}
 % \begin{macro}{\maketitle}
 % And finally, here is the |\maketitle| macro:
+%   \changes{v1.7}{2016/05/01}{Embedded babel translations of keywords
+%   into title page}
 %    \begin{macrocode}
 %<*ct>
 \renewcommand\maketitle{%
@@ -2229,7 +2262,7 @@ L: \@qrlectureri
   \if@qr
   \savebox{\myqrcode}[2.7in][t]{
     \begin{pspicture}(2.7in,2.7in)
-      \psbarcode{\myqrdata}{version=22 encoding=byte eclevel=M}{qrcode}
+      \psbarcode{\myqrdata}{width=1.0 height=1.0 encoding=byte eclevel=M}{qrcode}
     \end{pspicture}
   }
   \fi
@@ -2286,8 +2319,8 @@ L: \@qrlectureri
           (\ua@l pt -\ua@d pt,0.77\paperheight) 
           node [anchor=north east, text width=0.35\paperwidth] {
             \begin{flushright}
-              UNIVERSITEIT ANTWERPEN\\~\\
-              Academiejaar \@academicyear
+              \uppercase\expandafter{\uaname}\\~\\
+              \academicyearname{} \@academicyear
             \end{flushright}}
           (\ua@l pt +\ua@d pt,0.65\paperheight)
           node [anchor = north west, text width = 0.55\paperwidth] {
@@ -2363,7 +2396,7 @@ L: \@qrlectureri
         node [anchor = south west, text width = 0.6\paperwidth] {
           CONFIDENTIAL AND PROPRIETARY\\~\\
 
-          \copyright{} \@versionyear{} Universiteit Antwerpen, 
+          \copyright{} \@versionyear{} \uaname, 
           All rights reserved.}
         (0.9\paperwidth,0.1\paperwidth)
         node [anchor = south east] {
@@ -2382,6 +2415,8 @@ L: \@qrlectureri
 %   And next, the code for the title page of the
 %   |uantwerpenmasterthesis| class: 
 %   \changes{v1.3}{2015/12/31}{Changed eso-pic for tikz}
+%   \changes{v1.7}{2016/05/01}{Embedded babel translations of keywords
+%   into title page}
 %    \begin{macrocode}
 %<*mt>      
 \renewcommand\maketitle{%
@@ -2403,16 +2438,16 @@ L: \@qrlectureri
           \path
           (\ua@ll pt,0.77\paperheight) 
           node [anchor=north west, text width=0.7\paperwidth] {
-            UNIVERSITEIT ANTWERPEN\\~\\
-            Academiejaar \@academicyear\\~\\
+            \uppercase\expandafter{\uaname}\\~\\
+            \academicyearname{} \@academicyear\\~\\
             {\large \@faculty{}}\\~\\
-            Masterproef\\[0.05\paperheight]
+            \masterthesisname{}\\[0.05\paperheight]
             {\Large \bf \@title{}}}
           (\ua@ll pt,0.55\paperheight)
           node [anchor = north west, text width = 0.7\paperwidth] {
             {\large \bf \@author{}}\\~\\~\\
-            \begin{tabular}{@{}p{2.5cm}p{11cm}}
-              \textbf{Promotoren:} 
+            \begin{tabular}{@{}p{2.7cm}p{10.8cm}}
+              \textbf{\promotorsname{}:} 
               & \@supervisori \\
               & \@supervisorii \\
               & \@supervisoriii \\
@@ -2420,7 +2455,7 @@ L: \@qrlectureri
             \end{tabular}
           }
           (\ua@ll pt,0.3\paperheight) node [anchor=north west, text width = 0.7\paperwidth]{%
-            Proefschrift tot het behalen van de graad van\\
+            \thesisname\\
             \@diploma\\
             \@defenselocation, \@defensedate
           };
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
index 341a99f74df..78b7418df23 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
@@ -26,9 +26,9 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{uantwerpencoursetext}
-    [2016/02/04 v1.6 .dtx skeleton file]
-\def\fileversion{1.6}
-\def\filedate{2016/02/04}
+    [2016/05/01 v1.7 .dtx skeleton file]
+\def\fileversion{1.7}
+\def\filedate{2016/05/01}
 
 \newif\if@copyright
 \DeclareOption{copyright}{\@copyrighttrue}
@@ -53,7 +53,7 @@
 \RequirePackage{color}
 \RequirePackage{tikz}
 \if@copyright
-\RequirePackage[firstpage=false,contents={Copyright Universiteit Antwerpen, All Rights Reserved},color=lightgray,scale=3]{background}
+\RequirePackage[firstpage=false,contents={Copyright University of Antwerp, All Rights Reserved},color=lightgray,scale=3]{background}
 \fi
 \if@qr
 \RequirePackage{auto-pst-pdf}
@@ -67,45 +67,73 @@
 \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}
+\newcommand{\uaname}{University of Antwerp}
 \newcommand{\logoname}{UA_HOR_ENG_CMYK}
 \newcommand{\footername}{4E_PMS302_BR_ENG_RGB}
 \newcommand{\orname}{of}
 \newcommand{\domainname}{uantwerp.be}
 \newcommand{\datename}{Date}
 \newcommand{\subjectname}{Subject}
+\newcommand{\academicyearname}{Academic year}
+\newcommand{\masterthesisname}{Master's thesis}
+\newcommand{\promotorsname}{Promoters}
+\newcommand{\thesisname}{Thesis to obtain the degree of}
 \AtBeginDocument{
   \@ifpackageloaded{babel}{
     \addto\captionsdutch{%
+      \renewcommand{\uaname}{Universiteit Antwerpen}
       \renewcommand{\logoname}{UA_HOR_NED_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_NED_RGB}
       \renewcommand{\orname}{van}
       \renewcommand{\domainname}{uantwerpen.be}
       \renewcommand{\subjectname}{Onderwerp}%
       \renewcommand{\datename}{Datum}%
+      \renewcommand{\academicyearname}{Academiejaar}
+      \renewcommand{\masterthesisname}{Masterproef}
+      \renewcommand{\promotorsname}{Promotoren}
+      \renewcommand{\thesisname}{Proefschrift tot het behalen van de
+        graad van}
     }
     \addto\captionsgerman{%
+      \renewcommand{\uaname}{Universit\"at Antwerpen}
       \renewcommand{\logoname}{UA_HOR_DUI_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_NED_RGB}
       \renewcommand{\orname}{von}
       \renewcommand{\domainname}{uantwerpen.be}
       \renewcommand{\subjectname}{Betreff}%
       \renewcommand{\datename}{Datum}%
+      \renewcommand{\academicyearname}{Akademisches Jahr}
+      \renewcommand{\masterthesisname}{Masterdissertation}
+      \renewcommand{\promotorsname}{Veranstalter}
+      \renewcommand{\thesisname}{Dissertation zur Erreichung des
+        Grades der}
     }
     \addto\captionsfrench{%
+      \renewcommand{\uaname}{Universit\'e d'Anvers}
       \renewcommand{\logoname}{UA_HOR_FRA_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
       \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{\promotorsname}{Promoteurs}
+      \renewcommand{\thesisname}{Th\`ese \`a l'atteinte du degr\'e de}
     }
     \addto\captionsspanish{%
+      \renewcommand{\uaname}{Universidad de Amberes}
       \renewcommand{\logoname}{UA_HOR_SPA_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
       \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{\promotorsname}{Promotores}
+      \renewcommand{\thesisname}{Disertaci\'on a la consecuci\'on del
+        grado de}
     }
   }
   {}
@@ -175,7 +203,7 @@
 \newcommand{\courseversion}[1]{\renewcommand{\@courseversion}{#1}}
 \newcommand{\@versionyear}{}
 \newcommand{\versionyear}[1]{\renewcommand{\@versionyear}{#1}}
-\newcommand{\@publisher}{Universiteit Antwerpen\\
+\newcommand{\@publisher}{\uaname\\
 Cursusdienst en reprografie\\
 Campus Groenenborger, G.U.027\\
 Groenenborgerlaan 171\\
@@ -356,7 +384,7 @@ E cursusdienst.cgb@uantwerpen.be}
 \lhead[\thepage]{\slshape\rightmark}
 \chead[]{}
 \rhead[\slshape\leftmark]{\thepage}
-\lfoot[Universiteit Antwerpen -- \@facultyacronym]{\@courseversion}
+\lfoot[\uaname{} -- \@facultyacronym]{\@courseversion}
 \cfoot[]{}
 \rfoot[]{\@title{}\@ifmtarg{\@subtitle}{}{ --- \@subtitle}}
 \else
@@ -385,7 +413,7 @@ E cursusdienst.cgb@uantwerpen.be}
 
   CONFIDENTIAL AND PROPRIETARY.
 
-  \copyright{} \@versionyear{} Universiteit Antwerpen, All rights reserved.
+  \copyright{} \@versionyear{} University of Antwerp, All rights reserved.
 }
 \pgfmathsetmacro{\ua@Wh}{\paperwidth}
 \pgfmathsetmacro{\ua@Xh}{0.2\paperheight}
@@ -437,7 +465,7 @@ L: \@qrlectureri
   \if@qr
   \savebox{\myqrcode}[2.7in][t]{
     \begin{pspicture}(2.7in,2.7in)
-      \psbarcode{\myqrdata}{version=22 encoding=byte eclevel=M}{qrcode}
+      \psbarcode{\myqrdata}{width=1.0 height=1.0 encoding=byte eclevel=M}{qrcode}
     \end{pspicture}
   }
   \fi
@@ -494,8 +522,8 @@ L: \@qrlectureri
           (\ua@l pt -\ua@d pt,0.77\paperheight)
           node [anchor=north east, text width=0.35\paperwidth] {
             \begin{flushright}
-              UNIVERSITEIT ANTWERPEN\\~\\
-              Academiejaar \@academicyear
+              \uppercase\expandafter{\uaname}\\~\\
+              \academicyearname{} \@academicyear
             \end{flushright}}
           (\ua@l pt +\ua@d pt,0.65\paperheight)
           node [anchor = north west, text width = 0.55\paperwidth] {
@@ -561,7 +589,7 @@ L: \@qrlectureri
         node [anchor = south west, text width = 0.6\paperwidth] {
           CONFIDENTIAL AND PROPRIETARY\\~\\
 
-          \copyright{} \@versionyear{} Universiteit Antwerpen,
+          \copyright{} \@versionyear{} \uaname,
           All rights reserved.}
         (0.9\paperwidth,0.1\paperwidth)
         node [anchor = south east] {
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls
index c98fb82b7fd..00284556fec 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls
@@ -25,8 +25,8 @@
 %% The Current Maintainer of this work is Walter Daems.
 %% 
 \ProvidesClass{uantwerpenletter}
-\def\fileversion{1.6}
-\def\filedate{2016/02/04}
+\def\fileversion{1.7}
+\def\filedate{2016/05/01}
 
 \newif\if@filled
 \DeclareOption{filled}{\@filledtrue}
@@ -54,45 +54,73 @@
 \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}
+\newcommand{\uaname}{University of Antwerp}
 \newcommand{\logoname}{UA_HOR_ENG_CMYK}
 \newcommand{\footername}{4E_PMS302_BR_ENG_RGB}
 \newcommand{\orname}{of}
 \newcommand{\domainname}{uantwerp.be}
 \newcommand{\datename}{Date}
 \newcommand{\subjectname}{Subject}
+\newcommand{\academicyearname}{Academic year}
+\newcommand{\masterthesisname}{Master's thesis}
+\newcommand{\promotorsname}{Promoters}
+\newcommand{\thesisname}{Thesis to obtain the degree of}
 \AtBeginDocument{
   \@ifpackageloaded{babel}{
     \addto\captionsdutch{%
+      \renewcommand{\uaname}{Universiteit Antwerpen}
       \renewcommand{\logoname}{UA_HOR_NED_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_NED_RGB}
       \renewcommand{\orname}{van}
       \renewcommand{\domainname}{uantwerpen.be}
       \renewcommand{\subjectname}{Onderwerp}%
       \renewcommand{\datename}{Datum}%
+      \renewcommand{\academicyearname}{Academiejaar}
+      \renewcommand{\masterthesisname}{Masterproef}
+      \renewcommand{\promotorsname}{Promotoren}
+      \renewcommand{\thesisname}{Proefschrift tot het behalen van de
+        graad van}
     }
     \addto\captionsgerman{%
+      \renewcommand{\uaname}{Universit\"at Antwerpen}
       \renewcommand{\logoname}{UA_HOR_DUI_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_NED_RGB}
       \renewcommand{\orname}{von}
       \renewcommand{\domainname}{uantwerpen.be}
       \renewcommand{\subjectname}{Betreff}%
       \renewcommand{\datename}{Datum}%
+      \renewcommand{\academicyearname}{Akademisches Jahr}
+      \renewcommand{\masterthesisname}{Masterdissertation}
+      \renewcommand{\promotorsname}{Veranstalter}
+      \renewcommand{\thesisname}{Dissertation zur Erreichung des
+        Grades der}
     }
     \addto\captionsfrench{%
+      \renewcommand{\uaname}{Universit\'e d'Anvers}
       \renewcommand{\logoname}{UA_HOR_FRA_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
       \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{\promotorsname}{Promoteurs}
+      \renewcommand{\thesisname}{Th\`ese \`a l'atteinte du degr\'e de}
     }
     \addto\captionsspanish{%
+      \renewcommand{\uaname}{Universidad de Amberes}
       \renewcommand{\logoname}{UA_HOR_SPA_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
       \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{\promotorsname}{Promotores}
+      \renewcommand{\thesisname}{Disertaci\'on a la consecuci\'on del
+        grado de}
     }
   }
   {}
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls
index 230308d9037..5677350570e 100644
--- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls
+++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls
@@ -26,9 +26,9 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{uantwerpenmasterthesis}
-    [2016/02/04 v1.6 .dtx skeleton file]
-\def\fileversion{1.6}
-\def\filedate{2016/02/04}
+    [2016/05/01 v1.7 .dtx skeleton file]
+\def\fileversion{1.7}
+\def\filedate{2016/05/01}
 
 \newif\if@titlepagenoartwork
 \DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
@@ -56,45 +56,73 @@
 \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}
+\newcommand{\uaname}{University of Antwerp}
 \newcommand{\logoname}{UA_HOR_ENG_CMYK}
 \newcommand{\footername}{4E_PMS302_BR_ENG_RGB}
 \newcommand{\orname}{of}
 \newcommand{\domainname}{uantwerp.be}
 \newcommand{\datename}{Date}
 \newcommand{\subjectname}{Subject}
+\newcommand{\academicyearname}{Academic year}
+\newcommand{\masterthesisname}{Master's thesis}
+\newcommand{\promotorsname}{Promoters}
+\newcommand{\thesisname}{Thesis to obtain the degree of}
 \AtBeginDocument{
   \@ifpackageloaded{babel}{
     \addto\captionsdutch{%
+      \renewcommand{\uaname}{Universiteit Antwerpen}
       \renewcommand{\logoname}{UA_HOR_NED_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_NED_RGB}
       \renewcommand{\orname}{van}
       \renewcommand{\domainname}{uantwerpen.be}
       \renewcommand{\subjectname}{Onderwerp}%
       \renewcommand{\datename}{Datum}%
+      \renewcommand{\academicyearname}{Academiejaar}
+      \renewcommand{\masterthesisname}{Masterproef}
+      \renewcommand{\promotorsname}{Promotoren}
+      \renewcommand{\thesisname}{Proefschrift tot het behalen van de
+        graad van}
     }
     \addto\captionsgerman{%
+      \renewcommand{\uaname}{Universit\"at Antwerpen}
       \renewcommand{\logoname}{UA_HOR_DUI_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_NED_RGB}
       \renewcommand{\orname}{von}
       \renewcommand{\domainname}{uantwerpen.be}
       \renewcommand{\subjectname}{Betreff}%
       \renewcommand{\datename}{Datum}%
+      \renewcommand{\academicyearname}{Akademisches Jahr}
+      \renewcommand{\masterthesisname}{Masterdissertation}
+      \renewcommand{\promotorsname}{Veranstalter}
+      \renewcommand{\thesisname}{Dissertation zur Erreichung des
+        Grades der}
     }
     \addto\captionsfrench{%
+      \renewcommand{\uaname}{Universit\'e d'Anvers}
       \renewcommand{\logoname}{UA_HOR_FRA_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
       \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{\promotorsname}{Promoteurs}
+      \renewcommand{\thesisname}{Th\`ese \`a l'atteinte du degr\'e de}
     }
     \addto\captionsspanish{%
+      \renewcommand{\uaname}{Universidad de Amberes}
       \renewcommand{\logoname}{UA_HOR_SPA_CMYK}
       \renewcommand{\footername}{4E_PMS302_BR_ENG_RGB}
       \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{\promotorsname}{Promotores}
+      \renewcommand{\thesisname}{Disertaci\'on a la consecuci\'on del
+        grado de}
     }
   }
   {}
@@ -186,7 +214,7 @@
   \lhead[\thepage]{\slshape\rightmark}
   \chead[]{}
   \rhead[\slshape\leftmark]{\thepage}
-  \lfoot[Universiteit Antwerpen -- \@facultyacronym]{}
+  \lfoot[\uaname{} -- \@facultyacronym]{}
   \cfoot[]{}
   \rfoot[]{\@title{}}
 \else
@@ -245,16 +273,16 @@
           \path
           (\ua@ll pt,0.77\paperheight)
           node [anchor=north west, text width=0.7\paperwidth] {
-            UNIVERSITEIT ANTWERPEN\\~\\
-            Academiejaar \@academicyear\\~\\
+            \uppercase\expandafter{\uaname}\\~\\
+            \academicyearname{} \@academicyear\\~\\
             {\large \@faculty{}}\\~\\
-            Masterproef\\[0.05\paperheight]
+            \masterthesisname{}\\[0.05\paperheight]
             {\Large \bf \@title{}}}
           (\ua@ll pt,0.55\paperheight)
           node [anchor = north west, text width = 0.7\paperwidth] {
             {\large \bf \@author{}}\\~\\~\\
-            \begin{tabular}{@{}p{2.5cm}p{11cm}}
-              \textbf{Promotoren:}
+            \begin{tabular}{@{}p{2.7cm}p{10.8cm}}
+              \textbf{\promotorsname{}:}
               & \@supervisori \\
               & \@supervisorii \\
               & \@supervisoriii \\
@@ -262,7 +290,7 @@
             \end{tabular}
           }
           (\ua@ll pt,0.3\paperheight) node [anchor=north west, text width = 0.7\paperwidth]{%
-            Proefschrift tot het behalen van de graad van\\
+            \thesisname\\
             \@diploma\\
             \@defenselocation, \@defensedate
           };