summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/uantwerpendocs
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-07-14 03:01:33 +0000
committerNorbert Preining <norbert@preining.info>2021-07-14 03:01:33 +0000
commit3303a89b11161d66ec78811056b85306f696cc09 (patch)
tree32dec4376d10f3e3aa82049a3388462e39914a70 /macros/latex/contrib/uantwerpendocs
parent4ac920a9909dd7d233ed3662bb576e1ae4ade873 (diff)
CTAN sync 202107140301
Diffstat (limited to 'macros/latex/contrib/uantwerpendocs')
-rw-r--r--macros/latex/contrib/uantwerpendocs/beamerthemeuantwerpenuserguide.pdfbin3218742 -> 3218647 bytes
-rw-r--r--macros/latex/contrib/uantwerpendocs/uantwerpenbamathesis-example.pdfbin87390 -> 89611 bytes
-rw-r--r--macros/latex/contrib/uantwerpendocs/uantwerpencoursetext-example.pdfbin137244 -> 94452 bytes
-rw-r--r--macros/latex/contrib/uantwerpendocs/uantwerpendocs.dtx3934
-rw-r--r--macros/latex/contrib/uantwerpendocs/uantwerpendocs.ins16
-rw-r--r--macros/latex/contrib/uantwerpendocs/uantwerpendocs.pdfbin382547 -> 348939 bytes
-rw-r--r--macros/latex/contrib/uantwerpendocs/uantwerpenexam-example1.pdfbin104918 -> 112604 bytes
-rw-r--r--macros/latex/contrib/uantwerpendocs/uantwerpenexam-example2.pdfbin151732 -> 114124 bytes
-rw-r--r--macros/latex/contrib/uantwerpendocs/uantwerpenletter-example.pdfbin58977 -> 49368 bytes
-rw-r--r--macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example1.pdfbin217816 -> 221098 bytes
-rw-r--r--macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example2.pdfbin298749 -> 303784 bytes
-rw-r--r--macros/latex/contrib/uantwerpendocs/uantwerpenreport-example.pdfbin0 -> 207486 bytes
12 files changed, 1957 insertions, 1993 deletions
diff --git a/macros/latex/contrib/uantwerpendocs/beamerthemeuantwerpenuserguide.pdf b/macros/latex/contrib/uantwerpendocs/beamerthemeuantwerpenuserguide.pdf
index 486b53bab7..8ce9d974f9 100644
--- a/macros/latex/contrib/uantwerpendocs/beamerthemeuantwerpenuserguide.pdf
+++ b/macros/latex/contrib/uantwerpendocs/beamerthemeuantwerpenuserguide.pdf
Binary files differ
diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpenbamathesis-example.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpenbamathesis-example.pdf
index ef18520d43..884bb06bc7 100644
--- a/macros/latex/contrib/uantwerpendocs/uantwerpenbamathesis-example.pdf
+++ b/macros/latex/contrib/uantwerpendocs/uantwerpenbamathesis-example.pdf
Binary files differ
diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpencoursetext-example.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpencoursetext-example.pdf
index 0faf5cd26a..49bb7f20aa 100644
--- a/macros/latex/contrib/uantwerpendocs/uantwerpencoursetext-example.pdf
+++ b/macros/latex/contrib/uantwerpendocs/uantwerpencoursetext-example.pdf
Binary files differ
diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpendocs.dtx b/macros/latex/contrib/uantwerpendocs/uantwerpendocs.dtx
index 264e1a7307..6b6be0147a 100644
--- a/macros/latex/contrib/uantwerpendocs/uantwerpendocs.dtx
+++ b/macros/latex/contrib/uantwerpendocs/uantwerpendocs.dtx
@@ -24,19 +24,23 @@
%<*driver>
\ProvidesFile{uantwerpendocs.dtx}
%</driver>
-%<ct|bmt|mt|le|ex|bmr>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+%<@@=uantwerpendocs>
+%<ct|bmt|mt|pt|rp|le|ex|bmr>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+%<clo>\ProvidesFile{uantwerpencommonoptions.clo}
+%<cls>\ProvidesPackage{uantwerpencolorlogoscheme}
%<ct>\ProvidesClass{uantwerpencoursetext}
%<mt>\ProvidesClass{uantwerpenmasterthesis}
%<bmt>\ProvidesClass{uantwerpenbamathesis}
%<pt>\ProvidesClass{uantwerpenphdthesis}
+%<rp>\ProvidesClass{uantwerpenreport}
%<le>\ProvidesClass{uantwerpenletter}
%<ex>\ProvidesClass{uantwerpenexam}
%<bmr>\ProvidesPackage{beamerthemeuantwerpen}
-%<ct|bmt|mt|pt|le|ex|brm> [2021/03/23 v3.2 .dtx skeleton file]
+%<cls|ct|bmt|mt|pt|rp|le|ex|bmr> [2021/07/11 v4.0 .dtx skeleton file]
%
%<mt>\errmessage{This class is obsolete, use the uantwerpenbamathesis class instead !}
-\def\fileversion{3.2}
-\def\filedate{2021/03/23}
+\def\fileversion{4.0}
+\def\filedate{2021/07/11}
%<*driver>
\documentclass[a4paper]{ltxdoc}
\usepackage{makeidx}
@@ -106,9 +110,13 @@
% for TexLive distribution}
% \changes{v3.2}{2021/03/21}{\@ Small bugfixes (e.g., frame numbering
% instead of page numbering)}
+% \changes{v4.0}{2021/07/11}{\@ Last update of house style (phdthesis
+% coursetext and bamathesis), added uantwerpenreport class,
+% improvements based on use feedback
+% and major rework to benefit from expl3, removed all diploma codes
+% to ease maintainability}
%
-%
-% \DoNotIndex{\newcommand,\newenvironment,\begin,\bfseries,\draw,\clip,\else,\fi,\if,\fill,\filldraw,\ifthenelse,\ifx,\textwidth,\node,\\}
+% \DoNotIndex{\newcommand,\newenvironment,\begin,\bfseries,\draw,\clip,\else,\fi,\if,\fill,\filldraw,\ifthenelse,\ifx,\textwidth,\node,\\,\@empty,\@emptymacro,\@tempdima,\@tempdimb,\@tempswatrue,\{,\},\ ,\bf,\BODY,\break,\Alph,\and,\define@key,\color,\dx,\dy,\g,\gdef,\hbox,\tiny,\scriptsize,\footnotesize,\small,\normalsize,\large,\Large,\LARGE,\huge,\Huge,\l,\LaTeX,\let,\p@,\relax,\renewcommand,\Requirepackage,\textbf,\textsf,\texttt,\textbackslash,}
% \setlength{\parindent}{0em}
% \addtolength{\parskip}{0.5\baselineskip}
%
@@ -123,22 +131,12 @@
% \section{Introduction}
%
% This package implements the house style of Universiteit Antwerpen
-% (version 2021) for letters, course texts, master/PhD theses and
-% slides (beamer). It also implements a class to format exams (which
-% is for efficiency reasons and ease of copying not fully UAntwerpen
-% house style compliant).
+% (version 2021) for letters, course texts, master/PhD theses, reports and
+% slides (beamer). It also implements a class to format exams.
% Using these class files will make it easy for you to make and keep
% your course texts and theses compliant to this version and future
% versions of the UAntwerpen house style.
%
-% Unfortunately, this version is a transitional package, because the
-% house style renewal is introduced gradually. This means that the
-% letter class and slide theme have been renewed, while the course
-% texts and theses have not. Why are the latter not ready? Because
-% the house style makeover team has not yet come up with a
-% specification. This puts the message of the next paragraph against
-% the correct background.
-%
% If you think (1) there's an error in compliancy w.r.t. the house
% style, (2) there's a feature missing in this class or theme file, or
% (3) there's a bug in this package, please, contact me through e-mail
@@ -150,7 +148,7 @@
% or just kind words.
%
% \section{Synopsis}
-% The |coursetext|, |bamathesis| 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
@@ -159,14 +157,16 @@
% UAntwerpen house style, and they also typeset the rest of your
% document appropriately.
%
+% The |report| class is derived from the standard \LaTeX{}
+% |report| class. It is intended for writing generic (e.g. research or
+% educational) reports.
% The |letter| class is derived from the standard \LaTeX{}
% |letter| class. It is intended to be used for writing business
% letters. It is compliant to the house style and allows for using
% windowed envelopes of the DL format, with right-aligned window.
%
% The |exam| class is derived from the standard \LaTeX{}
-% |article| class and is for efficiency reasons not fully UAntwerpen
-% house style compliant.
+% |article| class.
%
% The slides come under the form of a custom beamer theme.
%
@@ -189,44 +189,69 @@
% Using this package, requires the following packages:
% \begin{itemize}
% \item the |adjustbox| package
-% \item the |atbegshi| package
-% \item the |auto-pst-pdf| package
% \item the |babel| package
% \item the |background| package
% \item the |color| package
% \item the |environ| package
% \item the |eso-pic| package
% \item the |etooblox| package
+% \item the |expl3| package
% \item the |fancyhdr| package
% \item the |geometry| package
% \item the |graphicx| package
-% \item the |hyperref| package
% \item the |iftex| package
% \item the |ifthen| package
-% \item the |pst-barcode| package
% \item the |tikz| package
% \item the |ulem| package
-% \end{itemize}
-% and optionally
-% \begin{itemize}
-% \item the |varioref| package.
+% \item the |xparse| package
% \end{itemize}
% So make sure these packages are available to your
% \LaTeX{} compiler.
%
+% You will notice that as of version 4.0 |expl3| and |xparse| are part
+% of the game. Indeed, the uantwerpendocs package will be slowly
+% refactored to \LaTeX3{} to prepare for a package that is easier to
+% maintain. However, the \LaTeX3{} constructs are never exposed to the
+% user of the classes. So: don't worry about it!
+%
+%
+% \section{A note on fonts}
+%
+% The house style of the University of Antwerp recommends using
+% \begin{itemize}
+% \item Prenton RP Pro for the logos and sublogos; all the logoware is
+% included in this package, so nothing to worry about.
+% \item ITC Officina Sans for posters, titlepages, cards a.s.o.\\
+% This font is not included in this package and is not a part of the
+% \LaTeX{} standard fonts. However, if you have a valid license, for
+% this font, I can help you to set it up, such that you can typeset
+% proper title pages for course texts, PhD theses and the like. Just
+% send me an e-mail.
+% \item Calibri for office-like documents. Just load the |\fontspec|
+% package and issue a |\setmainfont{Calibri}| and you're all set.
+% \end{itemize}
+%
+% Adhering to these fonts is recommended, but not
+% enforced. Personally, I always use a Palatine serif font for my courses.
+% I did not find any better (free) font yet. My second favorite is
+% still the original computer modern font by Donald E. Knuth. You are
+% reading it right now.
+%
+%
% \section{Portability}
-% This class file should be ready to use with all common \LaTeX{}
-% compilers (PDF\LaTeX{}, \LaTeX{}, \XeLaTeX{}, \LuaLaTeX{}, \ldots)
-% from the major \TeX{}-distributions (TeTeX, TexLive, MikTeX). If you
-% experience problems, please inform the author.
+% These class files should be ready to use with all common modern \LaTeX{}
+% compilers (PDF\LaTeX{}, \XeLaTeX{}, \LuaLaTeX{}, \ldots)
+% from the major \TeX{}-distributions (TeTeX, TexLive, MikTeX).
+% However, using an old \LaTeX{} + dvips setup is likely to get you into font
+% problems. Advice: ditch the route via dvi. If you experience other
+% problems, please inform the author.
%
% \section{Usage}
%
% \subsection{Basic Usage}
% \label{sec:basicusage}
% Use the templates provided below. Remember to \LaTeX{} your source
-% file twice in order to have the title and final page correctly
-% aligned.
+% file twice.
%
% Especially in the beamer theme some features require to run \LaTeX{}
% twice in order to get the position of some elements correct.
@@ -234,12 +259,10 @@
% \subsubsection{\texttt{uantwerpencoursetext} class}
% Use the following harness for your \LaTeX{} course text:
% \begin{verbatim}
-% \documentclass[a4paper]{uantwerpencoursetext}
+% \documentclass[ti,a4paper]{uantwerpencoursetext}
%
% \usepackage{<include any packages you require here>}
%
-% \facultyacronym{<put your faculty's acronym here}
-%
% \title{<put your title here>}
% \subtitle{<put your subtitle here>}
% \author{<put your name here>}
@@ -248,8 +271,8 @@
% \versionyear{<the publication date of the course here>}
%
% \lecturer{<person teaching the course>}
-% \programme{<descriptor of first programme>}
-% \course{<course code>}{<name of the course>}%
+% \degree{<official degree title>}
+% \course{<course code>}{<name of the course>}
%
% \academicyear{<XXXX-YYYY>}
%
@@ -264,25 +287,31 @@
% \end{document}
% \end{verbatim}
%
-% The available faculty acronyms are listed in a table on page
-% \pageref{acronyms}.
+% As of version 4.0:
+% \begin{itemize}
+% \item the faculty is specified as an option to the |\documentclass|
+% construct. You can find the available options in
+% section~\ref{sec:classopt}.
+% \item you are reponsible yourself to provide the correct
+% degree description! Maintaining the a correct list of UAntwerpen
+% bachelor and master programs with all their specializations is
+% beyond my ambition.
+% \end{itemize}
%
% \subsubsection{\texttt{uantwerpenbamathesis} class}
% Use the following harness for your \LaTeX{} bachelor or master's
% thesis:
% \begin{verbatim}
-% \documentclass[a4paper]{uantwerpenbamathesis}
+% \documentclass[ti,a4paper]{uantwerpenbamathesis}
%
% \usepackage{<include any packages you require here>}
%
-% \facultyacronym{<put your faculty's acronym here>}
-%
% \title{<put your title here>}
% \author{<put your name here>}
-% \supervisori{<put supervisor's name(s) here>}{<affiliation goes here>}
-% \supervisorii{<put supervisor's name(s) here>}{<affiliation goes here>}
-% \supervisoriii{<put supervisor's name(s) here>}{<affiliation goes here>}
-% \supervisoriv{<put supervisor's name(s) here>}{<affiliation goes here>}
+% \supervisor{<put supervisor's name(s) here>}{<affiliation goes here>}
+% \supervisor{<put supervisor's name(s) here>}{<affiliation goes here>}
+% \supervisor{<put supervisor's name(s) here>}{<affiliation goes here>}
+% \supervisor{<put supervisor's name(s) here>}{<affiliation goes here>}
%
% % classmarker
% \academicyear{<XXXX-YYYY>}
@@ -298,13 +327,13 @@
% \end{document}
% \end{verbatim}
%
-% The available faculty acronyms are listed in a table on page
-% \pageref{acronyms}.
+% The available faculty options are listed in a table on page
+% \pageref{sec:classopt}.
%
% \subsubsection{\texttt{uantwerpenletter} class}
% Use the following harness for your \LaTeX{} letter:
% \begin{verbatim}
-% \documentclass[a4paper]{uantwerpenletter}
+% \documentclass[a4paper,ti]{uantwerpenletter}
%
% % setup fonts according to your specific TeX compiler setup
%
@@ -313,7 +342,6 @@
% % \logo{} only specify if you want to use your unit's logo
%
% \sender{<put your name here>}{<put your title/role here>}
-% \facultyacronym{<put your faculty's acronym here>}
% \unit{<put your unit here>}
% \address{<put your multi-line address here>}
% \email{<user name>}{<domain name>}
@@ -345,37 +373,33 @@
% \end{document}
% \end{verbatim}
%
-% The available faculty acronyms are listed in a table on page
-% \pageref{acronyms}. You may use lists in the |\carboncopy| and
+% The available faculty options are listed in a table on page
+% \pageref{sec:classopt}. You may use lists in the |\carboncopy| and
% |\enclosed| commands. The spacing will be compact.
%
% \subsubsection{\texttt{uantwerpenphdthesis} class}
%
% \begin{verbatim}
-% \documentclass[b5paper,10pt,twoside,openright,filled]{uantwerpenphdthesis}
+% \documentclass[ti,10pt,twoside,openright,filled]{uantwerpenphdthesis}
%
% You may want to use common fonts
% \usepackage{<include any additional packages you require here>}
%
% \title{<put your title here>}
% \author{<put your name here>}
-% \facultyacronym{<put your faculty's acronym here>}
-% \programme{PHD}
-% {<put your programme's acronym here>}
-% {<put your specialization's acronym here>}
% \affiliation{<put your affiliation here>}
% \address{<put your contact details here>}
%
-% \supervisori{<put supervisor's name here>}{<affiliation goes here>}
-% \supervisorii{<put supervisor's name here>}{<affiliation goes here>}
+% \supervisor{<put supervisor's name here>}{<affiliation goes here>}
+% \supervisor{<put supervisor's name here>}{<affiliation goes here>}
%
% \jurychairman{<put chairman's name here>}{<affiliation goes here>}
%
-% \jurymemberi{<put member's name here>}{<affiliation goes here>}
-% \jurymemberii{<put member's name here>}{<affiliation goes here>}
-% \jurymemberiii{<put member's name here>}{<affiliation goes here>}
+% \jurymember{<put member's name here>}{<affiliation goes here>}
+% \jurymember{<put member's name here>}{<affiliation goes here>}
+% \jurymember{<put member's name here>}{<affiliation goes here>}
%
-% \phddegree{<put official degree name here>}
+% \degree{<put official degree name here>}
% \defenselocation{<put location of defense here>}
% \defensedate{<put defense year here>}
% \titlepageimage{<set file name of title page image here>}
@@ -401,6 +425,45 @@
% \end{document}
% \end{verbatim}
%
+% The available faculty options are listed in a table on page
+% \pageref{sec:classopt}.
+%
+% \subsubsection{\texttt{uantwerpenreport} class}
+%
+% \begin{verbatim}
+% \documentclass[ti,10pt,twoside,openright,filled]{uantwerpenreport}
+%
+% You may want to use common fonts
+% \usepackage{<include any additional packages you require here>}
+%
+% \title{<put your title here>}
+% \author{<put your name here>}
+% \affiliation{<put your affiliation here>}
+% \address{<put your contact details here>}
+%
+% \titlepageimage{<set file name of title page image here>}
+%
+% \begin{document}
+%
+% \maketitle
+% \frontmatter
+% \tableofcontents
+% \mainmatter
+%
+% % write your PhD text here
+%
+% \appendix
+%
+% % write appendix material here
+%
+% \makefinalpage
+%
+% \end{document}
+% \end{verbatim}
+%
+% The available faculty options are listed in a table on page
+% \pageref{sec:classopt}.
+%
% \subsubsection{\texttt{uantwerpenbeamer} theme}
%
%
@@ -434,12 +497,46 @@
% \end{verbatim}
%
% \subsection{The class options explained}
-%
+% \label{sec:classopt}
% The classes have several options. They are listed below.
% After every option, it has been indicated to which class the option
% applies (between square brackets, without prefix uantwerpen).
% \changes{v1.1}{2013/05/28}{Added option user documentation}
%
+% \DescribeMacro{xx(x)} [letter / coursetext / bamathesis / phdthesis
+% / report / beamertheme]\\
+% \begin{center}\small
+% \begin{tabular}{cp{10cm}}
+% \toprule
+% Option & Faculty \\
+% \midrule
+% |be| & Faculty of Business and Economics\\
+% & Faculteit Bedrijfswetenschappen en Economie\\
+% |fbd| & Faculty of Pharmaceutical, Biomedical and Veterinary Sciences\\
+% & Faculteit Farmaceutische, Biomedische en Diergeneeskundige
+% Wetenschappen\\
+% |ggw| & Faculty of Medicine and Health Sciences\\
+% & Faculteit Geneeskunde en Gezondheidswetenschappen\\
+% |lw| & Faculty of Arts \\
+% & Faculteit Letteren en Wijsbegeerte\\
+% |ow| & Faculty of Design Sciences\\
+% & Faculteit Ontwerpwetenschappen\\
+% |re| & Faculty of Law\\
+% & Faculteit Rechten\\
+% |sw| & Faculty of Social Sciences\\
+% & Faculteit Sociale Wetenschappen\\
+% |ti| & Faculty of Applied Engineering\\
+% & Faculteit Toegepaste Ingenieurswetenschappen\\
+% |we| & Faculty of Science\\
+% & Faculteit Wetenschappen\\
+% |iob| & Institute of Development Policy\\
+% & Instituut voor Ontwikkelingsbeleid- en beheer\\
+% \bottomrule
+% \end{tabular}
+% \end{center}
+% You can specify the correct faculty using the following options:
+% This will activate the correct color scheme and logoset.
+%
% \DescribeMacro{copyright} [coursetext]\\
% This option forces printing a watermark on every page. For the
% paper version of your document, this is inappropriate, but for any
@@ -452,7 +549,7 @@
% that copy to students and suppressing the fillout pages.
%
% \DescribeMacro{filled} [letter / coursetext /
-% bamathesis / phdthesis]\\
+% bamathesis / phdthesis / report]\\
% 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
@@ -460,98 +557,24 @@
% issued. However, if you care about the typographic readability of
% your text, you shouldn't use this option.
%
-% \DescribeMacro{titlepagenoartwork} [coursetext /
-% 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 /
-% 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
-% title page.
-%
-% \DescribeMacro{qr} [coursetext]\\
-% This option allows you to generate a QR code containing the details of
-% the course on the title page or the table-only title page. For
-% this option to work, the package pstricks is loaded. It will not
-% work with pdf\LaTeX{} unless you enable shell escape. Read your
-% pdf\LaTeX{}-package documentation on how to do that.
-%
% Common sets of options depend on the purpose:
% \begin{itemize}
% \item to make a text ready for electronic distribution:
% |a4paper|, |copyright|.
-% \item to make a camera-ready text (for printing) in case
-% the cover is printed on a pre-printed color artwork cover sheet is:
-% |a4paper|, |qr|, |titlepagenoartwork|.
-% \item to make a camera-ready text (for printing) in case the cover
-% is typeset based on table data:
-% |a4paper|, |qr|, |titlepagetableonly|.
+% \item to make a camera-ready text (for printing):
+% |a4paper|
% \item to make a letter:
% no options (filling a letter is discouraged)
% \item to make an exam:
% no options (filling an exam is discouraged)
% \item to make a PhD text:
-% |b5paper|, |twoside|, |openright| and |filled|
+% |twoside|, |openright| and (optionally) |filled|
+% \item to make a report:
+% |twoside|, |openright| and (optionally) |filled|
% \end{itemize}
%
% \subsection{The macros explained}
%
-% \subsubsection{Common macros}
-%
-% After every macro, it has been indicated to which class the macro
-% applies (between square brackets), and whether it is mandatory or not.
-%
-% \DescribeMacro{\facultyacronym} [coursetext /
-% 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
-% acronym.
-% If you're missing a faculty or institute, please ask the
-% author to complete the list.
-%
-% The available acronyms are:
-% \changes{v1.9}{2018/03/02}{Added ASoE (Antwerp School of Education)}
-% \changes{v3.0}{2021/02/05}{Changed REC in RE, TEW in BE and WET in WE
-% (according to official naming scheme)}
-% \label{acronyms}
-% \begin{center}
-% \begin{tabular}{cl}
-% \toprule
-% Acronym & Faculty name \\
-% \midrule
-% ASoE
-% & Antwerp School of Education\\
-% CPG
-% & Centrum Pieter Gillis\\
-% FBD
-% & Faculteit Farmaceutische, Biomedische en Diergeneeskundige Wetenschappen\\
-% GGW
-% & Faculteit Geneeskunde en Gezondheidswetenschappen\\
-% IOB
-% & Instituut voor Ontwikkelingsbeleid- en beheer\\
-% LW
-% & Faculteit Letteren en Wijsbegeerte\\
-% OW
-% & Faculteit Ontwerpwetenschappen\\
-% SW
-% & Faculteit Sociale Wetenschappen\\
-% RE
-% & Faculteit Rechten\\
-% BE
-% & Faculteit Bedrijfswetenschappen en Economie\\
-% TI
-% & Faculteit Toegepaste Ingenieurswetenschappen\\
-% WE
-% & Faculteit Wetenschappen\\
-% \bottomrule
-% \end{tabular}
-% \end{center}
-%
% \subsubsection{Macros for the coursetext, bamathesis, phdthesis
% classes}
%
@@ -560,12 +583,14 @@
% Use this macro to specify the academic year in full, i.e. in the
% form |XXXX-YYYY|.
%
-% \DescribeMacro{\author} [coursetext / bamathesis / phdthesis ] (mandatory)\\
+% \DescribeMacro{\author} [coursetext / bamathesis / phdthesis /
+% report ] (mandatory)\\
% This macro sets the author of the document.
-% It also sets the |pdfauthor| tag of the hyperref package, so that
+% It also sets the |pdfauthor| tag of the hyperref package (if it is
+% loaded), so that
% the PDF-document meta-information is correct.
%
-% \DescribeMacro{\copyrightnotices} [coursetext]
+% \DescribeMacro{\copyrightnotices} [coursetext / report]
% (optional)\\
% Use this macro to specify additional copyright notice messages to
% appear in the copyright notice on the bottom of page 2 of your
@@ -597,15 +622,6 @@
% An example of such a code: 1001FTIWIS, for the first-semester
% mathematics course of the Faculty of Applied Engineering.
%
-% For courses of the Faculty of Applied Engineering, the name should
-% be of the form |x-YYYYYYYY| with |x| the number of the
-% semester and |YYYYYYYY| the official name of the course.
-%
-% In case the course's name contains accented characters, one should
-% also provide a qr version, containing utf8-characters only.
-% The macro for this purpose takes only one argument, i.e. the
-% course's name! This is to avoid inconsistencies in the course codes.
-%
% \DescribeMacro{\courseversion} [coursetext] (optional)\\
% This macro indicates which version of the course this is.
%
@@ -623,121 +639,41 @@
% \changes{v1.6}{2016/02/04}{Added diploma code documentation}
% \changes{v2.0}{2018/05/16}{Updated diploma code documentation to
% incorporate PhD degrees}
-% \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
-% you want the author of the package to add codes for your faculty,
-% just ask!
-% \begin{center}
-% \begin{tabular}{lp{10cm}}
-% \toprule
-% Code & Description (in Dutch!) \\
-% \midrule
-% \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|
-% & Master of Science in de industri\"ele wetenschappen: biochemie\\
-% |MA-IW-CH|
-% & Master of Science in de industri\"ele wetenschappen: chemie\\
-% |MA-IW-EI|
-% & Master of Science in de industri\"ele wetenschappen: elektronica-ICT\\
-% |MA-IW-EI-AE|
-% & Master of Science in de industri\"ele wetenschappen: elektronica-ICT,
-% afstudeerrichting, Automotive Engineering\\
-% |MA-IW-EI-ICT|
-% & Master of Science in de industri\"ele wetenschappen: elektronica-ICT,
-% afstudeerrichting ICT\\
-% |MA-IW-EM|
-% & Master of Science in de industri\"ele wetenschappen: elektromechanica\\
-% |MA-IW-EM-AE|
-% & 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,
-% afstudeerrichting Automatisering\\
-% |MA-IW-EM-EM|
-% & Master of Science in de industri\"ele wetenschappen: elektromechanica,
-% afstudeerrichting Elektromechanica\\
-% |MA-IW-EM-EN|
-% & Master of Science in de industri\"ele wetenschappen: elektromechanica,
-% afstudeerrichting Energie\\
-% |PHD-TI-BK|
-% & Doctor in de Toegepaste Ingenieurwetenschappen: bouwkunde\\
-% |PHD-TI-BCH|
-% & Doctor in de Toegepaste Ingenieurwetenschappen: biochemie\\
-% |PHD-TI-CH|
-% & Doctor in de Toegepaste Ingenieurwetenschappen: chemie\\
-% |PHD-TI-EI|
-% & doctor in de Toegepaste Ingenieurwetenschappen: elektronica-ICT\\
-% |PHD-TI-EM|
-% & Doctor in de Toegepaste Ingenieurwetenschappen: elektromechanica\\
-% \midrule
-% \multicolumn{2}{c}{Faculteit Toegepaste Economische
-% Wetenschappen}\\
-% \midrule
-% |MA-BE-HI|
-% & Master of Science handelsingenieur\\
-% |MA-BE-HIBI|
-% & Master of Science handelsingenieur in de beleidsinformatica\\
-% |MA-BE-EB|
-% & Master of Science in de toegepaste economische wetenschappen:
-% economisch beleid\\
-% |MA-BE-BK|
-% & Master of Science in de toegepaste economische wetenschappen:
-% bedrijfskunde\\
-% \bottomrule
-% \end{tabular}
-% \end{center}
+% \changes{v2.3}{2019/03/27}{Introduced bachelor level codes to allow
+% for bachelor theses}
+% \changes{v4.0}{2021/07/11}{Removed diploma codes, as too many
+% faculties are requesting to maintain them}
+% \DescribeMacro{\diploma} [bamathesis] (discontinued)\\
+% This macro is no longer used. Use |\degree{}| instead.
%
% \DescribeMacro{\lecturer} [coursetext] (mandatory)\\
-% This is the name of the person that actually teaches the course (in
+% You can add one or more lecturers to the course notes (in
% Dutch: titularis). If there are multiple persons, please, use the
-% macros |\lectureri|, |\lecturerii|, |\lectureriii|,
-% |\lectureriv|.
+% macro multiple times.
%
-% \DescribeMacro{\phddegree} [phdthesis] (mandatory)\\
+% \DescribeMacro{\phddegree} [phdthesis] (discontinued)\\
+% This macro is no longer used. Use |\degree{}| instead.
+%
+% \DescribeMacro{\degree} [bmthesis,phdthesis,coursetext] (mandatory)\\
% This is the official degree name (in the appropriate language,
% possibly mixed ``dutch (english)'').
+% Specify the official title of your diploma. This must be the
+% official title. For bachelor and master programmes in Dutch, it must
+% be the Dutch title. For programmes in English ti may be the English
+% title. For PhD degrees, language constraints are less strict.\\
+% Consult \url{https://www.hogeronderwijsregister.be} for correct
+% bachelor and master degree titles. Consult the Doctoral bylaws of
+% the university for correct PhD degree titles.
%
-% \DescribeMacro{\programme} [coursetext] (mandatory)\\
-% \label{dm-programme}
-% This macro takes three arguments (for the time being, only
-% applicable to the faculty of applied engineering):
-% \begin{itemize}
-% \item the type of the programme: BA, SP, VP or MA
-% \item the domain of the programme: IW
-% \item the qualifier of the programme: BK, CH, BCH, EM, EI
-% \end{itemize}
-% If you need more programme classes or qualifiers, ask the author to
-% complete the available codes.
-% Correct usage of the macro will result in error-free descriptions on
-% your title page.
-% You can overrule the standard descriptions, by specifying 'FREE' as
-% first argument and a free text description as second, leaving the third
-% one empty. However, we strongly advise against taking this route.
-% Instead, ask the author to complete the available codes.
+% \DescribeMacro{\programme} [coursetext] (discontinued)\\
+% This macro is no longer used. Use |\degree{}| instead.%
%
% \DescribeMacro{\publisher} [coursetext] (mandatory)\\
% This macro sets the publisher information of the document.
% It is printed on the front page. It defaults to the repographic
% service of campus Groenenborger, one of the standard printing
-% services of Universiteit Antwerpen.
+% services of Universiteit Antwerpen. Separate the different fields
+% (name, addres, a.s.o) using a pipe symbol.
%
% \DescribeMacro{\publishercode} [coursetext] (mandatory)\\
% This macro sets the publisher code of the document.
@@ -745,7 +681,7 @@
% uses for its internal administration. It may be a proprietary code,
% or an ISBN number.
%
-% \DescribeMacro{\subtitle} [coursetext / phdthesis] (optional)\\
+% \DescribeMacro{\subtitle} [coursetext / phdthesis / report] (optional)\\
% This macro sets the title of the document. You may use this
% \begin{itemize}
% \item to further clarify the title
@@ -754,25 +690,30 @@
% The latter is to be considered when you want to provide multiple
% documents as parts of the full course text (e.g., Course Notes,
% Formula Collection, Exercise Book, Solution Book).
-% This macro also sets the |subject| tag of the hyperref package,
+% This macro also sets the |subject| tag of the hyperref package (if
+% it is loaded),
% so that the PDF-document meta-information is correct.
%
% \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|.
+% Specifies the person(s) that promote(s)/supervise(s) the thesis.
+% Please, use the macro multiple times if needed.
%
-% \DescribeMacro{\title} [coursetext / bamathesis / phdthesis] (mandatory)\\
+% \DescribeMacro{\title} [coursetext / bamathesis / phdthesis /
+% report] (mandatory)\\
% This macro sets the title of the document.
-% It also sets the |pdftitle| tag of the hyperref package, so that
+% It also sets the |pdftitle| tag of the hyperref package (if it is
+% loaded), so that
% the PDF-document meta-information is correct.
%
-% \DescribeMacro{\titlepageimage} [phdthesis]
+% \DescribeMacro{\titlepageimage} [coursetext / phdthesis / report]
% (optional)\\
-% This sets the central image on the title page to appear clipped
-% within the curves.
+% This sets the filename of the central image on the title page to
+% appear clipped % within the curves. For PhD theses this is highly
+% advized. For course texts, this is optional. If the image is not
+% set, a flat colored area will appear. This is part of the house
+% style.
%
-% \DescribeMacro{\versionyear} [coursetext] (mandatory)\\
+% \DescribeMacro{\versionyear} [coursetext / report] (mandatory)\\
% This is to be the year in which you published the current version of
% the course in the form YYYY.
%
@@ -880,6 +821,17 @@
% \DescribeMacro{\course} [exam] (mandatory)\\
% see description of |\course| macro on page~\pageref{dm-course}.
%
+% \DescribeMacro{\degree} [exam] (mandatory)\\
+% This is the official degree name (in the appropriate language,
+% possibly mixed ``dutch (english)'').
+% Specify the official title of your diploma. This must be the
+% official title. For bachelor and master programmes in Dutch, it must
+% be the Dutch title. For programmes in English ti may be the English
+% title. For PhD degrees, language constraints are less strict.\\
+% Consult \url{https://www.hogeronderwijsregister.be} for correct
+% bachelor and master degree titles. Consult the Doctoral bylaws of
+% the university for correct PhD degree titles.
+%
% \DescribeMacro{\examdate}
% specifies the date of the exam. We recommend the YYYY-MM-DD format,
% but you are free to chose your own coding scheme for dates. We
@@ -909,15 +861,22 @@
% 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}.
+% \DescribeMacro{\lecturer} [exam] (mandatory)\\
+% You can add one or more lecturers to the course notes (in
+% Dutch: titularis). If there are multiple persons, please, use the
+% macro multiple times.
+%
+% \DescribeMacro{\programme} [exam] (discontinued)\\
+% This macro is no longer used. Use |\degree{}| instead.%
%
-% \DescribeMacro{\rooms}
+% \DescribeMacro{\room}
% specifies the rooms in which the exam will take place. This is
% useless info for the student, but may be of convenience for you as
% author or supervisor of the exam. Use UAntwerpen standard room
% designators, e.g. 'G.U.025' for room number 025, on the
% Groenenborgercampus in the U-building.
+% If your exam is taken in multiple rooms, just specify multiple
+% |\room{}| commands.
%
% \DescribeMacro{\studentnr}
% specifies the exam copy number. This will appear on every page of
@@ -936,46 +895,38 @@
% \subsection{Examples}
% \subsubsection{\texttt{uantwerpencoursetext}}
%
-% This example uses the |qr| option (that invokes the |auto-pst-pdf|
-% package) so enable 'write18' or 'shell-escape' for your \LaTeX{}
-% compiler.
-%
% \changes{v2.5}{}{changed publisher to universitas in example}
%
% \begin{verbatim}
%<*ct-example>
-\documentclass[a4paper,11pt,oneside,openright,english,qr,copyright]{uantwerpencoursetext}
+\documentclass[ti,a4paper,11pt,oneside,openright,copyright]{uantwerpencoursetext}
\usepackage[english,dutch]{babel}
-\usepackage{lipsum} % this is just for some dummy text, please remove
-
+\usepackage{kantlipsum} % this is just for some dummy text, please remove
\title{Z\'agen, zoeken en zuchten}
-\qrtitle{Zágen, zoeken en zuchten}
\subtitle{Cursusnota's}
\author{Walter Daems en Paul Levrie}
\courseversion{1.3}
-\versionyear{2016}
+\versionyear{2021}
-\lectureri{Zoltan Zo\"ekers}
-\qrlectureri{Zoltan Zoëkers}
-\lecturerii{Siana Sigh}
-\lectureriii{Zeger de Z\'ager}
-\qrlectureriii{Zeger de Záger}
+\lecturer{Zoltan Zo\"ekers}
+\lecturer{Siana Sigh}
+\lecturer{Zeger de Z\'ager}
-\facultyacronym{TI}
-\programme{MA}{IW}{EI}
-\coursei{2023FTIZZZ}{5-Zoekmachines in een zaagperspectief}
-\courseii{2045FTIIII}{6-Zaagmachines in \'e\'en zuchtperspectief}
-\qrcourseii{6-Zaagmachines in één zuchtperspectief}
+\degree{Master of Science in de industri\"ele wetenschappen:
+ elektronica-ICT}
+\course{2023FTIZZZ}{5-Zoekmachines in een zaagperspectief}
+\course{2045FTIIII}{6-Zaagmachines in \'e\'en zuchtperspectief}
-\academicyear{2015-2016}
+\academicyear{2021-2022}
+% \titlepageimage{Images/uantwerpen-keyboard.jpg} % this is optional
-\publisher{Universitas Cursusdienst\\
- Prinsesstraat 16\\
- 2000 Antwerpen\\
- T +32 3 233 23 73\\
+\publisher{Universitas Cursusdienst |
+ Prinsesstraat 16 |
+ 2000 Antwerpen |
+ T +32 3 233 23 73 |
E info@cursusdienst.be}
\publishercode{C11111102}
@@ -984,9 +935,7 @@
The graphics in this document have been typeset using \texttt{TikZ}.\\
This document has been \TeX-ed on a GNU/Linux workstation.
}
-
\begin{document}
-\selectlanguage{dutch} % or english if your text is in English
\maketitle
@@ -996,32 +945,33 @@
\mainmatter
\chapter*{Inleiding}
-\lipsum[1]
+
+\kant[1]
\chapter{Onzin voor dummies}
\section{Het gebeuren}
-\lipsum[2]
+\kant[2]
\begin{equation}
e^{-j\pi} + 1 = 0
\end{equation}
-\lipsum[3]
+\kant[3]
\section{En waartoe het geleid heeft}
-\lipsum[4]
+\kant[4]
\subsection{Herhaling}
-\lipsum[5]
+\kant[5]
\subsection{Begint vervelend te worden}
-\lipsum[6]
+\kant[6]
\newpage
\subsection{Begint echt vervelend te worden}
-\lipsum[7-10]
+\kant[7-10]
\chapter{Besluit}
@@ -1042,23 +992,26 @@
%
% \begin{verbatim}
%<*bmt-example>
-\documentclass[a4paper,11pt,twoside,openright,english]{uantwerpenbamathesis}
+\documentclass[a4paper,11pt,twoside,openright,english,ti]{uantwerpenbamathesis}
-\usepackage[english]{babel} % or dutch if your text is in Dutch
-\usepackage{lipsum} % this is just for some dummy text, please remove
+\usepackage[dutch]{babel} % or english if your text is in English
+\usepackage{kantlipsum} % this is just for some dummy text, please remove
+
+\usepackage{hyperref} % New: you must load the hyperref package
+ % yourself! This allows you to put it in the
+ % correct order with the other packages you load!
\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}
+\supervisor{prof. dr. ir. Kumulus}{Universiteit Antwerpen}
+\supervisor{prof. dr. Hilarius Warwinkel}{TNT-Bang, N.V.}
+\supervisor{ing. Piet Pienter}{POM}
-\facultyacronym{TI}
-\academicyear{2015-2016}
-\diploma{MA-IW-EM}
+\academicyear{2021-2022}
+\degree{Bachelor of Science in de industri\"ele wetenschappen - elektronica-ICT}
\defenselocation{Antwerpen}
-\defensedate{juni 2016}
+\defensedate{juni 2021}
\begin{document}
@@ -1071,19 +1024,19 @@
\mainmatter
\chapter*{Inleiding}
-\lipsum[1]
+\kant[1]
\chapter{Onderzoeksvraag}
\section{Het gebeuren}
-\lipsum[2]
+\kant[2]
\begin{equation}
e^{-j\pi} + 1 = 0
\end{equation}
-\lipsum[3]
+\kant[3]
\chapter{Literatuurstudie}
@@ -1110,51 +1063,55 @@
% \paragraph{Dutch}
% \begin{verbatim}
%<*pt-example1>
-\documentclass[b5paper,10pt,twoside,openright,filled]{uantwerpenphdthesis}
+\documentclass[ti,10pt,twoside,openright,filled]{uantwerpenphdthesis}
% You may want to use common fonts
\usepackage{mathptmx}
\iftutex
\usepackage{fontspec}
+\setmainfont{Calibri}
\setsansfont{Calibri}
+\usepackage{sansmathaccent}
\else
\usepackage{cmbright}
\fi
\usepackage[dutch]{babel} % or dutch if your text is in Dutch
-\usepackage{lipsum} % this is just for some dummy text, please remove
+\usepackage{kantlipsum} % this is just for some dummy text, please remove
+
+\usepackage{hyperref} % New: you must load the hyperref package
+ % yourself! This allows you to put it in the
+ % correct order with the other packages you load!
\title{Harmonische Signaalanalyse\\met behulp van Lineaire
Operatoren}
\subtitle{Waarom moeten titels van doctoraatsthesissen toch altijd
lang en onverstaanbaar zijn?}
\author{Ing. Theofiel Hoekaff}
-\facultyacronym{TI}
-\programme{PHD}{IW}{EI}
\affiliation{Universiteit Antwerpen\\
Faculteit Toegepaste Ingenieurswetenschappen\\
- Constrained Systems Lab (CoSys-Lab)}
+ Co-design of Cyber-Physical Systems (Cosys-Lab)}
\address{Groenenborgerlaan 171, 2020 Antwerpen, Belgi\"e\\
M: theofiel.hoekaff@uantwerpen.be\\
T: +32 265 00 00
}
-\supervisori{Prof. dr. W. Vlaams}{Universiteit Antwerpen, Belgi\"e}
-\supervisorii{Prof. dr. J. Stekker}{Universiteit Antwerpen, Belgi\"e}
+\supervisor{prof. dr. W. Vlaams}{Universiteit Antwerpen, Belgi\"e}
+\supervisor{prof. dr. J. Stekker}{Universiteit Antwerpen, Belgi\"e}
-\jurychairman{Prof. dr. P. Dalinckx}{Universiteit Antwerpen, Belgi\"e}
+\jurychairman{prof. dr. P. Dalinckx}{Universiteit Antwerpen, Belgi\"e}
-\jurymemberi{Prof. dr. J. Dezerooder}{Universiteit Antwerpen, Belgi\"e}
-\jurymemberii{Prof. dr. P. De Tollenaere}{Flanders Make, Belgi\"e}
-\jurymemberiii{Prof. dr. M. Byr}{IMEC, Nederland}
+\jurymember{prof. dr. J. Dezerooder}{Universiteit Antwerpen, Belgi\"e}
+\jurymember{prof. dr. P. De Tollenaere}{Flanders Make, Belgi\"e}
+\jurymember{prof. dr. M. Byr}{IMEC, Nederland}
-\phddegree{doctor in de toegepaste ingenieurswetenschappen}
+\degree{doctor in de toegepaste ingenieurswetenschappen}
\defenselocation{Antwerpen}
-\defensedate{2018}
+\defensedate{2021}
\titlepageimage{Images/uantwerpen-keyboard.jpg}
-\isbn{987-90-57285-34-7} % don't specify thisif you don't want one
-\depot{D/2018/12.293/03} % idem
+\isbn{987-90-57285-34-7} % don't specify this if you don't want one
+\depot{D/2021/12.293/03} % idem
\begin{document}
@@ -1167,35 +1124,35 @@
\mainmatter
\chapter*{Inleiding}
-\lipsum[1]
+\kant[1]
\chapter{Onderzoeksvraag}
\section{Het gegeven}
-\lipsum[2]
+\kant[2]
\begin{equation}
e^{-j\pi} + 1 = 0
\end{equation}
-\lipsum[3-17]
+\kant[3-17]
\chapter{Literatuurstudie}
-\lipsum[18-19]
+\kant[18-19]
\chapter{Theoretische achtergrond}
-\lipsum[20-21]
+\kant[20-21]
\chapter{Eigen realisatie}
-\lipsum[22-24]
+\kant[22-24]
\chapter{Besluit}
-\lipsum[25]
+\kant[25]
\appendix
\chapter{Symbolen}
@@ -1212,44 +1169,46 @@
% \paragraph{English}
% \begin{verbatim}
%<*pt-example2>
-\documentclass[b5paper,10pt,twoside,openright,filled]{uantwerpenphdthesis}
+\documentclass[ti,10pt,twoside,openright,filled]{uantwerpenphdthesis}
% use some fancy font
\usepackage{newpxtext}
\usepackage{newpxmath}
\usepackage[english]{babel} % or dutch if your text is in Dutch
-\usepackage{lipsum} % this is just for some dummy text, please remove
+\usepackage{kantlipsum} % this is just for some dummy text, please remove
+
+\usepackage{hyperref} % New: you must load the hyperref package
+ % yourself! This allows you to put it in the
+ % correct order with the other packages you load!
\title{Harmonic Signal analysis\\based on Linear Operators}
\subtitle{How did Mindy linearly kill Mork's IC signal analyzer?}
\author{Ing. Theodore Edgeoff}
-\facultyacronym{TI}
\affiliation{University of Antwerp\\
Faculty of Applied Engineering\\
- CoSys-Lab}
+ Cosys-Lab}
\address{Groenenborgerlaan 171, 2020 Antwerpen, Belgi\"e\\
M: theofiel.hoekaff@uantwerpen.be\\
T: +32 265 00 00
}
-\supervisori{Prof. dr. W. Vlaams}{University of Antwerp, Belgium}
-\supervisorii{Prof. dr. J. Stekker}{University of Antwerp, Belgium}
+\supervisor{prof. dr. W. Vlaams}{University of Antwerp, Belgium}
+\supervisor{prof. dr. J. Stekker}{University of Antwerp, Belgium}
-\jurychairman{Prof. dr. P. Dalinckx}{University of Antwerp, Belgium}
+\jurychairman{prof. dr. P. Dalinckx}{University of Antwerp, Belgium}
-\jurymemberi{Prof. dr. J. Dezerooder}{University of Antwerp, Belgium}
-\jurymemberii{Prof. dr. P. De Tollenaere}{Flanders Make, Belgium}
-\jurymemberiii{Prof. dr. M. Byr}{IMEC, The Netherlands}
+\jurymember{prof. dr. J. Dezerooder}{University of Antwerp, Belgium}
+\jurymember{prof. dr. P. De Tollenaere}{Flanders Make, Belgium}
+\jurymember{prof. dr. M. Byr}{IMEC, The Netherlands}
-\facultyacronym{TI}
-\phddegree{doctor in applied engineering}
+\degree{doctor in applied engineering}
\defenselocation{Antwerpen}
-\defensedate{2018}
+\defensedate{2021}
\titlepageimage{Images/uantwerpen-keyboard.jpg}
\isbn{987-90-57285-34-7}
-\depot{D/2018/12.293/03}
+\depot{D/2021/12.293/03}
\begin{document}
@@ -1262,35 +1221,35 @@
\mainmatter
\chapter*{Introduction}
-\lipsum[1]
+\kant[1]
\chapter{Research question}
\section{The datum}
-\lipsum[2]
+\kant[2]
\begin{equation}
e^{-j\pi} + 1 = 0
\end{equation}
-\lipsum[3-17]
+\kant[3-17]
\chapter{Literature review}
-\lipsum[18-19]
+\kant[18-19]
\chapter{Theoretical background}
-\lipsum[20-21]
+\kant[20-21]
\chapter{Technical results}
-\lipsum[22-24]
+\kant[22-24]
\chapter{Conclusion}
-\lipsum[25]
+\kant[25]
\appendix
@@ -1304,13 +1263,105 @@
%</pt-example2>
% \end{verbatim}
%
+% \subsubsection{\texttt{uantwerpenreport}}
+%
+% \begin{verbatim}
+%<*rp-example>
+\documentclass[10pt,twoside,openright,filled]{uantwerpenreport}
+
+% You may want to use common fonts
+\usepackage{mathptmx}
+\iftutex
+\usepackage{fontspec}
+\setmainfont{Calibri}
+\setsansfont{Calibri}
+\usepackage{sansmathaccent}
+\else
+\usepackage{cmbright}
+\fi
+
+\usepackage[dutch]{babel} % or dutch if your text is in Dutch
+\usepackage{kantlipsum} % this is just for some dummy text, please remove
+
+\usepackage{hyperref} % New: you must load the hyperref package
+ % yourself! This allows you to put it in the
+ % correct order with the other packages you load!
+
+\title{De toepassing van roomijs-derivaten in beton}
+\subtitle{Het belang van een smaakvolle architectuur}
+\author{Ing. Jan Bouwblauw}
+\extra{Onderzoeksrapport}
+\affiliation{Universiteit Antwerpen | Building Research Group}
+\address{Groenenborgerlaan 171, 2020 Antwerpen, Belgi\"e\\
+ M: jan.bouwblauw@uantwerpen.be\\
+ T: +32 265 00 00
+}
+
+\versionyear{2021}
+
+\titlepageimage{Images/uantwerpen-keyboard.jpg}
+
+\begin{document}
+
+\maketitle
+
+\frontmatter
+
+\tableofcontents
+
+\mainmatter
+\chapter*{Inleiding}
+
+\kant[1]
+
+\chapter{Smaken en smaakpapillen}
+
+\section{Het gegeven}
+
+\kant[2]
+
+\begin{equation}
+ e^{-j\pi} + 1 = 0
+\end{equation}
+
+\kant[3-17]
+
+\chapter{Experimentele setup}
+
+\kant[18-19]
+
+\chapter{Resulaten}
+
+\kant[20-21]
+
+\chapter{Conclusie}
+
+\kant[22-24]
+
+\chapter{Advies}
+
+\kant[25]
+
+\appendix
+\chapter{Symbolen}
+
+\chapter{Publicaties}
+% Put your bibliography here using BibTeX
+
+\makefinalpage
+
+\end{document}
+%</rp-example>
+% \end{verbatim}
+%
+%
% \subsubsection{\texttt{uantwerpenletter}}
%
% \paragraph{Plain example}
%
% \begin{verbatim}
%<*le-example>
-\documentclass[a4paper]{uantwerpenletter}
+\documentclass[ti,a4paper]{uantwerpenletter}
%% As a good UAntwerpen citizen, you would use the calibri font.
%% As this only works for XeLaTeX or LuaLaTeX, we chose to include
@@ -1323,11 +1374,10 @@
\fi
\usepackage[english]{babel}
-\usepackage{lipsum} % this is just for some dummy text, please remove
+\usepackage{kantlipsum} % this is just for some dummy text, please remove
-\sender{Prof. Walter Daems}{Senior Lecturer}
-\facultyacronym{TI}
-\unit{CoSys-Lab}
+\sender{prof. Walter Daems}{Senior Lecturer}
+\unit{Cosys-Lab}
\address{
Campus Groenenborger\\
Groenenborgerlaan 171\\
@@ -1338,7 +1388,7 @@
\mobile{+32 499 355 115}
\returnaddress{FTI - U.301 -- Groenenborgerlaan 171, 2020 Antwerpen, BELGIUM}
-\to{Prof. B. Bonette}
+\to{prof. B. Bonette}
\toorganization{Mumford University}
\toaddress{
450 Morning Mall\\
@@ -1351,7 +1401,7 @@
\begin{document}
\maketitle
- \opening{Dear Prof. Bonette,}
+ \opening{Dear prof. Bonette,}
I'd like to congratulate you and the other professors of your
university on the very instructive video lectures
@@ -1367,12 +1417,12 @@
Below, you can find a few more paragraphs to illustrate that this
class can generate multipage letters.
- \lipsum[1-3]
+ \kant[1-3]
\closing{Kind regards,}
% you might want to insert a signature picture or text:
% \signature{\includegraphics{signature.jpg}}
- \carboncopy{Prof. S. Mariotte, Mumford University}
+ \carboncopy{prof. S. Mariotte, Mumford University}
\enclosed{
\begin{enumerate}
\item list of course numbers that are most fequently viewed at
@@ -1401,9 +1451,8 @@
\usepackage{cmbright}
\fi
-\sender{Prof. Walter Daems}{Senior Lecturer}
-%\facultyacronym{TI} TEMP
-\unit{CoSys-Lab}
+\sender{prof. Walter Daems}{Senior Lecturer}
+\unit{Cosys-Lab}
\address{
Campus Groenenborger\\
Groenenborgerlaan 171\\
@@ -1441,17 +1490,17 @@
% \paragraph{Single column}
% \begin{verbatim}
%<*ex-example1>
-\documentclass[a4paper,10pt]{uantwerpenexam}
+\documentclass[ti,a4paper,10pt]{uantwerpenexam}
\usepackage{newpxtext} % demonstration of some fine font packages
\usepackage{newpxmath}
\usepackage{enumitem}
\usepackage[dutch]{babel} % last language loaded will
% determine logo version (change to
% [dutch] for a monolingual version)
-\course{19876FTIDUM}{5-Bistrologie}
-\author{Walter Daems}
-\facultyacronym{TI}
-\programme{BA}{IW}{EI}
+
+\course{1876FTIDUM}{5-Bistrologie}
+\lecturer{Walter Daems}
+\degree{Bachelor of Science in de industri\"ele wetenschappen - elektronica-ICT}
\academicyear{2017-2018}
\exampart{Schriftelijk Examen}
\examgroupnumber{1 (eerste examenkans-inhaal)}
@@ -1459,7 +1508,7 @@
\examlength{4h}
\tstart{08h30}
\tend{12h30}
-\rooms{G.U.025}
+\room{G.U.025}
\extrainfo[firstpage]{
Belangrijke informatie:\\\par
Het volledige Onderwijs- en Examenregelement (OER) is van toepassing
@@ -1538,17 +1587,18 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% \paragraph{Two columns}
% \begin{verbatim}
%<*ex-example2>
-\documentclass[a4paper,10pt]{uantwerpenexam}
+\documentclass[ti,a4paper,10pt]{uantwerpenexam}
\usepackage{newpxtext} % demonstration of some fine font packages
\usepackage{newpxmath}
\usepackage{enumitem}
\usepackage[dutch,english]{babel} % last language loaded will
% determine logo version (change to
% [dutch] for a monolingual version)
-\course{19876FTIDUM}{5-Bistrology}
-\author{Walter Daems}
-\facultyacronym{TI}
-\programme{BA}{IW}{EI}
+
+\course{1876FTIDUM}{5-Bistrology}
+\lecturer{Walter Daems}
+\lecturer{Paul Levrie}
+\degree{Bachelor of Science in de industri\"ele wetenschappen - elektronica-ICT}
\academicyear{2017-2018}
\exampart{Written Exam}
\examgroupnumber{1 (eerste examenkans-inhaal)}
@@ -1556,7 +1606,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
\examlength{4h}
\tstart{08h30}
\tend{12h30}
-\rooms{G.U.025}
+\room{G.U.025}
+\room{G.U.026}
\extrainfo{
\engdut{
Important information:\\\par
@@ -1725,7 +1776,210 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% \StopEventually{\clearpage\PrintChanges\clearpage\PrintIndex}
%
% \section{Implementation of the classes}
-%
+%
+%
+% \subsection{Common options}
+%
+% Colors appear in any document, so let's define them in common in a
+% separate package
+% \begin{macrocode}
+%<*clo>
+\newif\if@neutralcolors
+\@neutralcolorsfalse
+\DeclareOption{neutralcolors}{\@neutralcolorstrue}
+
+\newcommand*\colormodel{rgb}
+\newif\if@cmyk
+\@cmykfalse
+\DeclareOption{cmyk}{\renewcommand*\colormodel{cmyk}\@cmyktrue}
+\DeclareOption{rgb}{\renewcommand*\colormodel{rgb}\@cmykfalse}
+
+\newcommand*\facinenglish[1]{\renewcommand\@faculty{#1}}
+\newcommand*\facindutch[1]{
+ \AtBeginDocument{
+ \makeatother
+ \@ifpackageloaded{babel}{
+ \addto\captionsdutch{\renewcommand*\@faculty{#1}}
+ }{}
+ \makeatletter
+ }
+}
+\newcommand*\fselector{ua}
+\newcommand*\lselector{en}
+\newlength\logounitheight
+\setlength\logounitheight{0.8cm}
+
+\newcommand*\@faculty{~}
+\DeclareOption{be}{
+ \renewcommand*\fselector{be}
+ \setlength\logounitheight{1cm}
+ \facinenglish{Faculty of Business and Economics}
+ \facindutch{Faculteit Bedrijfswetenschappen en Economie}
+}
+\DeclareOption{fbd}{
+ \renewcommand*\fselector{fbd}
+ \setlength\logounitheight{1cm}
+ \facinenglish{Faculty of Pharmaceutical, Biomedical and Veterinary Sciences}
+ \facindutch{Faculteit Farmaceutische, Biomedische en Diergeneeskundige
+ Wetenschappen}
+}
+\DeclareOption{ggw}{
+ \renewcommand*\fselector{ggw}
+ \setlength\logounitheight{1cm}
+ \facinenglish{
+ Faculty of Medicine and Health Sciences}
+ \facindutch{Faculteit Geneeskunde en Gezondheidswetenschappen}
+}
+\DeclareOption{lw}{
+ \renewcommand*\fselector{lw}
+ \setlength\logounitheight{1cm}
+ \facinenglish{Faculty of Arts}
+ \facindutch{Faculteit Letteren en Wijsbegeerte}
+}
+\DeclareOption{ow}{
+ \renewcommand*\fselector{ow}
+ \setlength\logounitheight{1cm}
+ \facinenglish{Faculty of Design Sciences}
+ \facindutch{Faculteit Ontwerpwetenschappen}
+}
+\DeclareOption{re}{
+ \renewcommand*\fselector{re}
+ \setlength\logounitheight{1cm}
+ \facinenglish{Faculty of Law}
+ \facindutch{Faculteit Rechten}
+}
+\DeclareOption{sw}{
+ \renewcommand*\fselector{sw}
+ \setlength\logounitheight{1cm}
+ \facinenglish{Faculty of Social Sciences}
+ \facindutch{Faculteit Sociale Wetenschappen}
+ }
+\DeclareOption{ti}{
+ \renewcommand*\fselector{ti}
+ \setlength\logounitheight{1cm}
+ \facinenglish{Faculty of Applied Engineering}
+ \facindutch{Faculteit Toegepaste Ingenieurswetenschappen}
+}
+\DeclareOption{we}{
+ \renewcommand*\fselector{we}
+ \setlength\logounitheight{1cm}
+ \facinenglish{Faculty of Science}
+ \facindutch{Faculteit Wetenschappen}
+}
+\DeclareOption{iob}{
+ \renewcommand*\fselector{iob}
+ \setlength\logounitheight{1cm}
+ \facinenglish{Institute of Development Policy}
+ \facindutch{Instituut voor Ontwikkelingsbeleid- en beheer}
+}
+\newcommand*\@facultyacronym{\expandafter\uppercase\expandafter{\fselector}}
+
+\AtBeginDocument{
+ \makeatother
+ \@ifpackageloaded{babel}{
+ \addto\captionsdutch{
+ \renewcommand*\lselector{nl}
+ }{}
+ }
+ \makeatletter
+
+ \newcommand*\logopos{Logos/logo-uantwerpen-\fselector-\lselector-\colormodel-pos}
+ \newcommand*\logoposua{Logos/logo-uantwerpen-ua-\lselector-\colormodel-pos}
+ \newcommand*\logoneg{Logos/logo-uantwerpen-\fselector-\lselector-\colormodel-neg}
+ \newcommand*\logonegua{Logos/logo-uantwerpen-ua-\lselector-\colormodel-neg}
+ \newcommand*\logomonowhite{Logos/logo-uantwerpen-\fselector-\lselector-\colormodel-mono-white}
+ \newcommand*\logomonowhiteua{Logos/logo-uantwerpen-ua-\lselector-\colormodel-mono-white}
+ \newcommand*\iconfile{Logos/icon-uantwerpen-\fselector-\colormodel}
+ \newcommand*\iconfileua{Logos/icon-uantwerpen-ua-\colormodel}
+}
+%</clo>
+% \end{macrocode}
+%
+% \subsection{Color scheme}
+% \begin{macrocode}
+%<*cls>
+\if@cmyk
+%% UAntwerpen
+\definecolor{uauamain}{cmyk}{0.00,0.96,0.82,0.01}
+\definecolor{uauaside}{cmyk}{1.00,0.71,0.00,0.51}
+%% Faculteit Bedrijfswetenschappen en Economie
+\definecolor{uabemain}{cmyk}{0.58,0.00,1.00,0.04}
+\definecolor{uabeside}{cmyk}{0.29,0.04,0.41,0.00}
+%% Faculteit Farmaceutische, Biomedische en Diergeneeskundige Wetenschappen
+\definecolor{uafbdmain}{cmyk}{0.65,0.03,0.00,0.00}
+\definecolor{uafbdside}{cmyk}{0.33,0.03,0.00,0.00}
+%% Faculteit Geneeskunde en Gezondheidswetenschappen
+\definecolor{uaggwmain}{cmyk}{0.61,0.55,0.00,0.00}
+\definecolor{uaggwside}{cmyk}{0.21,0.27,0.03,0.00}
+%% Faculteit Letteren en Wijsbegeerte
+\definecolor{ualwmain}{cmyk}{0.00,0.27,0.85,0.00}
+\definecolor{ualwside}{cmyk}{0.00,0.16,0.51,0.00}
+%% Faculteit Ontwerpwetenschappen
+\definecolor{uaowmain}{cmyk}{0.53,0.25,0.26,0.05}
+\definecolor{uaowside}{cmyk}{0.25,0.08,0.16,0.00}
+%% Faculteit Rechten
+\definecolor{uaremain}{cmyk}{0.10,1.00,0.90,0.05}
+\definecolor{uareside}{cmyk}{0.04,0.45,0.36,0.00}
+%% Faculteit Sociale Wetenschappen
+\definecolor{uaswmain}{cmyk}{0.08,0.00,1.00,0.26}
+\definecolor{uaswside}{cmyk}{0.20,0.11,0.50,0.00}
+%% Faculteit Toegepaste Ingenieurswetenschappen
+\definecolor{uatimain}{cmyk}{0.31,1.00,0.00,0.01}
+\definecolor{uatiside}{cmyk}{0.11,0.30,0.02,0.00}
+%% Faculteit Wetenschappen
+\definecolor{uawemain}{cmyk}{1.00,0.20,0.00,0.25}
+\definecolor{uaweside}{cmyk}{0.40,0.08,0.00,0.10}
+%% IOB
+\definecolor{uaiobmain}{cmyk}{0.05,0.75,1.00,0.00}
+\definecolor{uaiobside}{cmyk}{0.40,0.08,0.00,0.10}
+\else
+%% UAntwerpen
+\definecolor{uauamain}{RGB}{234,44,56}
+\definecolor{uauaside}{RGB}{0,46,101}
+%% Faculteit Bedrijfswetenschappen en Economie
+\definecolor{uabemain}{RGB}{101,168,18}
+\definecolor{uabeside}{RGB}{185,213,169}
+%% Faculteit Farmaceutische, Biomedische en Diergeneeskundige Wetenschappen
+\definecolor{uafbdmain}{RGB}{68,184,243}
+\definecolor{uafbdside}{RGB}{181,221,247}
+%% Faculteit Geneeskunde en Gezondheidswetenschappen
+\definecolor{uaggwmain}{RGB}{117,117,203}
+\definecolor{uaggwside}{RGB}{198,182,210}
+%% Faculteit Letteren en Wijsbegeerte
+\definecolor{ualwmain}{RGB}{241,181,61}
+\definecolor{ualwside}{RGB}{255,218,145}
+%% Faculteit Ontwerpwetenschappen
+\definecolor{uaowmain}{RGB}{130,161,173}
+\definecolor{uaowside}{RGB}{200,217,216}
+%% Faculteit Rechten
+\definecolor{uaremain}{RGB}{210,8,36}
+\definecolor{uareside}{RGB}{237,157,144}
+%% Faculteit Sociale Wetenschappen
+\definecolor{uaswmain}{RGB}{173,165,0}
+\definecolor{uaswside}{RGB}{215,211,148}
+%% Faculteit Toegepaste Ingenieurswetenschappen
+\definecolor{uatimain}{RGB}{177,0,151}
+\definecolor{uatiside}{RGB}{221,184,210}
+%% Faculteit Wetenschappen
+\definecolor{uawemain}{RGB}{0,108,169}
+\definecolor{uaweside}{RGB}{151,192,223}
+%% IOB
+\definecolor{uaiobmain}{RGB}{230,98,8}
+\definecolor{uaiobside}{RGB}{151,192,223}
+\fi
+%%
+\if@neutralcolors
+\colorlet{maincolor}{uauaside}
+\colorlet{sidecolor}{uauamain}
+\colorlet{basecolor}{uauaside}
+\else
+\colorlet{maincolor}{ua\fselector main}
+\colorlet{sidecolor}{ua\fselector side}
+\colorlet{basecolor}{uauaside}
+\fi
+%</cls>
+% \end{macrocode}
+%
% \subsection{Class inheritance}
%
%
@@ -1738,29 +1992,22 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% \changes{v1.4}{2016/01/07}{Implemented letter class}
% \changes{v1.9}{2018/03/02}{Implemented uantwerpenexam class}
% \changes{v2.0}{2018/03/02}{Implemented uantwerpenphdthesis class}
+% \changes{v4.0}{2021/05/01}{Removed option qr again}
+% \changes{v4.0}{2021/07/11}{Removed options titlepagetableonly and titlepagenoartwork}
%
% Before loading the class, we provide the extra options.
%
% \begin{macrocode}
-%<*ct>
+%<*ct|rp>
\newif\if@copyright
\DeclareOption{copyright}{\@copyrighttrue}
-\newif\if@qr
-\DeclareOption{qr}{\@qrtrue}
-%</ct>
-% \end{macrocode}
+%</ct|rp>
%
-% \begin{macrocode}
-%<*ct|bmt|pt>
-\newif\if@titlepagenoartwork
-\DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
-\newif\if@titlepagetableonly
-\DeclareOption{titlepagetableonly}{\@titlepagetableonlytrue}
-%</ct|bmt|pt>
-%<*ct|bmt|pt|le>
+%<*ct|bmt|pt|rp|le>
\newif\if@filled
\DeclareOption{filled}{\@filledtrue}
-%</ct|bmt|pt|le>
+%</ct|bmt|pt|rp|le>
+%
%<*ex>
\newif\if@examiner
\DeclareOption{examiner}{\@examinertrue}
@@ -1771,20 +2018,23 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% We execute some standard options:
% We load the |book| class for course texts and master theses.
% \begin{macrocode}
-%<*ct|bmt|pt>
+%<*ct|bmt|pt|rp>
+\input{uantwerpencommonoptions.clo}
\ExecuteOptions{a4paper,11pt,final,oneside,openright}
\ProcessOptions\relax
\LoadClassWithOptions{book}
-%</ct|bmt|pt>
+%</ct|bmt|pt|rp>
% We load the |letter| class for letters
%<*le>
+\input{uantwerpencommonoptions.clo}
\ExecuteOptions{a4paper,10pt,final,oneside,openright}
\ProcessOptions
\LoadClassWithOptions{letter}
-\newcommand\tat{\makeatletter @\makeatother}
+\newcommand*\tat{\makeatletter @\makeatother}
%</le>
% We load the |article| class for exams
%<*ex>
+\input{uantwerpencommonoptions.clo}
\ExecuteOptions{a4paper,twoside,10pt}
\ProcessOptions
\LoadClassWithOptions{article}
@@ -1796,11 +2046,11 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% and with a decent paragraph spacing.
%
% \begin{macrocode}
-%<*ct|bmt|pt|le|ex>
+%<*ct|bmt|pt|rp|le|ex>
\setlength{\parindent}{0pt}
\addtolength{\parskip}{0.75\baselineskip}
\setcounter{secnumdepth}{3}
-%</ct|bmt|pt|le|ex>
+%</ct|bmt|pt|rp|le|ex>
% \end{macrocode}
%
% \subsection{Auxiliary packages}
@@ -1808,18 +2058,34 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% appropriate auxiliary packages that have proven their value.
%
% \subsubsection{Geometry}
-% Let's reduce the margins to 1 inch each.
+% Let's reduce the margins to 1 inch each for the documents that are
+% unlikely to be glue bound:
% \begin{macrocode}
-%<*ct|bmt|pt|ex>
-\RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry}
-%</ct|bmt|pt|ex>
+%<*ct|bmt|rp|ex>
+\RequirePackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry}
+%</ct|bmt|rp|ex>
+% Let's follow the instructions by ADS for the (marginal(!) glue provision):
+%<*pt>
+\RequirePackage[paperwidth=180mm,paperheight=260mm,
+ top=2.5cm,bottom=2.5cm,left=2.6cm,right=1.8cm,twoside]
+ {geometry}
+%</pt>
%<*le>
\RequirePackage[top=1in, bottom=1in, left=1.34in, right=1in]{geometry}
\RequirePackage[normalem]{ulem}
-\RequirePackage{atbegshi}
%</le>
% \end{macrocode}
%
+% \subsubsection{Preparing for \LaTeX3}
+% Let's make things a bit easier for me.
+% \begin{macrocode}
+%<*ct|bmt|pt|rp|le|ex>
+\RequirePackage{expl3}
+%\RequirePackage[check-declarations]{expl3} % I use this during debug phase
+\RequirePackage{xparse}
+%</ct|bmt|pt|rp|le|ex>
+% \end{macrocode}
+%
% \subsubsection{Font packages}
% Note that the use of cmbright is no
% longer imposed (as of v1.3). Using a good font is now up to the
@@ -1831,9 +2097,9 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% \changes{v1.3}{2015/12/31}{Abandoned use of cmbright - no more
% font dictatorship for theses and courses}
% \begin{macrocode}
-%<*ct|bmt|pt|le>
+%<*ct|bmt|pt|rp|le>
% no more font code
-%</ct|bmt|pt|le>
+%</ct|bmt|pt|rp|le>
% \end{macrocode}
%
% \subsubsection{Boilerplate packages}
@@ -1849,14 +2115,14 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% unreliable}
% \changes{v3.0}{2021/02/05}{Added iftex}
% \begin{macrocode}
-%<*ct|bmt|pt|le|ex>
+%<*ct|bmt|pt|rp|le|ex>
\RequirePackage{iftex}
\RequirePackage{xstring}
\RequirePackage{etoolbox}
\RequirePackage{ifthen}
\IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{}
\newcommand{\@emptymacro}{}
-%</ct|bmt|pt|le|ex>
+%</ct|bmt|pt|rp|le|ex>
% \end{macrocode}
%
% \subsubsection{Graphics packages}
@@ -1867,51 +2133,44 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% Some packages for coursetext and bamathesis:
% \changes{v1.3}{2015/12/31}{Added inclusion of background package}
% \begin{macrocode}
-%<*ct|bmt|pt|le|ex>
+%<*ct|bmt|pt|rp|le|ex>
\RequirePackage{graphicx}
+\RequirePackage[export]{adjustbox}
\RequirePackage{color}
\RequirePackage{tikz}
\usetikzlibrary{positioning}
\RequirePackage{eso-pic}
-%</ct|bmt|pt|le|ex>
-%<*ct>
+%</ct|bmt|pt|rp|le|ex>
+%<*ct|rp>
\if@copyright
-\RequirePackage[firstpage=false,contents={Copyright University of
- Antwerp, All Rights Reserved},color=lightgray,scale=3]{background}
+\RequirePackage[contents={},color=lightgray,scale=3]{background}
\fi
-%</ct>
+%</ct|rp>
%<*pt>
\usepackage{ean13isbn}
%</pt>
% \end{macrocode}
%
-% In uantwerpencoursetext we also want to generate a qr code.
-% Therefore we load the |pst-barcode| and |auto-pst-pdf| package.
-% In this case you must enable 'write18' or 'shell-escape' for your
-% \LaTeX{} compiler. Check your documention on how to do so!
-%
+% \subsubsection{UAntwerpen color and logo scheme}
% \begin{macrocode}
-%<*ct>
-\if@qr
-\RequirePackage{auto-pst-pdf}
-\RequirePackage{pst-barcode}
-\fi
-%</ct>
+%<*ct|bmt|pt|rp|le|ex>
+\RequirePackage{uantwerpencolorlogoscheme}
+%</ct|bmt|pt|rp|le|ex>
% \end{macrocode}
-%
+
% \subsubsection{Header/Footer}
%
% The de-facto standard for headers and footers:
% \begin{macrocode}
-%<*ct|bmt|pt|le|ex>
+%<*ct|bmt|pt|rp|le|ex>
\RequirePackage{fancyhdr}
-%</ct|bmt|pt|le|ex>
+%</ct|bmt|pt|rp|le|ex>
% \end{macrocode}
%
% \subsection{Colors}
%
% \begin{macrocode}
-%<*ct|bmt|pt|le|ex>
+%<*ct|bmt|pt|rp|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}
@@ -1921,143 +2180,200 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
\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|bmt|pt|le|ex>
+%</ct|bmt|pt|rp|le|ex>
% \end{macrocode}
%
% \subsection{Babel provisions}
%
% \changes{v1.7}{2016/05/01}{Added babel tags of elements
% of master's thesis title page}
+% \changes{v4.0}{2021/05/01}{Total rewrite of this part based on
+% expl3}
+% Let's start by defining our dictionary:
% \begin{macrocode}
-%<*ct|bmt|pt|le|ex>
-\newcommand\uaname{University of Antwerp}
-\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{~}
-\newcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}
-\newcommand\faccpg{
- \renewcommand\@faculty{Centre Pieter Gillis}
- \renewcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}}
-\newcommand\facfbd{
- \renewcommand\@faculty{Faculty of Pharmaceutical, Biomedical and
- Veterinary Sciences}
- \renewcommand\@logo{Logos/logo-uantwerpen-fbd-en-cmyk-pos}}
-\newcommand\facggw{
- \renewcommand\@faculty{Faculty of Medicine and Health Sciences}
- \renewcommand\@logo{Logos/logo-uantwerpen-ggw-en-cmyk-pos}}
-\newcommand\insiob{
- \renewcommand\@faculty{Insitute of Development Policy}
- \renewcommand\@logo{Logos/logo-uantwerpen-iob-en-cmyk-pos}}
-\newcommand\asoe{
- \renewcommand\@faculty{Antwerp School of Education}
- \renewcommand\@logo{Logos/logo-uantwerpen-ua-en-cmyk-pos}}
-\newcommand\faclw{
- \renewcommand\@faculty{Faculty of Arts}
- \renewcommand\@logo{Logos/logo-uantwerpen-lw-en-cmyk-pos}}
-\newcommand\facow{
- \renewcommand\@faculty{Faculty of Design Sciences}
- \renewcommand\@logo{Logos/logo-uantwerpen-ow-en-cmyk-pos}}
-\newcommand\facsw{
- \renewcommand\@faculty{Faculty of Social Sciences}
- \renewcommand\@logo{Logos/logo-uantwerpen-sw-en-cmyk-pos}}
-\newcommand\facre{
- \renewcommand\@faculty{Faculty of Law}
- \renewcommand\@logo{Logos/logo-uantwerpen-re-en-cmyk-pos}}
-\newcommand\facbe{
- \renewcommand\@faculty{Faculty of Business and Economics}
- \renewcommand\@logo{Logos/logo-uantwerpen-be-en-cmyk-pos}}
-\newcommand\facti{
- \renewcommand\@faculty{Faculty of Applied Engineering}
- \renewcommand\@logo{Logos/logo-uantwerpen-ti-en-cmyk-pos}}
-\newcommand\facwe{
- \renewcommand\@faculty{Faculty of Science}
- \renewcommand\@logo{Logos/logo-uantwerpen-we-en-cmyk-pos}}
-\newcommand\weightname{Weight}
+%<*ct|bmt|pt|rp|le|ex>
+\ExplSyntaxOn
+\prop_new:N \g_@@_data_prop
+%</ct|bmt|pt|rp|le|ex>%
+% \end{macrocode}
+%
+% The dictionary can be accessed using the following document command:
+% \begin{macrocode}
+%<*ct|bmt|pt|rp|le|ex>
+\NewDocumentCommand{\uantwerpendocsprop}{m}{
+ \prop_item:Nn \g_@@_data_prop{#1}
+}
+\NewDocumentCommand{\uantwerpendocsPROP}{m}{
+ \str_uppercase:f { \prop_item:Nn \g_@@_data_prop{#1} }
+}
+\NewDocumentCommand{\uantwerpendocspropread}{m}{
+ \@@_datareader:n { #1 }
+}
+%</ct|bmt|pt|rp|le|ex>%
+% \end{macrocode}
+%
+% We will fill the dictionary from the generic data file (for elements
+% that should not be translated, currently empty) and the language
+% specific data files (for elements that can be translated).
+%
+% To this end, we use the following parsing infrastructure:
+% \begin{macrocode}
+%<*ct|bmt|pt|rp|le|ex>
+\cs_new_nopar:Npn \@@_dataparser:w #1 = #2!! {
+ \tl_set:Nn \l_tmpa_tl {#1}
+ \tl_set:Nn \l_tmpb_tl {#2}
+ \tl_trim_spaces:N \l_tmpa_tl
+ \tl_trim_spaces:N \l_tmpb_tl
+ \prop_gput:Nxx \g_@@_data_prop { \l_tmpa_tl} { \l_tmpb_tl }
+}
+%</ct|bmt|pt|rp|le|ex>
+% \end{macrocode}
+% invoked by the following data file reader:
+% \begin{macrocode}
+%<*ct|bmt|pt|rp|le|ex>
+\ior_new:N \l_@@_data_ior
+\cs_new_nopar:Nn \@@_datareader:n {
+ \ior_open:Nn \l_@@_data_ior { uantwerpendocs-#1.data }
+ \ior_str_map_inline:Nn \l_@@_data_ior {
+ \regex_match:nnTF {=} {##1} {
+ \@@_dataparser:w ##1!!
+ }
+ {}
+ }
+ \ior_close:N \l_@@_data_ior
+}
+%</ct|bmt|pt|rp|le|ex>
+% \end{macrocode}
+% By default, we load the generic (not yet!) and the english data file:
+% \begin{macrocode}
+%<*ct|bmt|pt|rp|le|ex>
+\clist_map_inline:nn {en} {
+ \@@_datareader:n { #1 }
+}
+%\prop_show:N \g_@@_data_prop
+\ExplSyntaxOff
+%</ct|bmt|pt|rp|le|ex>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<*ct|bmt|pt|rp|le|ex>
+\newcommand*\@logo{\logopos}
\AtBeginDocument{
+ \makeatother
\@ifpackageloaded{babel}{
+ \addto\captionsenglish{%
+ \uantwerpendocspropread{en}
+ }
\addto\captionsdutch{%
- \renewcommand\uaname{Universiteit Antwerpen}
- \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\@logo{Logos/logo-uantwerpen-ua-nl-cmyk-pos}}
- \renewcommand\facfbd{
- \renewcommand\@faculty{
- Faculteit Farmaceutische, Biomedische en Diergeneeskundige
- Wetenschappen}
- \renewcommand\@logo{Logos/logo-uantwerpen-fbd-nl-cmyk-pos}}
- \renewcommand\facggw{
- \renewcommand\@faculty{Faculteit Geneeskunde en
- Gezondheidswetenschappen}
- \renewcommand\@logo{Logos/logo-uantwerpen-ggw-nl-cmyk-pos}}
- \renewcommand\insiob{
- \renewcommand\@faculty{Instituut voor Ontwikkelingsbeleid- en
- beheer}
- \renewcommand\@logo{Logos/logo-uantwerpen-iob-nl-cmyk-pos}}
- \renewcommand\asoe{
- \renewcommand\@faculty{Antwerp School of Education}
- \renewcommand\@logo{Logos/logo-uantwerpen-ua-nl-cmyk-pos}}
- \renewcommand\faclw{\renewcommand\@faculty{Faculteit
- Letteren en Wijsbegeerte}
- \renewcommand\@logo{Logos/logo-uantwerpen-lw-nl-cmyk-pos}}
- \renewcommand\facow{
- \renewcommand\@faculty{Faculteit Ontwerpwetenschappen}
- \renewcommand\@logo{Logos/logo-uantwerpen-ow-nl-cmyk-pos}}
- \renewcommand\facsw{
- \renewcommand\@faculty{Faculteit Sociale Wetenschappen}
- \renewcommand\@logo{Logos/logo-uantwerpen-sw-nl-cmyk-pos}}
- \renewcommand\facre{
- \renewcommand\@faculty{Faculteit Rechten}
- \renewcommand\@logo{Logos/logo-uantwerpen-re-nl-cmyk-pos}}
- \renewcommand\facbe{
- \renewcommand\@faculty{Faculteit Bedrijfswetenschappen en Economie}
- \renewcommand\@logo{Logos/logo-uantwerpen-be-nl-cmyk-pos}}
- \renewcommand\facti{
- \renewcommand\@faculty{Faculteit Toegepaste
- Ingenieurswetenschappen}
- \renewcommand\@logo{Logos/logo-uantwerpen-ti-nl-cmyk-pos}}
- \renewcommand\facwe{
- \renewcommand\@faculty{Faculteit Wetenschappen}
- \renewcommand\@logo{Logos/logo-uantwerpen-we-nl-cmyk-pos}}
- \renewcommand\weightname{Gewicht}
+ \uantwerpendocspropread{nl}
}
}
{}
+ \makeatletter
}
-%</ct|bmt|pt|le|ex>
+%</ct|bmt|pt|rp|le|ex>
% \end{macrocode}
%
+% The English data can be found below:
+%<*endata>
+org-be = Faculty of Business and Economics
+org-fbd = Faculty of Pharmaceutical, Biomedical and Veterinary Sciences
+org-ggw = Medicine and Health Sciences
+org-lw = Faculty of Arts
+org-ow = Faculty of Design Sciences
+org-re = Faculty of Law
+org-sw = Faculty of Social Sciences
+org-ti = Faculty of Applied Engineering
+org-we = Faculty of Science
+org-iob = Institute of Development Policy
+org-ua = University of Antwerp
+arr = All rights reserved
+of = of
+domainname = uantwerp.be
+datename = Date
+subjectname = Subject
+acyearname = Academic year
+baname = Bachelor of Science
+spname = Switching Programme
+vpname = Preparatory Programme
+maname = Master of Science
+phdname = PhD
+thesisname = Thesis
+mthesisname = Master's thesis
+bthesisname = Bachelor's thesis
+lecturername = Lecturer
+lecturersname = Lecturers
+supervisorname = Supervisor
+supervisorsname = Supervisors
+examname = Exam --- Examen
+seriesname = Series
+lastname = Last name --- Naam
+firstname = First name --- Voornaam
+docketname = Docket No. --- Rolnr.
+roomname = Room --- Lokaal
+roomsname = Rooms --- Lokalen
+examstartname = Start --- Begin
+examendname = End --- Einde
+examdurationname = Exam duration --- Duur van het examen
+juryname = Jury
+jurymembersname = Members
+jurychairmanname = Chairman
+bmthesisname = Thesis to obtain the degree of
+pthesisnamei = Thesis submitted in fulfilment of the requirements for the degree of
+pthesisnameii = at University of Antwerp
+weightname = Weight
+%</endata>
+%
+% The Dutch data can be found below:
+%<*nldata>
+org-be = Faculteit Bedrijfswetenschappen en Economie
+org-fbd = Faculteit Farmaceutische, Biomedische en Diergeneeskundige Wetenschappen
+org-ggw = Faculteit Geneeskunde en Gezondheidswetenschappen
+org-lw = Faculteit Letteren en Wijsbegeerte
+org-ow = Faculteit Ontwerpwetenschappen
+org-re = Faculteit Rechten
+org-sw = Faculteit Sociale Wetenschappen
+org-ti = Faculteit Toegepaste Ingenieurswetenschappen
+org-we = Faculteit Wetenschappen
+org=iob = Instituut voor Ontwikkelingsbeleid- en beheer
+org-ua = Universiteit Antwerpen
+arr = Alle rechten voorbehouden
+of = van
+domainname = uantwerpen.be
+datename = Onderwerp
+subjectname = Datum
+acyearname = Academiejaar
+baname = Bachelor of Science
+spname = Schakelprogramma
+vpname = Voorbereidingsprogramma
+maname = Master of Science
+phdname = Doctoraat
+thesisname = Afstudeerproef
+mthesisname = Masterproef
+bthesisname = Bachelorproef
+lecturername = Titularis
+lecturersname = Titularissen
+supervisorname = Promotor
+supervisorsname = Promotoren
+examname = Examen
+seriesname = Reeks
+lastname = Naam
+firstname = Voornaam
+docketname = Rolnr.
+roomname = Lokaal
+roomsname = Lokalen
+examstartname = Begin
+examendname = Einde
+examdurationname = Duur van het examen
+juryname = Jury
+jurymembersname = Leden
+jurychairmanname = Voorzitter
+bmthesisname = Proefschrift tot het behalen van de graad van
+pthesisnamei = Proefschrift voorgelegd tot het behalen van de graad van
+pthesisnameii = aan de Universiteit Antwerpen te verdedigen door
+weightname = Gewicht
+%</nldata>
+
% \subsection{Tags}
%
% \begin{macro}{\facultyacronym}
@@ -2068,53 +2384,23 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
%
% \changes{v3.0}{2021/02/05}{Changed REC in RE, TEW in BE and WET in WE
% (according to official naming scheme)}
+% \changes{v4.0}{2021/05/01}{This function is now obsolete}
% \begin{macrocode}
-%<*ct|bmt|pt|le|ex>
-\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}{ASoE}}{\asoe}{
- \ifthenelse{\equal{#1}{LW}}{\faclw}{
- \ifthenelse{\equal{#1}{OW}}{\facow}{
- \ifthenelse{\equal{#1}{SW}}{\facsw}{
- \ifthenelse{\equal{#1}{RE}}{\facre}{
- \ifthenelse{\equal{#1}{BE}}{\facbe}{
- \ifthenelse{\equal{#1}{TI}}{\facti}{
- \ifthenelse{\equal{#1}{WE}}{\facwe}{
- \errmessage{Error: wrong faculty acronym; choose one of CPG, FBD, GGW,
- IOB, ASoE, LW, OW, SW, RE, BE, TI, WE}}}}}}}}}}}}}}
-}
-%</ct|bmt|pt|le|ex>
+%<*ct|bmt|pt|rp|le|ex>
+\newcommand*{\facultyacronym}[1]{
+ \PackageError{uantwerpendocs}
+ {The '\protect\facultyacronym{}' macro is no longer available. Use
+ your faculty abbreviation in lowercase as class options instead}
+ {The interface of uantwerpendocs 4.0 has been changed. See
+ the uantwerpendocs manual under section '5.2 The class options explained'}
+}
+%</ct|bmt|pt|rp|le|ex>
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\title}
% The |title| tag is native to \LaTeX{}. It sets the |\@title| tag
% that will be used on the title page.
-% However, in view of the qr trouble, we fiddle a little with it.
-% In case the title contains accented characters, you also
-% need to provide a qr version in full unicode (so without the
-% traditional \LaTeX{} accented characters.)
-%
-% \begin{macrocode}
-%<*ct>
-\newcommand{\@qrtitle}{}
-\renewcommand{\title}[1]{%
- \renewcommand\@title{#1}
- \ifx\@qrtitle\@emptymacro
- \renewcommand\@qrtitle{#1}
- \fi
-}
-\newcommand{\qrtitle}[1]{%
- \renewcommand\@qrtitle{#1}
-}
-%</ct>
-% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\subtitle}
@@ -2123,35 +2409,36 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% optional by adding default space value}
% This macro sets the |\@subtitle| tag that later will be used on
% the title page, in the header/footer and to set the appropriate
-% |hyperref| tag.
+% |hyperref| tag (if it is loaded).
% \begin{macrocode}
%<*bmt>
-\newcommand{\@subtitle}{Master's thesis}
+\ExplSyntaxOn
+\NewDocumentCommand{\@subtitle}{m}{
+ \tl_new:N \l_@@_degree
+ \tl_set:Nx \l_@@_degree { \tl_head:N \@degree }
+ \tl_if_eq:NnTF \l_@@_degree { B } {\uantwerpendocsprop{bthesisname}} {
+ \tl_if_eq:NnTF \l_@@_degree { M } {\uantwerpendocsprop{mthesisname}}
+ {\uantwerpendocsprop{thesisname}}}
+}
+\ExplSyntaxOff
%</bmt>
-%<*ct|pt>
-\newcommand{\@subtitle}{~}
-\newcommand{\@qrsubtitle}{}
-\newcommand{\subtitle}[1]{%
- \renewcommand\@subtitle{#1}
- \ifx\@qrsubtitle\@emptymacro
- \renewcommand\@qrsubtitle{#1}
- \fi
-}
-\newcommand{\qrsubtitle}[1]{%
- \renewcommand\@qrsubtitle{#1}
+%<*ct|pt|rp>
+\newcommand*{\@subtitle}{~}
+\newcommand*{\subtitle}[1]{%
+ \renewcommand*\@subtitle{#1}
}
-%</ct|pt>
+%</ct|pt|rp>
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\shorttitle}
% This macro sets the |\@shorttitle| tag that later will be used
-% in the |uantwerpenexam| class.
+% in the |exam| class.
% \begin{macrocode}
%<*ex>
-\newcommand{\@shorttitle}{}
-\newcommand{\shorttitle}[1]{%
- \renewcommand\@shorttitle{#1}
+\newcommand*{\@shorttitle}{}
+\newcommand*{\shorttitle}[1]{%
+ \renewcommand*\@shorttitle{#1}
}
%</ex>
% \end{macrocode}
@@ -2160,26 +2447,6 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% \begin{macro}{\author}
% The |author| tag is native to \LaTeX{}. It sets the |\@author|
% tag that will be used on the title page.
-% However, in view of the qr trouble, we fiddle a little with it for
-% the |uantwerpencoursetext| class.
-% In case the title contains accented characters, you also
-% need to provide a qr version in full unicode (so without the
-% traditional \LaTeX{} accented characters.)
-%
-% \begin{macrocode}
-%<*ct>
-\newcommand{\@qrauthor}{}
-\renewcommand{\author}[1]{%
- \renewcommand\@author{#1}
- \ifx\@qrauthor\@emptymacro
- \renewcommand\@qrauthor{#1}
- \fi
-}
-\newcommand{\qrauthor}[1]{%
- \renewcommand\@qrauthor{#1}
-}
-%</ct>
-% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\courseversion}
@@ -2187,8 +2454,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% on the title page and in the header/footer.
% \begin{macrocode}
%<*ct>
-\newcommand{\@courseversion}{}
-\newcommand{\courseversion}[1]{\renewcommand{\@courseversion}{#1}}
+\newcommand*{\@courseversion}{}
+\newcommand*{\courseversion}[1]{\renewcommand*{\@courseversion}{#1}}
%</ct>
% \end{macrocode}
% \end{macro}
@@ -2197,10 +2464,10 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% This macro sets the |\@versionyear| tag that later will be used on
% the title page and in the copyright message.
% \begin{macrocode}
-%<*ct>
-\newcommand{\@versionyear}{}
-\newcommand{\versionyear}[1]{\renewcommand{\@versionyear}{#1}}
-%</ct>
+%<*ct|rp>
+\newcommand*{\@versionyear}{}
+\newcommand*{\versionyear}[1]{\renewcommand*{\@versionyear}{#1}}
+%</ct|rp>
% \end{macrocode}
% \end{macro}
%
@@ -2210,12 +2477,12 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% \changes{v2.5}{}{changed publisher to universitas in default}
% \begin{macrocode}
%<*ct>
-\newcommand{\@publisher}{Universitas Cursusdienst\\
- Prinsesstraat 16\\
- 2000 Antwerpen\\
- T +32 3 233 23 73\\
+\newcommand{\@publisher}{Universitas Cursusdienst |
+ Prinsesstraat 16 |
+ 2000 Antwerpen |
+ T +32 3 233 23 73 |
E info@cursusdienst.be}
-\newcommand{\publisher}[1]{\renewcommand{\@publisher}{#1}}
+\newcommand*{\publisher}[1]{\renewcommand*{\@publisher}{#1}}
%</ct>
% \end{macrocode}
% \end{macro}
@@ -2225,75 +2492,57 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the title page.
% \begin{macrocode}
%<*ct>
-\newcommand{\@publishercode}{}
-\newcommand{\publishercode}[1]{\renewcommand{\@publishercode}{#1}}
+\newcommand*{\@publishercode}{}
+\newcommand*{\publishercode}[1]{\renewcommand*{\@publishercode}{#1}}
%</ct>
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\lecturer}
-% This macro sets many |\@lecturer| tags (max. 4) that later will be used on
-% the title page. If there is only one teaching lecturer one can
-% use the convenient shorthand without counter.
-% In case the lecturer's name contains accented characters, you also
-% need to provide a qr version in full unicode (so without the
-% traditional \LaTeX{} accented characters.)
+% This macro adds lecturers (Dutch: titularissen) to the course
+% notes.
+% Use the macro multiple times for multiple lecturers. The order
+% will be preserved.
+% Note that as of v4.0 all lecturers are specified using the same
+% macro!
% \begin{macrocode}
-%<*ct>
-\newcommand{\@lectureri}{}
-\newcommand{\@lecturerii}{}
-\newcommand{\@lectureriii}{}
-\newcommand{\@lectureriv}{}
-\newcommand{\@qrlectureri}{}
-\newcommand{\@qrlecturerii}{}
-\newcommand{\@qrlectureriii}{}
-\newcommand{\@qrlectureriv}{}
-\newcommand{\lecturer}[1]{
- \renewcommand{\@lectureri}{#1}
- \ifx\@qrlectureri\@emptymacro
- \renewcommand\@qrlectureri{#1}
- \fi
+%<*ct|ex>
+\ExplSyntaxOn
+\seq_new:N \g_@@_lecturers
+\cs_new:Nn \@@_addlecturer:n {
+ \seq_gpush:Nn \g_@@_lecturers { #1 }
}
-\newcommand{\qrlecturer}[1]{
- \renewcommand\@qrlectureri{#1}
+\NewDocumentCommand{\lecturer}{m}{
+ \@@_addlecturer:n { #1 }
}
-\newcommand{\lectureri}[1]{
- \renewcommand{\@lectureri}{#1}
- \ifx\@qrlectureri\@emptymacro
- \renewcommand\@qrlectureri{#1}
- \fi
-}
-\newcommand{\qrlectureri}[1]{
- \renewcommand\@qrlectureri{#1}
-}
-\newcommand{\lecturerii}[1]{
- \renewcommand{\@lecturerii}{#1}
- \ifx\@qrlecturerii\@emptymacro
- \renewcommand\@qrlecturerii{#1}
- \fi
+\NewDocumentCommand{\jointlecturers}{m}{
+ \seq_use:Nn \g_@@_lecturers { #1 }
}
-\newcommand{\qrlecturerii}[1]{
- \renewcommand\@qrlecturerii{#1}
+\NewDocumentCommand{\lecturersname}{}{
+ \if_int_compare:w \seq_count:N \g_@@_lecturers > 1
+ \uantwerpendocsprop{lecturersname}
+ \else:
+ \uantwerpendocsprop{lecturername}
+ \fi:
}
-\newcommand{\lectureriii}[1]{
- \renewcommand{\@lectureriii}{#1}
- \ifx\@qrlectureriii\@emptymacro
- \renewcommand\@qrlectureriii{#1}
- \fi
-}
-\newcommand{\qrlectureriii}[1]{
- \renewcommand\@qrlectureriii{#1}
-}
-\newcommand{\lectureriv}[1]{
- \renewcommand{\@lectureriv}{#1}
- \ifx\@qrlectureriv\@emptymacro
- \renewcommand\@qrlectureriv{#1}
- \fi
-}
-\newcommand{\qrlectureriv}[1]{
- \renewcommand\@qrlectureriv{#1}
+\AtBeginDocument{
+ \seq_greverse:N \g_@@_lecturers
}
-%</ct>
+
+\ExplSyntaxOff
+%</ct|ex>
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\extra}
+% The |extra| tag allows to specify some extra comment (e.g. the
+% nature of the document) in the bottom bar on the title page).
+% \begin{macrocode}
+%<*rp>
+\newcommand\@extra{}
+\newcommand\extra[1]{\renewcommand\@extra{#1}}
+%</rp>
% \end{macrocode}
% \end{macro}
%
@@ -2301,38 +2550,59 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% \begin{macro}{\affiliation}
% The |affiliation| tag allows to specify the affiliation of the author.
% \begin{macrocode}
-%<*pt>
-\newcommand\@affiliation{\errmessage{Please, define the affiliation of
- the author using the \textbackslash{}affiliation command in the
- preamble of your document.}}
+%<*pt|rp>
+\newcommand\@affiliation{
+ \PackageError{uantwerpendocs}
+ {Please, define the affiliation of the author using the
+ '\protect\affiliation{}' command in the preamble of your
+ document.}
+ {See the uantwerpendocs manual}
+}
\newcommand\affiliation[1]{\renewcommand\@affiliation{#1}}
-%</pt>
+%</pt|rp>
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\supervisor}
-% This macro sets many |\@supervisor| tags (max. 4) that later will be used on
-% the title page.
+% This macro allows to specify one or more supervisors with their
+% affiliation. This can be done by invoking the macro as many times
+% as needed.
+% Note that as of v4.0 all supervisors are specified using the same
+% macro!
% \begin{macrocode}
%<*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.}
-\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}}
+\ExplSyntaxOn
+
+\seq_new:N \g_@@_supervisors
+\seq_new:N \g_@@_supervisorswithaffiliation
+\cs_new:Nn \@@_addsupervisor:nn {
+ \seq_gpush:Nn \g_@@_supervisors { #1 }
+ \seq_gpush:Nn \g_@@_supervisorswithaffiliation { #1,~#2 }
+}
+\NewDocumentCommand{\supervisor}{mm}{
+ \@@_addsupervisor:nn { #1 } { #2 }
+}
+\NewDocumentCommand{\jointsupervisors}{m}{
+ \seq_use:Nn \g_@@_supervisors { #1 }
+}
+\NewDocumentCommand{\jointsupervisorswithaffiliation}{m}{
+ \seq_use:Nn \g_@@_supervisorswithaffiliation { #1 }
+}
+\NewDocumentCommand{\supervisorsname}{}{
+ \if_int_compare:w \seq_count:N \g_@@_supervisors > 1
+ \uantwerpendocsprop{supervisorsname}
+ \else:
+ \if_int_compare:w \seq_count:N \g_@@_supervisors = 1
+ \uantwerpendocsprop{supervisorname}
+ \else:
+ \fi:
+ \fi:
+}
+\AtBeginDocument{
+ \seq_greverse:N \g_@@_supervisors
+ \seq_greverse:N \g_@@_supervisorswithaffiliation
+}
+\ExplSyntaxOff
%</bmt|pt>
% \end{macrocode}
% \end{macro}
@@ -2342,289 +2612,173 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the data page.
% \begin{macrocode}
%<*pt>
-\newcommand{\@jurychairman}{\errmessage{Please define a chairman of the jurya
- using the \textbackslash{}jurychairman command in the preamble of
- your document.}}
-\newcommand{\@jurychairmanaff}{}
-\newcommand{\jurychairman}[2]{
- \renewcommand{\@jurychairman}{#1}\renewcommand{\@jurychairmanaff}{#2}}
+\newcommand*{\@jurychairman}{
+ \PackageError{uantwerpendocs}
+ {Please, define a chairman of the jury using the
+ '\protect\jurychairman{}' command in the preamble of your
+ document.}
+ {See the uantwerpendocs manual}
+}
+\newcommand*{\@jurychairmanaff}{}
+\newcommand*{\jurychairman}[2]{
+ \renewcommand*{\@jurychairman}{#1}\renewcommand*{\@jurychairmanaff}{#2}}
%</pt>
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\jurymember}
-% This macro sets many |\@jurymember| tags (max. 6) that later will be used on
-% the data page.
+% This macro allows for the registration of jury members and their
+% affiliation. This can be done by invoking the macro as many times
+% as needed.
+% Note that as of v4.0 all jurymembers are specified using the same
+% macro!
+%
% \begin{macrocode}
-%<*pt>
-\newcommand{\@jurymemberi}{\errmessage{Please define jury members
- using the \textbackslash{}jurymemberi to vi commands in the
- preamble of your document.}}
-\newcommand\@jurymemberiaff{}
-\newcommand\@jurymemberii{}
-\newcommand\@jurymemberiiaff{}
-\newcommand\@jurymemberiii{}
-\newcommand\@jurymemberiiiaff{}
-\newcommand\@jurymemberiv{}
-\newcommand\@jurymemberivaff{}
-\newcommand\@jurymemberv{}
-\newcommand\@jurymembervaff{}
-\newcommand\@jurymembervi{}
-\newcommand\@jurymemberviaff{}
-\newcommand{\jurymemberi}[2]{
- \renewcommand\@jurymemberi{#1}\renewcommand\@jurymemberiaff{#2}}
-\newcommand{\jurymemberii}[2]{
- \renewcommand\@jurymemberii{#1}\renewcommand\@jurymemberiiaff{#2}}
-\newcommand{\jurymemberiii}[2]{
- \renewcommand\@jurymemberiii{#1}\renewcommand\@jurymemberiiiaff{#2}}
-\newcommand{\jurymemberiv}[2]{
- \renewcommand\@jurymemberiv{#1}\renewcommand\@jurymemberivaff{#2}}
-\newcommand{\jurymemberv}[2]{
- \renewcommand\@jurymemberv{#1}\renewcommand\@jurymembervaff{#2}}
-\newcommand{\jurymembervi}[2]{
- \renewcommand\@jurymembervi{#1}\renewcommand\@jurymemberviaff{#2}}
+%<*pt>
+\ExplSyntaxOn
+\seq_new:N \g_@@_jurymemberswithaffiliation
+\cs_new:Nn \@@_addjurymember:nn {
+ \seq_gpush:Nn \g_@@_jurymemberswithaffiliation { #1,~#2 }
+}
+\NewDocumentCommand{\jurymember}{mm}{
+ \@@_addjurymember:nn { #1 } { #2 }
+}
+\NewDocumentCommand{\jointjurymembers}{m}{
+ \seq_use:Nn \g_@@_jurymemberswithaffiliation { #1 }
+}
+\AtBeginDocument{
+ \seq_greverse:N \g_@@_jurymemberswithaffiliation
+}
+\ExplSyntaxOff
%</pt>
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\phddegree}
-% This macro sets the |\@phddegree| tag that later will
-% be used on the title pages.
+% This macro has been discontinued. Use |\degree| instead.
%
% \begin{macrocode}
%<*pt>
-\newcommand\@phddegree{\errmessage{Please, specify the offical PhD
- degree description using the \textbackslash{}phddegree macro in
- the preamble of your document.}}
-\newcommand\phddegree[1]{\renewcommand\@phddegree{#1}}
+\newcommand*\phddegree{
+ \PackageError{uantwerpendocs}
+ {The '\protect\phddegree{}' macro is no longer available. Use
+ '\protect\degree{}' instead}
+ {The interface of uantwerpendocs 4.0 has been changed. Use the
+ '\protect\degree' macro to specify your degree in full text (see
+ the uantwerpendocs manual)'}
+}
%</pt>
+%
+%
+% \begin{macro}{\degree}
+% This macro sets the |\@degree| tag that later will
+% be used on the title pages.
+%
+% \begin{macrocode}
+%<*bmt|pt|ct|ex>
+\newcommand*\@degree{
+ \PackageError{uantwerpendocs}
+ {Please, specify the offical degree description using
+ the '\protect\degree{}' macro in the preamble of your document.}
+ {See the uantwerpendocs manual}
+}
+\newcommand*\degree[1]{\renewcommand*\@degree{#1}}
+%</bmt|pt|ct|ex>
% \end{macrocode}
% \end{macro}
%
%
% \begin{macro}{\programme}
-% This macro sets the |\@programme| tags that later will
-% be used on the title page. The involved way of repeatedly calling
-% the renewcommand to set the tags is required for inclusion of the
-% data as QR data.
+% This macro is no longer in use.
+%
+% \changes{v2.5}{}{Shortened 'voorbereidingsprogramma' and
+% 'schakelprogramma' tags}
+% \changes{v4.0}{}{Discontinued, use |\textbackslash{}degree\{\}| instead}
%
-% \changes{v2.5}{}{Shortened 'voorbereidingsprogramma' and 'schakelprogramma' tags}
% \begin{macrocode}
%<*ct|pt|ex>
-\newcommand{\@programmet}{} % type
-\newcommand{\@programmec}{} % class
-\newcommand{\@programmecqr}{} % class for qr code
-\newcommand{\@programmes}{} % class
-\newcommand{\@programmeq}{} % qualifier
-\newcommand{\programme}[3]{%
- \ifthenelse{\equal{#1}{BA}}%
- {\renewcommand{\@programmet}{Bachelor of Science in de }}{%
- \ifthenelse{\equal{#1}{MA}}%
- {\renewcommand{\@programmet}{Master of Science in de }}{%
- \ifthenelse{\equal{#1}{PHD}}%
- {\renewcommand{\@programmet}{Doctor in de }}{%
- \ifthenelse{\equal{#1}{VP}}%
- {\renewcommand{\@programmet}{Voorbereidingsprogramma in de }}{%
- \ifthenelse{\equal{#1}{SP}}%
- {\renewcommand{\@programmet}{Schakelprogramma in de }}{%
- \ifthenelse{\equal{#1}{FREE}}%
- {}{
- \errmessage{Error in 1st arg of macro programme[3]: invalid
- programme type!}}}}}}}%
- %
- \ifthenelse{\equal{#2}{IW}}%
- {\renewcommand{\@programmec}{industri\"ele wetenschappen}
- \renewcommand{\@programmecqr}{industriële wetenschappen}}{
- \ifthenelse{\equal{#2}{}}%
- {}{
- \errmessage{{Error in 2nd arg of macro programme[3]: invalid
- programme class! }}}}%
- %
- \ifthenelse{\equal{#3}{BK}}%
- {\renewcommand{\@programmeq}{Bouwkunde}}{%
- \ifthenelse{\equal{#3}{CH}}%
- {\renewcommand{\@programmeq}{Chemie}}{%
- \ifthenelse{\equal{#3}{BCH}}%
- {\renewcommand{\@programmeq}{Biochemie}}{%
- \ifthenelse{\equal{#3}{EM}}%
- {\renewcommand{\@programmeq}{Elektromechanica}}{%
- \ifthenelse{\equal{#3}{EI}}%
- {\renewcommand{\@programmeq}{Elektronica-ICT}}{%
- \ifthenelse{\equal{#3}{}}%
- {}{%
- \ifthenelse{\equal{#1}{FREE}}
- {\renewcommand{\@programmeq}{#3}}{
- \errmessage{Error in 3rd arg to macro programme[3]: invalid
- programme qualifier}}}}}}}}%
- %
- \ifthenelse{\equal{#2}{IW}\and\not\equal{#3}{}}
- {\renewcommand{\@programmes}{: }}{}
+\newcommand*{\programme}[3]{
+ \PackageError{uantwerpendocs}
+ {The '\protect\programme{}{}{}' macro is no longer available. Use
+ '\protect\degree{}' instead}
+ {The interface of uantwerpendocs 4.0 has been changed. Use the
+ '\protect\degree' macro to specify your degree in full text (see
+ the uantwerpendocs manual)'}
}
%</ct|pt|ex>
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\course}
-% Four the |coursetext| class, this macro sets many |\@coursecode|
-% and |\@course| tags (max. 4) that later will be used on the title
-% page. If there is only one course code one can use the convenient
-% shorthand without counter.
+% Four the |coursetext| class, this macro sets one or more
+% courses.
+% and |\@course| tags that later will be used on the title
+% page.
+% Note that as of v4.0 all courses are specified using the same
+% macro!
% \begin{macrocode}
-%<*ct>
-\newcommand{\@coursecodei}{}
-\newcommand{\@coursecodeii}{}
-\newcommand{\@coursecodeiii}{}
-\newcommand{\@coursecodeiv}{}
-\newcommand{\@coursei}{}
-\newcommand{\@courseii}{}
-\newcommand{\@courseiii}{}
-\newcommand{\@courseiv}{}
-\newcommand{\@qrcoursei}{}
-\newcommand{\@qrcourseii}{}
-\newcommand{\@qrcourseiii}{}
-\newcommand{\@qrcourseiv}{}
-\newcommand{\course}[2]{
- \renewcommand{\@coursecodei}{#1}
- \renewcommand{\@coursei}{#2}
- \ifx\@qrcoursei\@emptymacro
- \renewcommand{\@qrcoursei}{#2}
- \fi
-}
-\newcommand{\qrcourse}[1]{
- \renewcommand{\@qrcoursei}{#1}
-}
-\newcommand{\coursei}[2]{
- \renewcommand{\@coursecodei}{#1}
- \renewcommand{\@coursei}{#2}
- \ifx\@qrcoursei\@emptymacro
- \renewcommand{\@qrcoursei}{#2}
- \fi
-}
-\newcommand{\qrcoursei}[1]{
- \renewcommand{\@qrcoursei}{#1}
-}
-\newcommand{\courseii}[2]{
- \renewcommand{\@coursecodeii}{#1}
- \renewcommand{\@courseii}{#2}
- \ifx\@qrcourseii\@emptymacro
- \renewcommand{\@qrcourseii}{#2}
- \fi
-}
-\newcommand{\qrcourseii}[1]{
- \renewcommand{\@qrcourseii}{#1}
-}
-\newcommand{\courseiii}[2]{
- \renewcommand{\@coursecodeiii}{#1}
- \renewcommand{\@courseiii}{#2}
- \ifx\@qrcourseiii\@emptymacro
- \renewcommand{\@qrcourseiii}{#2}
- \fi
-}
-\newcommand{\qrcourseiii}[1]{
- \renewcommand{\@qrcourseiii}{#1}
-}
-\newcommand{\courseiv}[2]{
- \renewcommand{\@coursecodeiv}{#1}
- \renewcommand{\@courseiv}{#2}
- \ifx\@qrcourseiv\@emptymacro
- \renewcommand{\@qrcourseiv}{#2}
- \fi
+%<*ct>
+\newcommand*\coursei[2]{
+ PackageError{uantwerpendocs}
+ {The '\protect\coursei{}' macro is no longer available. Use
+ '\protect\course{}' instead (multiple times if you need to)}
+ {The interface of uantwerpendocs 4.0 has been changed. Use the
+ '\protect\course macro instead of the \protect\coursei,
+ \protect\courseii, \protect\courseiii and \protect\courseiv macros
+ that existed earlier (see
+ the uantwerpendocs manual)'}
+}
+\ExplSyntaxOn
+\seq_new:N \g_@@_courseswithcodes
+\cs_new:Nn \@@_addcourse:nn {
+ \seq_gpush:Nn \g_@@_courseswithcodes{ \texttt{#1}~#2 }
+}
+\NewDocumentCommand{\course}{mm}{
+ \@@_addcourse:nn { #1 } { #2 }
+}
+\NewDocumentCommand{\jointcourseswithcodes}{m}{
+ \seq_use:Nn \g_@@_courseswithcodes { #1 }
}
-\newcommand{\qrcourseiv}[1]{
- \renewcommand{\@qrcourseiv}{#1}
+\AtBeginDocument{
+ \seq_greverse:N \g_@@_courseswithcodes
}
+\ExplSyntaxOff
%</ct>
-% \end{macrcode}
+% \end{macrocode}
% For the |exam| class (assuming that an exam only holds for a
% single course), the situation is simple and we assume only a
-% single coursecode and course name. We also don't need any of the
-% QR stamp stuff.
+% single coursecode and course name.
% \begin{macrocode}
%<*ex>
-\newcommand{\@coursecodei}{}
-\newcommand{\@coursei}{}
-\newcommand{\course}[2]{
- \renewcommand{\@coursecodei}{#1}
- \renewcommand{\@coursei}{#2}
+\newcommand*{\@coursecode}{}
+\newcommand*{\@course}{}
+\newcommand*{\course}[2]{
+ \renewcommand*{\@coursecode}{#1}
+ \renewcommand*{\@course}{#2}
}
%</ex>
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\diploma}
-% This macro sets the |\@diplomalevel| and |\@diploma| tags that
-% later will be used on the title page.
+% This macro sets the official diploma description into the
+% |\@diploma| tag 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{v2.3}{2019/03/27}{Added diploma level}
-% \changes{v2.4}{2019/04/10}{Added code for Master EM without specialization}
+% \changes{v2.4}{2019/04/10}{Added code for Master EM without
+% specialization}
+% \changes{v4.0}{2021/07/11}{Discontinued: removed all diploma codes}
% \begin{macrocode}
%<*bmt|pt>
-\newcommand{\@diplomalevel}{ERROR}
-\newcommand{\@diploma}{ERROR}
-\newcommand{\diploma}[1]{
- \newcommand{\MoS}{Master of Science}
- \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-CPS}}
- {\MoSIW:\\elektronica-ICT, optie
- Cyber-Physical Systems}{
- \ifthenelse{\equal{#1}{MA-IW-EI-IOT}}
- {\MoSIW:\\elektronica-IOT, optie Internet of
- Things}{
- \ifthenelse{\equal{#1}{MA-IW-EI-DAI}}
- {\MoSIW:\\elektronica-IOT, optie Distributed
- Artificial Intelligence}{
- \ifthenelse{\equal{#1}{MA-IW-EM-OE}}
- {\MoSIW:\\elektromechanica, optie Offshore
- Engineering}{
- \ifthenelse{\equal{#1}{MA-IW-EM-EN}}
- {\MoSIW:\\elektromechanica, optie Energie}{
- \ifthenelse{\equal{#1}{MA-IW-EM-OP}}
- {\MoSIW:\\elektromechanica, optie Ontwerp en
- Productie}{
- \ifthenelse{\equal{#1}{MA-IW-EM-AU}}
- {\MoSIW:\\elektromechanica, optie Automatisering}{
- \ifthenelse{\equal{#1}{MA-IW-EM}}
- {\MoSIW:\\elektromechanica}{
- \ifthenelse{\equal{#1}{MA-BE-HI}}
- {\MoS handelsingenieur}{
- \ifthenelse{\equal{#1}{MA-BE-HIBI}}
- {\MoS handelsingenieur in de beleidsinformatica}{
- \ifthenelse{\equal{#1}{MA-BE-EB}}
- {\MoSTEW: economisch beleid}{
- \ifthenelse{\equal{#1}{MA-BE-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-CPS, EI-IOT, EI-DAI,
- EM-OE, EM-AU, EM-OP, EM-EN, MA-BE-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*{\diploma}[1]{
+ \PackageError{uantwerpendocs}
+ {The '\protect\diploma{}' macro is no longer available. Use
+ '\protect\degree{}' instead}
+ {The interface of uantwerpendocs 4.0 has been changed. Use the
+ '\protect\degree' macro to specify your degree in full text (see
+ the uantwerpendocs manual)'}
}
%</bmt|pt>
% \end{macrocode}
@@ -2635,8 +2789,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% be used on the title page.
% \begin{macrocode}
%<*bmt|pt>
-\newcommand\@defensedate{ERROR}
-\newcommand{\defensedate}[1]{\renewcommand\@defensedate{#1}}
+\newcommand*\@defensedate{ERROR}
+\newcommand*{\defensedate}[1]{\renewcommand*\@defensedate{#1}}
%</bmt|pt>
% \end{macrocode}
% \end{macro}
@@ -2646,8 +2800,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% be used on the title page.
% \begin{macrocode}
%<*bmt|pt>
-\newcommand\@defenselocation{Antwerpen}
-\newcommand{\defenselocation}[1]{\renewcommand\@defenselocation{#1}}
+\newcommand*\@defenselocation{Antwerpen}
+\newcommand*{\defenselocation}[1]{\renewcommand*\@defenselocation{#1}}
%</bmt|pt>
% \end{macrocode}
% \end{macro}
@@ -2657,10 +2811,10 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% This macro sets the |\@titlepageimage| tags that later will
% be used on the title page, to include the graphics.
% \begin{macrocode}
-%<*pt>
-\newcommand\@titlepageimage{}
-\newcommand\titlepageimage[1]{\renewcommand\@titlepageimage{#1}}
-%</pt>
+%<*ct|pt|rp>
+\newcommand*\@titlepageimage{}
+\newcommand*\titlepageimage[1]{\renewcommand*\@titlepageimage{#1}}
+%</ct|pt|rp>
% \end{macrocode}
% \end{macro}
%
@@ -2671,8 +2825,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% don't specify one (i.e. don't use this macro).
% \begin{macrocode}
%<*pt>
-\newcommand{\@isbn}{}
-\newcommand{\isbn}[1]{\renewcommand{\@isbn}{#1}}
+\newcommand*{\@isbn}{}
+\newcommand*{\isbn}[1]{\renewcommand*{\@isbn}{#1}}
%</pt>
% \end{macrocode}
% \end{macro}
@@ -2685,8 +2839,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% don't specify one (i.e. don't use this macro).
% \begin{macrocode}
%<*pt>
-\newcommand{\@depot}{}
-\newcommand{\depot}[1]{\renewcommand{\@depot}{#1}}
+\newcommand*{\@depot}{}
+\newcommand*{\depot}[1]{\renewcommand*{\@depot}{#1}}
%</pt>
% \end{macrocode}
% \end{macro}
@@ -2697,8 +2851,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the title page.
% \begin{macrocode}
%<*ct|bmt|ex>
-\newcommand{\@academicyear}{XXX-YYYY}
-\newcommand{\academicyear}[1]{\renewcommand{\@academicyear}{#1}}
+\newcommand*{\@academicyear}{XXX-YYYY}
+\newcommand*{\academicyear}[1]{\renewcommand*{\@academicyear}{#1}}
%</ct|bmt|ex>
% \end{macrocode}
% \end{macro}
@@ -2707,10 +2861,10 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% This macro sets the |\@copyrightnotices| tag that later will be
% used on the back of the title page.
% \begin{macrocode}
-%<*ct>
+%<*ct|rp>
\newcommand{\@copyrightnotices}{}
\newcommand{\copyrightnotices}[1]{\renewcommand{\@copyrightnotices}{#1}}
-%</ct>
+%</ct|rp>
% \end{macrocode}
% \end{macro}
%
@@ -2719,10 +2873,10 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% used in the letter's heading text.
% \begin{macrocode}
%<*le>
-\newcommand{\@sender}{< Specify sender using
+\newcommand*{\@sender}{< Specify sender using
\textbackslash{}sender\{name\}\{role\} >}
-\newcommand{\@senderrole}{~}
-\newcommand{\sender}[2]{\renewcommand{\@sender}{#1}\renewcommand{\@senderrole}{#2}}
+\newcommand*{\@senderrole}{~}
+\newcommand*{\sender}[2]{\renewcommand*{\@sender}{#1}\renewcommand*{\@senderrole}{#2}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2732,7 +2886,7 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% graphics file with that name.
% \begin{macrocode}
%<*le|ex>
-\newcommand{\logo}[1]{\renewcommand{\@logo}{#1}}
+\newcommand*{\logo}[1]{\renewcommand*{\@logo}{#1}}
%</le|ex>
% \end{macrocode}
% \end{macro}
@@ -2742,8 +2896,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% heading text.
% \begin{macrocode}
%<*le>
-\newcommand{\@unit}{}
-\newcommand{\unit}[1]{\renewcommand{\@unit}{#1}}
+\newcommand*{\@unit}{}
+\newcommand*{\unit}[1]{\renewcommand*{\@unit}{#1}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2754,9 +2908,9 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% was used to overcome problems with the |@| sign.
% \begin{macrocode}
%<*le>
-\newcommand{\@emailuser}{}
-\newcommand{\@emaildomain}{}
-\newcommand{\email}[2]{\renewcommand{\@emailuser}{#1}\renewcommand{\@emaildomain}{#2}}
+\newcommand*{\@emailuser}{}
+\newcommand*{\@emaildomain}{}
+\newcommand*{\email}[2]{\renewcommand*{\@emailuser}{#1}\renewcommand*{\@emaildomain}{#2}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2766,8 +2920,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% heading text.
% \begin{macrocode}
%<*le>
-\newcommand{\@phone}{}
-\newcommand{\phone}[1]{\renewcommand{\@phone}{#1}}
+\newcommand*{\@phone}{}
+\newcommand*{\phone}[1]{\renewcommand*{\@phone}{#1}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2777,8 +2931,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% heading text.
% \begin{macrocode}
%<*le>
-\newcommand{\@fax}{}
-\newcommand{\fax}[1]{\renewcommand{\@fax}{#1}}
+\newcommand*{\@fax}{}
+\newcommand*{\fax}[1]{\renewcommand*{\@fax}{#1}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2789,8 +2943,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% heading text.
% \begin{macrocode}
%<*le>
-\newcommand{\@mobile}{}
-\newcommand{\mobile}[1]{\renewcommand{\@mobile}{#1}}
+\newcommand*{\@mobile}{}
+\newcommand*{\mobile}[1]{\renewcommand*{\@mobile}{#1}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2801,8 +2955,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% heading text (in the area of the envelope's window).
% \begin{macrocode}
%<*le>
-\newcommand{\@returnaddress}{<specify return-address using \textbackslash\{single-line-return-address\}>}
-\renewcommand{\returnaddress}[1]{\renewcommand{\@returnaddress}{#1}}
+\newcommand*{\@returnaddress}{<specify return-address using \textbackslash\{single-line-return-address\}>}
+\renewcommand*{\returnaddress}[1]{\renewcommand*{\@returnaddress}{#1}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2813,8 +2967,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% heading text (in the area of the envelope's window).
% \begin{macrocode}
%<*le>
-\newcommand{\@to}{<Specify addressee using \textbackslash{}to\{name\}>}
-\renewcommand{\to}[1]{\renewcommand{\@to}{#1}}
+\newcommand*{\@to}{<Specify addressee using \textbackslash{}to\{name\}>}
+\renewcommand*{\to}[1]{\renewcommand*{\@to}{#1}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2825,9 +2979,9 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the letter's heading text (in the area of the envelope's window).
% \begin{macrocode}
%<*le>
-\newcommand{\@toorganization}{<Specify organization using
+\newcommand*{\@toorganization}{<Specify organization using
\textbackslash{}toorganization\{\}>}
-\newcommand{\toorganization}[1]{\renewcommand{\@toorganization}{#1}}
+\newcommand*{\toorganization}[1]{\renewcommand*{\@toorganization}{#1}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2837,9 +2991,9 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the letter's heading text (in the area of the envelope's window).
% \begin{macrocode}
%<*le>
-\newcommand{\@toaddress}{<Specify (multiline) destination
+\newcommand*{\@toaddress}{<Specify (multiline) destination
address\\using \textbackslash{}toaddress\{\}>}
-\newcommand{\toaddress}[1]{\renewcommand{\@toaddress}{#1}}
+\newcommand*{\toaddress}[1]{\renewcommand*{\@toaddress}{#1}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2849,8 +3003,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the letter's heading text.
% \begin{macrocode}
%<*le>
-\newcommand{\@subject}{-}
-\newcommand*{\subject}[1]{\renewcommand{\@subject}{#1}}
+\newcommand*{\@subject}{-}
+\newcommand*{\subject}[1]{\renewcommand*{\@subject}{#1}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2870,9 +3024,9 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the letter.
% \begin{macrocode}
%<*le>
-\newcommand{\@closing}{<specify a closing formula using
+\newcommand*{\@closing}{<specify a closing formula using
\textbackslash{}closing\{\}>}
-\renewcommand*{\closing}[1]{\renewcommand{\@closing}{#1}}
+\renewcommand*{\closing}[1]{\renewcommand*{\@closing}{#1}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2884,8 +3038,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% vertical white space
% \begin{macrocode}
%<*le>
-\newcommand{\@signature}{\vspace*{8ex}}
-\renewcommand*{\signature}[1]{\renewcommand{\@signature}{#1}}
+\newcommand*{\@signature}{\vspace*{8ex}}
+\renewcommand*{\signature}[1]{\renewcommand*{\@signature}{#1}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2896,8 +3050,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the trailer of the letter.
% \begin{macrocode}
%<*le>
-\newcommand{\@carboncopy}{}
-\newcommand{\carboncopy}[1]{\renewcommand{\@carboncopy}{#1}}
+\newcommand*{\@carboncopy}{}
+\newcommand*{\carboncopy}[1]{\renewcommand*{\@carboncopy}{#1}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2907,8 +3061,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the trailer of the letter.
% \begin{macrocode}
%<*le>
-\newcommand{\@enclosed}{}
-\newcommand{\enclosed}[1]{\renewcommand{\@enclosed}{#1}}
+\newcommand*{\@enclosed}{}
+\newcommand*{\enclosed}[1]{\renewcommand*{\@enclosed}{#1}}
%</le>
% \end{macrocode}
% \end{macro}
@@ -2917,13 +3071,17 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% This macro will set the |\@address| tag that will be used in
% the letter's heading text (in the area of the envelope's window).
% \begin{macrocode}
-%<*pt|le>
-\newcommand{\@address}{\errmessage{Please, set your multi-line address
- and contact details using the \textbackslash{}address\{\} command
- in the preamble of your document}}
-%</pt|le>
-%<le>\renewcommand{\address}[1]{\renewcommand{\@address}{#1}}
-%<pt>\newcommand{\address}[1]{\renewcommand{\@address}{#1}}
+%<*pt|rp|le>
+\newcommand*{\@address}{
+ \PackageError{uantwerpendocs}
+ {Please, set your multi-line address and contact details using the
+ '\protect\address{}' command in the preamble of your document}
+ {See the uantwerpendocs manual}
+}
+%</pt|rp|le>
+%
+%<pt|rp>\newcommand*{\address}[1]{\renewcommand*{\@address}{#1}}
+%<le>\renewcommand*{\address}[1]{\renewcommand*{\@address}{#1}}
% \end{\macrocode}
% \end{macro}
%
@@ -2932,8 +3090,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the exam title page.
% \begin{macrocode}
%<*ex>
-\newcommand{\@exampart}{}
-\newcommand{\exampart}[1]{\renewcommand{\@exampart}{#1}}
+\newcommand*{\@exampart}{}
+\newcommand*{\exampart}[1]{\renewcommand*{\@exampart}{#1}}
%</ex>
% \end{macrocode}
% \end{macro}
@@ -2943,8 +3101,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the exam title page.
% \begin{macrocode}
%<*ex>
-\newcommand{\@examgroupnumber}{}
-\newcommand{\examgroupnumber}[1]{\renewcommand{\@examgroupnumber}{#1}}
+\newcommand*{\@examgroupnumber}{}
+\newcommand*{\examgroupnumber}[1]{\renewcommand*{\@examgroupnumber}{#1}}
%</ex>
% \end{macrocode}
% \end{macro}
@@ -2954,8 +3112,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the exam title page.
% \begin{macrocode}
%<*ex>
-\newcommand{\@examdate}{TBD}
-\newcommand{\examdate}[1]{\renewcommand{\@examdate}{#1}}
+\newcommand*{\@examdate}{TBD}
+\newcommand*{\examdate}[1]{\renewcommand*{\@examdate}{#1}}
%</ex>
% \end{macrocode}
% \end{macro}
@@ -2965,8 +3123,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the exam title page.
% \begin{macrocode}
%<*ex>
-\newcommand{\@examlength}{TBD}
-\newcommand{\examlength}[1]{\renewcommand{\@examlength}{#1}}
+\newcommand*{\@examlength}{TBD}
+\newcommand*{\examlength}[1]{\renewcommand*{\@examlength}{#1}}
%</ex>
% \end{macrocode}
% \end{macro}
@@ -2976,8 +3134,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the exam title page.
% \begin{macrocode}
%<*ex>
-\newcommand{\@tstart}{TBD}
-\newcommand{\tstart}[1]{\renewcommand{\@tstart}{#1}}
+\newcommand*{\@tstart}{TBD}
+\newcommand*{\tstart}[1]{\renewcommand*{\@tstart}{#1}}
%</ex>
% \end{macrocode}
% \end{macro}
@@ -2987,19 +3145,40 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% the exam title page.
% \begin{macrocode}
%<*ex>
-\newcommand{\@tend}{TBD}
-\newcommand{\tend}[1]{\renewcommand{\@tend}{#1}}
+\newcommand*{\@tend}{TBD}
+\newcommand*{\tend}[1]{\renewcommand*{\@tend}{#1}}
%</ex>
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\rooms}
+% \begin{macro}{\room}
% This macro will set the |\@rooms| tag that will be used on
% the exam title page.
% \begin{macrocode}
%<*ex>
-\newcommand{\@rooms}{TBD}
-\newcommand{\rooms}[1]{\renewcommand{\@rooms}{#1}}
+\ExplSyntaxOn
+\seq_new:N \g_@@_rooms
+\cs_new:Nn \@@_addroom:n {
+ \seq_gpush:Nn \g_@@_rooms { #1 }
+}
+\NewDocumentCommand{\room}{m}{
+ \@@_addroom:n { #1 }
+}
+\NewDocumentCommand{\jointrooms}{m}{
+ \seq_use:Nn \g_@@_rooms { #1 }
+}
+\NewDocumentCommand{\roomsname}{}{
+ \if_int_compare:w \seq_count:N \g_@@_rooms > 1
+ \uantwerpendocsprop{roomsname}
+ \else:
+ \uantwerpendocsprop{roomname}
+ \fi:
+}
+\AtBeginDocument{
+ \seq_greverse:N \g_@@_rooms
+}
+
+\ExplSyntaxOff
%</ex>
% \end{macrocode}
% \end{macro}
@@ -3032,8 +3211,10 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
\renewcommand{\@extrainfo}{#2}
}
{
- \errmessage{Error: '\extrainfo' - first (optional) argument can
+ \PackageError{uantwerpendocs}
+ {The first (optional) argument of '\protect\extrainfo' can
only be 'separatepage' or 'firstpage'}
+ {See the uantwerpendocs manual)'}
}
}
}
@@ -3047,22 +3228,22 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% header of the pages.
% \begin{macrocode}
%<*ex>
-\newcommand{\@studentnr}{0}
-\newcommand{\studentnr}[1]{\renewcommand{\@studentnr}{#1}}
+\newcommand*{\@studentnr}{0}
+\newcommand*{\studentnr}[1]{\renewcommand*{\@studentnr}{#1}}
%</ex>
% \end{macrocode}
% \end{macro}
%
% \subsection{Header and Footer}
% The |fancyhdr| package is used to make a decent header and footer.
-% The header and footer of the |uantwerpencoursetext| class are defined to be:
+% The header and footer of the |coursetext| class are defined to be:
% \begin{macrocode}
%<*ct>
\if@twoside
\lhead[\thepage]{\slshape\rightmark}
\chead[]{}
\rhead[\slshape\leftmark]{\thepage}
-\lfoot[\uaname{} -- \@facultyacronym]{\@courseversion}
+\lfoot[\uantwerpendocsprop{org-ua} -- \@facultyacronym]{\@courseversion}
\cfoot[]{}
\rfoot[]{\@title{}\ifdefvoid{\@subtitle}{}{ --- \@subtitle}}
\else
@@ -3076,10 +3257,10 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
%</ct>
% \end{macrocode}
%
-% The header and footer of the |uantwerpenbamathesis| class are
+% The header and footer of the |bamathesis| class are
% defined to be:
% \begin{macrocode}
-%<*bmt|pt>
+%<*bmt|pt|rp>
\if@twoside
\lhead[\thepage]{\slshape\rightmark}
\chead[]{}
@@ -3095,10 +3276,10 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
\cfoot[]{}
\rfoot[]{}
\fi
-%</bmt|pt>
+%</bmt|pt|rp>
% \end{macrocode}
%
-% The header and footer of the |uantwerpenletter| class are
+% The header and footer of the |letter| class are
% defined to be:
% \begin{macrocode}
%<*le>
@@ -3107,17 +3288,18 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
\rhead[]{}
\lfoot[\small\textcolor{gray}{\@date}]{\textcolor{gray}{\@date}}
\cfoot[]{}
-\rfoot[\small\textcolor{gray}{\pagename~\thepage~\orname~\pageref{lastpage}}]
- {\small\textcolor{gray}{\pagename~\thepage~\orname~\pageref{lastpage}}}
+\rfoot[\small\textcolor{gray}{\pagename~\thepage~\uantwerpendocsprop{of}~\pageref{lastpage}}]
+ {\small\textcolor{gray}{\pagename~\thepage~\uantwerpendocsprop{of}~\pageref{lastpage}}}
%</le>
% \end{macrocode}
%
-% The header and footer of the |uantwerpenexam| class are defined to
+% The header and footer of the |exam| class are defined to
% be:
% \begin{macrocode}
%<*ex>
\lhead[]{}
\chead[]{}
+\cfoot[\small \thepage/\pageref{lastpage}]{\small\thepage/\pageref{lastpage}}
\if@examiner
\rhead[\small EXAMINER VERSION]{\small EXAMINER VERSION}
\AddToShipoutPicture{
@@ -3127,10 +3309,6 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
\else
\rhead[\small Student nr. \@studentnr]{\small Student nr. \@studentnr}
\fi
-\lfoot[\small \@shorttitle]{\small \@shorttitle}
-\cfoot[\small \thepage/\pageref{lastpage}]{\small\thepage/\pageref{lastpage}}
-\rfoot[\small Groep \@examgroupnumber{} ---
-\@academicyear]{\small Groep \@examgroupnumber{} --- \@academicyear}
%</ex>
% \end{macrocode}
@@ -3141,30 +3319,30 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% \begin{macrocode}
%<*ct>
\setlength{\headheight}{13.7pt}
-\renewcommand{\headrulewidth}{1pt}
-\renewcommand{\footrulewidth}{1pt}
+\renewcommand*{\headrulewidth}{1pt}
+\renewcommand*{\footrulewidth}{1pt}
\pagenumbering{arabic}
%</ct>
-%<*mt|pt|le>
-\renewcommand{\headrulewidth}{0pt}
-\renewcommand{\footrulewidth}{0pt}
-%</mt|pt|le>
+%<*mt|pt|rp|le>
+\renewcommand*{\headrulewidth}{0pt}
+\renewcommand*{\footrulewidth}{0pt}
+%</mt|pt|rp|le>
%<*ex>
-\renewcommand{\headrulewidth}{0pt}
-\renewcommand{\footrulewidth}{1pt}
+\renewcommand*{\headrulewidth}{0pt}
+
%</ex>
% \end{macrocode}
%
% Remains to take care of filling
%
% \begin{macrocode}
-%<*ct|mt|pt|le>
+%<*ct|mt|pt|rp|le>
\if@filled\else
\raggedright
\fi
\raggedbottom
\onecolumn
-%</ct|mt|pt|le>
+%</ct|mt|pt|rp|le>
% \end{macrocode}
%
% \subsection{Copyright notice}
@@ -3172,19 +3350,21 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% \begin{macro}{\@crnotice}
% This is the standard text that will be used for the |\@crnotice| tag.
% \begin{macrocode}
-%<*ct>
+%<*ct|rp>
\newcommand{\@crnotice}{
This document has been typeset using \LaTeX{} and the
- \texttt{uantwerpencoursetext} class.\\
+ \texttt{uantwerpendocs} package.\\
\@copyrightnotices
- \@courseversion
+%</ct|rp>
+%<ct> \@courseversion
+%<*ct|rp>
CONFIDENTIAL AND PROPRIETARY.
- \copyright{} \@versionyear{} University of Antwerp, \arrname.
+ \copyright{} \@versionyear{} \uantwerpendocsprop{org-ua}, \uantwerpendocsprop{arr}.
}
-%</ct>
+%</ct|rp>
% \end{macrocode}
% \end{macro}
%
@@ -3196,7 +3376,7 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% \changes{v2.2}{2018/10/23}{Added white chapter number outline}
% \changes{v2.2}{2018/10/23}{Corrected spacing}
% \begin{macrocode}
-%<*pt>
+%<*pt|rp>
\def\@makechapterhead#1{%
\vspace*{1ex}%
\begin{flushright}
@@ -3236,9 +3416,9 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
\def\appendix{
\setcounter{chapter}{0}
\renewcommand*{\thechapter}{\Alph{chapter}}
- \renewcommand\chaptername\appendixname
+ \renewcommand*\chaptername\appendixname
}
-%</pt>
+%</pt|rp>
% \end{macrocode}
%
% \subsection{Title page for the masterthesis and coursetext clases}
@@ -3247,241 +3427,96 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
% book class from which we inherit already defines this command, we
% need to renew it.
%
-% The UAntwerpen house style works with large-radius circles.
-% We need some math in order to calculate center points an radiuses
-%
-% \paragraph{Header circle:} the blue header-circle on top of the
-% page. We calculate the center point and the radius based on:
-% \begin{itemize}
-% \item the fact that the center point is above the page's left edge;
-% \item the distance of the intersection points at the left and right
-% edge of the page with respect to the top of the page, $X$ and $Y$
-% respectively;
-% \item the width of the page $W$.
-% \end{itemize}
-% Some simple trigonometry leads to the elevation of the center point
-% above the top of the page $Q$ and the radius $R$:
-% \begin{eqnarray}
-% R &=& \frac{W^2 + (X-Y)^2}{2(X-Y)}\\
-% Q &=& R - X
-% \end{eqnarray}
-% We labeled the variables in the code below with a prefix
-% |ua@| and a suffix h (from 'header'). We also took the paperheight
-% into account (the page's coordinate system origins at the left
-% bottom.
-%
-% Therefore:
-% \begin{macrocode}
-%<*ct|bmt>
-\pgfmathsetmacro{\ua@Wh}{\paperwidth}
-\pgfmathsetmacro{\ua@Xh}{0.2\paperheight}
-\pgfmathsetmacro{\ua@Yh}{0.125\paperheight}
-\pgfmathsetmacro{\ua@XMYh}{\ua@Xh-\ua@Yh}
-\pgfmathsetmacro{\ua@Rh}{0.5*\ua@Wh/\ua@XMYh*\ua@Wh+0.5*\ua@XMYh}
-\pgfmathsetmacro{\ua@Qh}{\ua@Rh-\ua@Xh+\paperheight}
-%</ct|bmt>
-% \end{macrocode}
-%
-% \paragraph{Bottom circle A:} the bottom circle with the largest
-% radius. We calculate the center point and the radius based on:
-% \begin{itemize}
-% \item the fact that the center point is at a distance of 3/5 page
-% width from the right page edge. We denote that distance by $W$;
-% \item the fact that the horizontal bottom tangent line of the circle
-% is at a specific height above the bottom page edge, labeled $S$;
-% \item the distance of the intersection points at the right edge of
-% the page with respect to the horizontal bottom tangent line of the
-% circle, denoted as $X-Y$.
-% \end{itemize}
-% Given these definitions, almost the same equations as for the header
-% circle hold:
-% \begin{eqnarray}
-% R &=& \frac{W^2 + (X-Y)^2}{2(X-Y)}\\
-% Q &=& R + S
-% \end{eqnarray}
-% with $R$ the circle's radius, and $Q$ the elevation of the center
-% point above the page's bottom.
-%
-% We labeled the variables in the code below with a prefix
-% |ua@| and a suffix ba (from 'bottom a').
-% Therefore:
-% \begin{macrocode}
-%<*ct|bmt>
-\pgfmathsetmacro{\ua@Wba}{0.4*\paperwidth}
-\pgfmathsetmacro{\ua@Sba}{0.125*\paperheight}
-\pgfmathsetmacro{\ua@XMYba}{0.02\paperheight}
-\pgfmathsetmacro{\ua@Rba}{0.5*\ua@Wba/\ua@XMYba*\ua@Wba+0.5*\ua@XMYba}
-\pgfmathsetmacro{\ua@Qba}{\ua@Rba+\ua@Sba}
-%</ct|bmt>
-% \end{macrocode}
-%
-%
-% \paragraph{Bottom circle B:} the bottom circle with the smallest
-% radius. The same reasoning leads to:
-%
-% \begin{macrocode}
-%<*ct|bmt>
-\pgfmathsetmacro{\ua@Wbb}{0.65*\paperwidth}
-\pgfmathsetmacro{\ua@Sbb}{0.14*\paperheight}
-\pgfmathsetmacro{\ua@XMYbb}{0.06\paperheight}
-\pgfmathsetmacro{\ua@Rbb}{0.5*\ua@Wbb/\ua@XMYbb*\ua@Wbb+0.5*\ua@XMYbb}
-\pgfmathsetmacro{\ua@Qbb}{\ua@Rbb+\ua@Sbb}
-%</ct|bmt>
-% \end{macrocode}
-%
-% \paragraph{Text alignment:} The text is aligned around an imaginary
-% vertical line around 2/5 page width distance from the left edge.
-%
-% \begin{macrocode}
-%<*ct|bmt>
-\pgfmathsetmacro{\ua@ll}{0.15*\paperwidth}
-\pgfmathsetmacro{\ua@l}{0.4*\paperwidth}
-\pgfmathsetmacro{\ua@d}{0.1in}
-\pgfmathsetmacro{\ua@rr}{0.85*\paperwidth}
-%</ct|bmt>
-% \end{macrocode}
-%
-% Below, one can find the code for the title page of the
-% |uantwerpencoursetext| class. We start with setting up some things
-% for the (optional) QR mark.
-% \changes{v1.3}{2015/12/31}{Changed eso-pic for tikz and background}
-% \begin{macrocode}
-%<*ct>
-\newcommand\sprtr{ / }
-\newcommand\myqrdata{
-I: Universiteit Antwerpen\string\n
-F: \@faculty\string\n
-P: \@programmet\ \@programmecqr\ \@programmeq\string\n
-C: \@coursecodei\ \@qrcoursei
-\sprtr
-\@coursecodeii\ \@qrcourseii
-\sprtr
-\@coursecodeiii\ \@qrcourseiii
-\sprtr
-\@coursecodeiv\ \@qrcourseiv
-\string\n
-Y: \@academicyear\string\n
-T: \@qrtitle\string\n
-S: \@qrsubtitle\string\n
-A: \@qrauthor\string\n
-L: \@qrlectureri
-\sprtr
-\@qrlecturerii
-\sprtr
-\@qrlectureriii
-\sprtr
-\@qrlectureriv}
-\newsavebox{\myqrcode}
-%</ct>
-% \end{macrocode}
-%
%
% \begin{macro}{\maketitle}
-% And finally, here is the |\maketitle| macro:
+% The macro for the coursetext class:
% \changes{v1.7}{2016/05/01}{Embedded babel translations of keywords
% into title page}
% \begin{macrocode}
%<*ct>
\renewcommand\maketitle{%
\pagestyle{empty}
- \if@qr
- \savebox{\myqrcode}[2.7in][t]{
- \begin{pspicture}(2.7in,2.7in)
- \psbarcode{\myqrdata}
- {width=1.0 height=1.0 encoding=byte eclevel=M}
- {qrcode}
- \end{pspicture}
- }
- \fi
\begin{titlepage}
- \if@titlepagetableonly
- Dit is een cursustekst van Universiteit Antwerpen.\\
- Het titelblad dient opgemaakt te worden met de volgende gegevens:
- \begin{center}
- \begin{tabular}{|l|l|}
- \hline
- \bfseries I & Universiteit Antwerpen \\\hline
- \bfseries F & \@faculty \\\hline
- \bfseries P & \parbox[t]{14cm}{\@programmet
- \@programmec\@programmes \@programmeq} \\\hline
- \bfseries C & \parbox[t]{14cm}{
- \texttt{\@coursecodei} \@coursei\\
- \texttt{\@coursecodeii} \@courseii\\
- \texttt{\@coursecodeiii} \@courseiii\\
- \texttt{\@coursecodeiv} \@courseiv} \\\hline
- \bfseries Y & \@academicyear \\\hline
- \bfseries T & \parbox[t]{14cm}{\@title}\\\hline
- \bfseries S & \parbox[t]{14cm}{\@subtitle}\\\hline
- \bfseries A & \parbox[t]{14cm}{\@author}\\\hline
- \bfseries L & \parbox[t]{14cm}{\@lectureri\\
- \@lecturerii\\
- \@lectureriii\\
- \@lectureriv} \\\hline
- \end{tabular}
- \end{center}
- ~\\
- Waarbij: I = instelleng, F = faculteit, P = programma, C =
- cursusmodule, T = titel, S = subtitel, A = auteur(s), L =
- lesgever(s)\\~\\
- \if@qr
- Deze informatie is ook gecodeerd in de onderstaande QR-code.\\
- \vspace*{1cm}
- \usebox{\myqrcode}
- \fi
- \else
- \begin{tikzpicture}[remember picture,overlay]
- \node at (current page.center) {
- \begin{tikzpicture}[inner sep=0pt]
+ \AddToShipoutPicture*{%
+ \put(0,0){%
+ \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
\clip (0,0) rectangle(\paperwidth,\paperheight);
- \if@titlepagenoartwork\else
- \filldraw [uacorpbord] (0.55\paperwidth,\ua@Qba pt) circle (\ua@Rba pt);
- \filldraw [white] (0.35\paperwidth,\ua@Qbb pt) circle (\ua@Rbb pt);
- \filldraw [uacorpblue] (0,\ua@Qh pt) circle (\ua@Rh pt);
- \path
- (0.95\paperwidth,0.1\paperheight)
- node [anchor=north east] {
- \includegraphics[width=0.25\paperwidth]{\@logo}};
- \fi
- \path
- (\ua@l pt -\ua@d pt,0.77\paperheight)
- node [anchor=north east, text width=0.35\paperwidth] {
- \begin{flushright}
- \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] {
- {\large \@faculty{}}\\[0.05\paperheight]
- {\huge \bf \@title{}}\\[2ex]
- {\Large \bf \@subtitle{}}\\[3ex]
- {\Large \bf \@author{}}}
- (\ua@l pt +\ua@d pt,0.45\paperheight)
- node [anchor = north west, text width = 0.55\paperwidth] {
- \@lectureri~\\
- \@lecturerii~\\
- \@lectureriii~\\
- \@lectureriv}
- (\ua@l pt +\ua@d pt,0.35\paperheight)
- node [anchor = north west, text width = 0.55\paperwidth] {
- {\bf \@programmet \\ \@programmec\@programmes \@programmeq}}
- (\ua@l pt +\ua@d pt,0.30\paperheight)
- node [anchor = north west, text width = 0.55\paperwidth] {
- \texttt{\@publishercode}~\\~\\
- \texttt{\@coursecodei{}} \@coursei~\\
- \texttt{\@coursecodeii{}} \@courseii~\\
- \texttt{\@coursecodeiii{}} \@courseiii~\\
- \texttt{\@coursecodeiv{}} \@courseiv}
- (\ua@l pt - 2\ua@d pt, 0.368\paperheight)
- node [anchor = north east, text width = 0.35\paperwidth] {
- {\normalsize\begin{flushright}
- \@publisher{}
- \end{flushright}}};
+
+ \begin{scope}
+ \clip (2.125,20.192) rectangle (\paperwidth,6);
+ \fill[sidecolor]
+ (2.125,20.192) rectangle (\paperwidth,6);
+ \node[anchor=south west]
+ at (2.125,6)
+ {\ifx\@titlepageimage\@empty
+ \else
+ \includegraphics[keepaspectratio,
+ scale=0.01,
+ min size={18.875cm}{14.192cm}]{\@titlepageimage}
+ \fi};
+ \end{scope}
+
+
+ \node
+ [anchor=west,text width=13.75cm,align=left,font=\Huge,uauaside]
+ at (2.125,27)
+ {
+ \textsf{\textbf{\@title}}
+ };
+
+ \node
+ [anchor=west,text width=13.75cm,align=left,font=\Large,uauaside]
+ at (2.125,25.5)
+ {
+ \textsf{\textbf{\@subtitle}}
+ };
+
+ \node
+ [anchor=base west,maincolor,text width=13.75cm,align=left,font=\LARGE]
+ at (2.125,24)
+ {\textsf{\textbf{\@author}}};
+
+
+ \node
+ [anchor=west,text width=13.75cm,align=left,font=\large,uauaside]
+ at (2.125,22)
+ {\textsf{\jointcourseswithcodes{\\}}};
+
+ \fill[maincolor] (2.125,6)
+ -- (\paperwidth,6)
+ -- (\paperwidth,2.625)
+ -- (2.55,2.625)
+ arc (-90:-180:0.425)
+ -- cycle;
+
+ \node[white,anchor=west,align=left,font=\large]
+ (SN) at (2.55,5.1)
+ {
+ \begin{tabular}{@{}l@{~\,}p{14.5cm}}
+ \textsf{\lecturersname}
+ & \textsf{\textbf{\jointlecturers{ | }}}
+ \end{tabular}
+ };
+
+ \node[white,anchor=west,text width=17.5cm,align=left,font=\small]
+ at (2.55,3.7)
+ {\textsf{\@degree{}}\\
+ \textsf{\textbf{\@faculty{} | \@academicyear \hfill
+ \@publishercode}}\\
+ \textsf{\@publisher}};
+
+ \node[anchor=west] at (2.125,1.313)
+ {\includegraphics[width=4.75cm]{\logopos}};
\end{tikzpicture}
- };
- \end{tikzpicture}
- \fi
+ }
+ }
\end{titlepage}%
+ ~\par\relax
\clearpage
+ \if@copyright
+ \backgroundsetup{contents={Copyright University of Antwerp, All
+ Rights Reserved}}
+ \fi
\vspace*{\stretch{1}}
\@crnotice
\clearpage
@@ -3502,14 +3537,12 @@ L: \@qrlectureri
%
% \begin{macro}{\makefinalpage}
% Below, one can find the code for the final page of the
-% |uantwerpencoursetext| class:
+% |coursetext| class:
% \changes{v1.3}{2015/12/31}{Changed eso-pic for tikz}
% \changes{v1.8}{2016/07/06}{Inserted blank one but last page}
% \begin{macrocode}
%<*ct>
\newcommand\makefinalpage{
- \if@titlepagetableonly
- \else
\cleardoublepage
\thispagestyle{empty}
~% intentionally blank page
@@ -3519,24 +3552,10 @@ L: \@qrlectureri
\node at (current page.center) {
\begin{tikzpicture}[inner sep=0pt]
\clip (0,0) rectangle(\paperwidth,\paperheight);
- \if@titlepagenoartwork\else
- \filldraw [uacorpblue] (\paperwidth,\ua@Qh pt) circle (\ua@Rh pt);
- \fi
- \path
- (0.1\paperwidth,0.1\paperheight)
- node [anchor = south west, text width = 0.6\paperwidth] {
- CONFIDENTIAL AND PROPRIETARY\\~\\
-
- \copyright{} \@versionyear{} \uaname,
- \arrname.}
- (0.9\paperwidth,0.1\paperwidth)
- node [anchor = south east] {
- \usebox{\myqrcode}
- };
+ \fill[sidecolor] (0,0) rectangle (2.125cm,2.625cm);
\end{tikzpicture}
};
\end{tikzpicture}
- \fi
}
%</ct>
% \end{macrocode}
@@ -3544,7 +3563,7 @@ L: \@qrlectureri
%
% \begin{macro}{\maketitle}
% And next, the code for the title page of the
-% |uantwerpenmasterthesis| class:
+% |bamathesis| 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}
@@ -3553,49 +3572,65 @@ L: \@qrlectureri
\renewcommand\maketitle{%
\pagestyle{empty}
\begin{titlepage}
- \begin{tikzpicture}[remember picture,overlay]
- \node at (current page.center) {
- \begin{tikzpicture}[inner sep=0pt]
+ \AddToShipoutPicture*{%
+ \put(0,0){%
+ \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
\clip (0,0) rectangle(\paperwidth,\paperheight);
- \if@titlepagenoartwork\else
- \filldraw [lightgray]
- (0.55\paperwidth,\ua@Qba pt) circle (\ua@Rba pt);
- \filldraw [white] (0.35\paperwidth,\ua@Qbb pt) circle (\ua@Rbb pt);
- \filldraw [lightgray] (0,\ua@Qh pt) circle (\ua@Rh pt);
- \path
- (0.95\paperwidth,0.1\paperheight)
- node [anchor=north east] {
- \includegraphics[width=0.25\paperwidth]{\@logo}};
- \fi
- \path
- (\ua@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@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
+ \fill[lightgray]
+ (2.125,{\paperheight-7.5cm}) rectangle (\paperwidth,6);
+
+ \node
+ [anchor=west,text width={\paperwidth-5cm},align=left,font=\Huge,uauaside]
+ at (2.125,{\paperheight-3cm})
+ {
+ \textsf{\textbf{\@title}}
+ };
+
+ \node
+ [anchor=west,text width={\paperwidth-5cm},align=left,font=\Large,uauaside]
+ at (2.125,{\paperheight-5cm})
+ {
+ \textsf{\textbf{\@subtitle}}
+ };
+
+ \node
+ [anchor=base west,uauamain,
+ text width={\paperwidth-5cm},align=left,font=\LARGE]
+ at (2.125,{\paperheight-6.5cm})
+ {\textsf{\textbf{\@author}}};
+
+ \fill[gray] (2.125,6)
+ -- (\paperwidth,6)
+ -- (\paperwidth,2.625)
+ -- (2.55,2.625)
+ arc (-90:-180:0.425)
+ -- cycle;
+
+ \node[white,anchor=west,align=left,font=\large]
+ (SN) at (2.55,4.9)
+ {
+ \begin{tabular}{@{}l@{~\,}p{14.5cm}}
+ \textsf{\supervisorsname}
+ & \textsf{\textbf{\jointsupervisors{ | }}}
\end{tabular}
- }
- (\ua@ll pt,0.3\paperheight)
- node [anchor=north west, text width = 0.7\paperwidth]{%
- \bmthesisname\\
- \@diploma\\
- \@defenselocation, \@defensedate
};
+
+
+ \node[white,anchor=west,text width=17.5cm,align=left,font=\small]
+ at (2.55,3.7)
+ {\textsf{\uantwerpendocsprop{bmthesisname}
+ \@degree{}}\\
+ \textsf{\textbf{\@faculty{}
+ | \@defenselocation, \@defensedate}}};
+
+ \node[anchor=west] at
+ (2.125,1.313)
+ {\includegraphics[width=4.75cm]{\logoposua}};
\end{tikzpicture}
- };
- \end{tikzpicture}
+ }
+ }
\end{titlepage}%
+ ~\par\relax
\clearpage
\setcounter{footnote}{0}%
\global\let\thanks\relax
@@ -3614,20 +3649,21 @@ L: \@qrlectureri
%
% \begin{macro}{\makefinalpage}
% Below, one can find the code for the final page of the
-% |uantwerpenmasterthesis| class:
+% |bamathesis| class:
% \changes{v1.3}{2015/12/31}{Changed eso-pic for tikz}
% \begin{macrocode}
%<*bmt>
\newcommand\makefinalpage{
\cleardoublepage
\thispagestyle{empty}
+ ~% intentionally blank page
+ \clearpage
+ \thispagestyle{empty}
\begin{tikzpicture}[remember picture,overlay]
\node at (current page.center) {
\begin{tikzpicture}[inner sep=0pt]
\clip (0,0) rectangle(\paperwidth,\paperheight);
- \if@titlepagenoartwork\else
- \filldraw [lightgray] (\paperwidth,\ua@Qh pt) circle (\ua@Rh pt);
- \fi
+ \fill[lightgray] (0,0) rectangle (2.125cm,2.625cm);
\end{tikzpicture}
};
\end{tikzpicture}
@@ -3642,28 +3678,9 @@ L: \@qrlectureri
% book class from which we inherit already defines this command, we
% need to renew it.
%
-% The UAntwerpen house style works with large-radius circles.
-% We need some math in order to calculate center points an radiuses
-%
-% The width and height of the page are labeled X and Y in the house
-% style. The radius of the circles equals 6 times X. Therefore:
-% \begin{macrocode}
-%<*pt>
-\pgfmathsetmacro{\ua@X}{\paperwidth}
-\pgfmathsetmacro{\ua@Y}{\paperheight}
-\pgfmathsetmacro{\ua@R}{6*\paperwidth}
-\pgfmathsetmacro{\ua@B}{(\ua@X+\ua@Y)/15}
-\pgfmathsetmacro{\ua@L}{0.25*\ua@X}
-\pgfmathsetmacro{\ua@Z}{0.1*\ua@L}
-\pgfmathsetmacro{\ua@H}{0.3*\ua@L}
-\pgfmathsetmacro{\ua@h}{0.5*(\ua@B-\ua@H)}
-%</pt>
-% \end{macrocode}
-%
-%
% \begin{macro}{\maketitle}
% Below, one can find the code for the title page of the
-% |uantwerpenphdthesis| class:
+% |phdthesis| class:
% \changes{v2.0}{2018/03/14}{Implemented title page}
% \changes{v2.1}{2018/06/20}{Corrected information page (p4) jury
% spacing}
@@ -3674,90 +3691,89 @@ L: \@qrlectureri
\renewcommand\maketitle{%
\pagestyle{empty}
\begin{titlepage}
- \if@titlepagetableonly
- Dit is een doctoraatsthesis van Universiteit Antwerpen.
- \else
- \begin{tikzpicture}[remember picture,overlay]
- \node at (current page.center) {
- \begin{tikzpicture}[inner sep=0pt]
+ \AddToShipoutPicture*{%
+ \put(0,0){%
+ \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
\clip (0,0) rectangle(\paperwidth,\paperheight);
-
- \filldraw[uacorpblue]
- (0.5*\ua@X pt,\ua@B+\ua@R pt) circle (\ua@R pt)
- (\ua@X pt, 0.25*\ua@Y+\ua@R pt) circle (\ua@R pt);
-
- \node[anchor=south east] at (\ua@X-3*\ua@Z pt,\ua@h pt)
- {\includegraphics[width=\ua@L pt]{\@logo}};
-
+ \fill[lightgray]
+ (2.125,19) rectangle (\paperwidth,6);
\begin{scope}
- \clip
- (\ua@X pt, 0.25*\ua@Y+\ua@R pt) circle (\ua@R pt)
- (0.375*\ua@X pt,\ua@R+0.666*\ua@Y pt) circle (\ua@R pt);
-
- \node[anchor=south] at (0.5*\ua@X pt, 2.1*\ua@B pt)
- {\includegraphics[width=\ua@X pt]{\@titlepageimage}};
+ \clip (2.125,19) rectangle (\paperwidth,6);
+ \node[anchor=south west]
+ at (2.125,6)
+ {\ifx\@titlepageimage\@empty
+ \else
+ \includegraphics[keepaspectratio,
+ scale=0.01,
+ min size={15.875cm}{13cm}]{\@titlepageimage}
+ \fi};
\end{scope}
-
- \filldraw[uacorpbord]
- (0.375*\ua@X pt,\ua@R+0.666*\ua@Y pt) circle (\ua@R pt);
-
- \filldraw[white]
- (0.1*\ua@X pt,\ua@R+0.666*\ua@Y pt) circle (\ua@R pt);
- \node[anchor=north west,align=left,font=\large]
- at (3*\ua@Z pt, \ua@B - \ua@h pt)
- { \textcolor{uacorpblue}{\textsf{\@defenselocation,
- \@defensedate}} };
+ \node
+ [anchor=west,text width=13.75cm,align=left,font=\Huge,uauaside]
+ at (2.125,23.5)
+ {
+ \textsf{\textbf{\@title}}
+ };
- \node[anchor=south west,text width=\textwidth,align=left,font=\large]
- at (3*\ua@Z pt, 1.4*\ua@B pt)
- { \textcolor{white}{\textsf{\@affiliation}} };
-
- \node[anchor=south east,text width=\textwidth,align=right,font=\large]
- at (\ua@X - 3*\ua@Z pt, 1.4*\ua@B pt)
- { \textcolor{white}{\textsf{
- \supervisorsname\\
- \@supervisori%
- \ifdefvoid{\@supervisorii}{}{\\\@supervisorii}%
- \ifdefvoid{\@supervisoriii}{}{\\\@supervisoriii}%
- \ifdefvoid{\@supervisoriv}{}{\\\@supervisoriv}}}
+ \node
+ [anchor=west,text width=13.75cm,align=left,font=\Large,uauaside]
+ at (2.125,21.5)
+ {
+ \textsf{\textbf{\@subtitle}}
};
- \node[anchor=north west,text
- width=\ua@X-6*\ua@Z,align=left,font=\Huge]
- (title)
- at (3*\ua@Z pt,\ua@Y-4*\ua@Z pt)
- { \textsf{\textbf{\@title}} };
+ \node
+ [anchor=base west,maincolor,
+ text width=13.75cm,align=left,font=\LARGE]
+ at (2.125,20)
+ {\textsf{\textbf{\@author}}};
+
+ \fill[maincolor] (2.125,6)
+ -- (\paperwidth,6)
+ -- (\paperwidth,2.625)
+ -- (2.55,2.625)
+ arc (-90:-180:0.425)
+ -- cycle;
+
+ \node[white,anchor=west,align=left,font=\large]
+ (SN) at (2.55,4.9)
+ {
+ \begin{tabular}{@{}l@{~\,}p{11.5cm}}
+ \textsf{\supervisorsname}
+ & \textsf{\textbf{\jointsupervisors{ | }}}
+ \end{tabular}
+ };
- \node[anchor=north west,below=2.5ex of title,
- text width=\ua@X-6*\ua@Z,align=left,font=\large]
- { \textsf{\textbf{\@subtitle}} };
- \node[anchor=north west,text width=\ua@X-6*\ua@Z,align=left]
- at (3*\ua@Z pt,\ua@Y - 12.5*\ua@Z pt)
- { \textsf{\pthesisnamei{} \@phddegree{} \pthesisnameii{}} };
+ \node[white,anchor=west,text width=14.5cm,align=left,font=\small]
+ at (2.55,3.7)
+ {\textsf{\uantwerpendocsprop{pthesisnamei}
+ \@degree{}}\\
+ \textsf{\textbf{\@faculty{}
+ | \@defenselocation, \@defensedate}}};
- \node[anchor=north west, text width=\textwidth,align=left,font=\LARGE]
- at (3*\ua@Z pt, \ua@Y-15.5*\ua@Z pt)
- { \textsf{\textbf{\@author}} };
+ \node[anchor=west] at
+ (2.125,1.313)
+ {\includegraphics[width=4.75cm]{\logoposua}};
\end{tikzpicture}
- };
- \end{tikzpicture}
- \fi
+ }
+ }
\end{titlepage}%
+ ~\par\relax
\cleardoublepage
\begin{center}
- \includegraphics[width=\ua@L pt]{\@logo}
+ \includegraphics[width=4.75cm]{\logoposua}
\vfill
\@faculty\\
- \@programmeq\par
+ \@degree\par
\vfill
\Huge\textsf{\@title}\par
\large\textsf{\@subtitle}\par
\vfill
- \normalsize\pthesisnamei\\
- \@phddegree\\
- \pthesisnameii\\
+ \normalsize\uantwerpendocsprop{pthesisnamei}\\
+ \@degree\\
+ \uantwerpendocsprop{pthesisnameii}\\
\medskip
\textbf{\@author}
\vfill
@@ -3768,40 +3784,19 @@ L: \@qrlectureri
\begin{minipage}[b]{0.4\textwidth}
\flushright
\supervisorsname\\
- \@supervisori%
- \ifdefvoid{\@supervisorii}{}{\\\@supervisorii}%
- \ifdefvoid{\@supervisoriii}{}{\\\@supervisoriii}%
- \ifdefvoid{\@supervisoriv}{}{\\\@supervisoriv}
+ \jointsupervisors{\\}
\end{minipage}
\end{center}
\clearpage
- \textbf{\juryname}\hfill\par
- \textbf{\jurychairmanname}\hfill\break
+ \textbf{\uantwerpendocsprop{juryname}}\hfill\par
+ \textbf{\uantwerpendocsprop{jurychairmanname}}\hfill\break
\@jurychairman{}\ifdefvoid{\@jurychairmanaff}{}{, \@jurychairmanaff}\\
\hfill\break
\textbf{\supervisorsname}\hfill\break
- \ifdefvoid{\@supervisori}{}{\@supervisori
- \ifdefvoid{\@supervisoriaff}{}{, \@supervisoriaff}\\}
- \ifdefvoid{\@supervisorii}{}{\@supervisorii
- \ifdefvoid{\@supervisoriiaff}{}{, \@supervisoriiaff}\\}
- \ifdefvoid{\@supervisoriii}{}{\@supervisoriii
- \ifdefvoid{\@supervisoriiiaff}{}{, \@supervisoriiiaff}\\}
- \ifdefvoid{\@supervisoriv}{}{\@supervisoriv
- \ifdefvoid{\@supervisorivaff}{}{, \@supervisorivaff}\\}
+ \jointsupervisorswithaffiliation{\\}\\
\hfill\break
- \textbf{\jurymembersname}\hfill\break
- \ifdefvoid{\@jurymemberi}{}{\@jurymemberi
- \ifdefvoid{\@jurymemberiaff}{}{, \@jurymemberiaff\\}}
- \ifdefvoid{\@jurymemberii}{}{\@jurymemberii
- \ifdefvoid{\@jurymemberiiaff}{}{, \@jurymemberiiaff\\}}
- \ifdefvoid{\@jurymemberiii}{}{\@jurymemberiii
- \ifdefvoid{\@jurymemberiiiaff}{}{, \@jurymemberiiiaff\\}}
- \ifdefvoid{\@jurymemberiv}{}{\@jurymemberiv
- \ifdefvoid{\@jurymemberivaff}{}{, \@jurymemberivaff\\}}
- \ifdefvoid{\@jurymemberv}{}{\@jurymemberv
- \ifdefvoid{\@jurymembervaff}{}{, \@jurymembervaff\\}}
- \ifdefvoid{\@jurymembervi}{}{\@jurymembervi
- \ifdefvoid{\@jurymemberviaff}{}{, \@jurymemberviaff\\}}
+ \textbf{\uantwerpendocsprop{jurymembersname}}\hfill\break
+ \jointjurymembers{\\}
\hfill\break
\vfill
\textbf{Contact}\\
@@ -3811,7 +3806,7 @@ L: \@qrlectureri
\@address\\
\vfill
\copyright{} \@defensedate{} \@author\\
- \arrname.
+ \uantwerpendocsprop{arr}.
\vfill
\begin{minipage}[b]{.5\linewidth}
\ifdefempty{\@isbn}{}{ISBN \@isbn}~\\
@@ -3841,13 +3836,11 @@ L: \@qrlectureri
%
% \begin{macro}{\makefinalpage}
% Below, one can find the code for the final page of the
-% |uantwerpenphdthesis| class:
+% |phdthesis| class:
% \changes{v2.0}{2018/03/14}{Implemented final page}
% \begin{macrocode}
%<*pt>
\newcommand\makefinalpage{
- \if@titlepagetableonly
- \else
\cleardoublepage
\thispagestyle{empty}
~% intentionally blank page
@@ -3857,26 +3850,159 @@ L: \@qrlectureri
\node at (current page.center) {
\begin{tikzpicture}[inner sep=0pt]
\clip (0,0) rectangle(\paperwidth,\paperheight);
- \fill[uacorpblue] (0,0) rectangle(\ua@X pt,\ua@Y pt);
- \filldraw [white] (1.2*\ua@X pt,\ua@R+0.125*\ua@Y pt) circle (\ua@R pt);
- \filldraw [uacorpbord] (1.375*\ua@X pt,\ua@R+0.666*\ua@Y pt)
- circle (\ua@R pt);
+ \fill[sidecolor] (0,0) rectangle (2.125cm,2.625cm);
\end{tikzpicture}
};
\end{tikzpicture}
- \fi
}
%</pt>
% \end{macrocode}
% \end{macro}
%
+% \subsection{Title page for the report clases}
%
-% \subsection{Title page for the letter class}
+% The title page is generated using the |\maketitle| command. As the
+% report class from which we inherit already defines this command, we
+% need to renew it.
+%
+% \begin{macro}{\maketitle}
+% Below, one can find the code for the title page of the
+% |report| class:
+% \begin{macrocode}
+%<*rp>
+\renewcommand\maketitle{%
+ \pagestyle{empty}
+ \begin{titlepage}
+ \AddToShipoutPicture*{%
+ \put(0,0){%
+ \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
+ \clip (0,0) rectangle(\paperwidth,\paperheight);
+ \fill[lightgray]
+ (2.125,20.192) rectangle (\paperwidth,6);
+ \begin{scope}
+ \clip (2.125,20.192) rectangle (\paperwidth,6);
+ \node[anchor=south west]
+ at (2.125,6)
+ {\ifx\@titlepageimage\@empty
+ \else
+ \includegraphics[keepaspectratio,
+ scale=0.01,
+ min size={18.875cm}{14.192cm}]{\@titlepageimage}
+ \fi};
+ \end{scope}
+
+ \node
+ [anchor=west,text width=17cm,align=left,font=\Huge,uauaside]
+ at (2.125,\paperheight-3cm)
+ {
+ \textsf{\textbf{\@title}}
+ };
+
+ \node
+ [anchor=west,text width=17cm,align=left,font=\Large,uauaside]
+ at (2.125,\paperheight-5cm)
+ {
+ \textsf{\textbf{\@subtitle}}
+ };
+
+ \node
+ [anchor=base west,maincolor,
+ text width=17cm,align=left,font=\LARGE]
+ at (2.125,\paperheight-6.5cm)
+ {\textsf{\textbf{\@author}}};
+
+ \fill[maincolor] (2.125,6)
+ -- (\paperwidth,6)
+ -- (\paperwidth,2.625)
+ -- (2.55,2.625)
+ arc (-90:-180:0.425)
+ -- cycle;
+
+ \node[white,anchor=west,text width=17cm,align=left,font=\small]
+ at (2.55,5.3)
+ {\textsf{\textbf{\@extra}}};
+
+ \node[white,anchor=west,text width=17cm,align=left,font=\small]
+ at (2.55,4)
+ {\textsf{\textbf{\@affiliation{}
+ | \@versionyear}\\
+ \@address}};
+
+ \node[anchor=west] at
+ (2.125,1.313)
+ {\includegraphics[width=4.75cm]{\logopos}};
+ \end{tikzpicture}
+ }
+ }
+ \end{titlepage}%
+ ~\par\relax
+ \cleardoublepage
+ \begin{center}
+ \includegraphics[width=4.75cm]{\logopos}
+ \vfill
+ \@affiliation\\
+ \@extra\par
+ \vfill
+ \Huge\textsf{\@title}\par
+ \large\textsf{\@subtitle}\par
+ \vfill
+ \textbf{\@author}
+ \vfill
+ \end{center}
+ \clearpage
+ \vfill
+ \textbf{Contact}\\
+ \smallskip
+ \@author\\
+ \@affiliation\\
+ \@address\\
+ \vfill
+ \copyright{} \@versionyear{} \@author\\
+ \uantwerpendocsprop{arr}.
+ \vfill
+ \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}
+ \
+}
+%</rp>
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\makefinalpage}
+% Below, one can find the code for the final page of the
+% |phdthesis| class:
+% \changes{v2.0}{2018/03/14}{Implemented final page}
+% \begin{macrocode}
+%<*rp>
+\newcommand\makefinalpage{
+ \cleardoublepage
+ \thispagestyle{empty}
+ ~% intentionally blank page
+ \clearpage
+ \thispagestyle{empty}
+ \begin{tikzpicture}[remember picture,overlay]
+ \node at (current page.center) {
+ \begin{tikzpicture}[inner sep=0pt]
+ \clip (0,0) rectangle(\paperwidth,\paperheight);
+ \fill[sidecolor] (0,0) rectangle (2.125cm,2.625cm);
+ \end{tikzpicture}
+ };
+ \end{tikzpicture}
+}
+%</rp>
+% \end{macrocode}
+% \end{macro}
%
-% \subsubsection{Bottom cords}
-% \changes{v1.5}{2016/01/11}{Removed documentation}
-% The graphical footer of the page is provided through PDF/PS
-% includes in a Dutch and a non-dutch version.
+%
+% \subsection{Title page for the letter class}
%
% \subsubsection{Title Page}
%
@@ -3922,9 +4048,9 @@ L: \@qrlectureri
\begin{tikzpicture}[anchor=north west,align=left,outer sep=0,inner sep=0]
\path
(0,0) node { \scriptsize \strut
- \textcolor{gray}{\uppercase\expandafter{\datename} } }
+ \textcolor{gray}{\uppercase\expandafter{\uantwerpendocsprop{datename}} } }
(4cm,0) node { \scriptsize \strut
- \textcolor{gray}{\uppercase\expandafter{\subjectname} } }
+ \textcolor{gray}{\uppercase\expandafter{\uantwerpendocsprop{subjectname}} } }
(0,-2.5ex) node { \strut \@date }
(4cm,-2.5ex) node[align=left] { \strut \@subject };
\end{tikzpicture}~\\[4ex]
@@ -3965,192 +4091,191 @@ L: \@qrlectureri
\pagestyle{fancy}
\AddToShipoutPicture*{%
\put(0,0){%
- \begin{tikzpicture}[remember picture,overlay]
- \node at (current page.center) {
- \begin{tikzpicture}
- \clip (0,0) rectangle (21,29.7);
- \draw
- ( 3,9.7) -- ( 3,23.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,16.8) +(0,-0.5) -- +(0,0) -- +(0.5,0)
- ( 3,13.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);
- }
+ \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
+ \clip (0,0) rectangle(\paperwidth,\paperheight);
+ \fill[lightgray]
+ (2.125,{\paperheight-7cm}) rectangle (\paperwidth,6);
+
+ \node
+ [anchor=west,text width={\paperwidth-5cm},align=left]
+ at (2.125,{\paperheight-3cm})
+ {%
+ \fontfamily{phv}\fontsize{18}{22}\fontseries{b}%
+ \fontshape{n}\selectfont%
+ \@course{}
+ \ifx\@exampart\@emptymacro
+ \else --- \@exampart\fi
+ };
+ \node
+ [anchor=west,text width={\paperwidth-5cm},align=left]
+ at (2.125,{\paperheight-4cm})
+ {%
+ \fontfamily{phv}\fontsize{12}{18}\fontseries{b}%
+ \fontshape{n}\selectfont%
+ \@coursecode
+ };
- \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}{
- \fontfamily{phv}\fontsize{12}{15}\fontseries{b}\selectfont
- \@faculty\\
- \fontfamily{phv}\fontsize{11}{14}\fontseries{m}\selectfont
- \@programmet \@programmec\
- \ifx\@programmeq\@emptymacro\else--- \@programmeq\fi
- }
- }
- (3.3,23) node[anchor=north west] {
- \parbox{16cm}{
- \fontfamily{phv}\fontsize{18}{22}\fontseries{b}
- \fontshape{n}\selectfont
- \raggedright \@coursei{}
- \ifx\@exampart\@emptymacro
- \else --- \@exampart\fi
- \fontfamily{phv}\fontsize{12}{18}\fontseries{m}
- \fontshape{n}\selectfont\\
- Reeks \@examgroupnumber{} \hfill \@examdate{} }
- }
- (3.3,20.1) node[anchor=north west] {
- \parbox{14cm}{
- \fontfamily{phv}\fontsize{12}{15}\fontseries{m}\selectfont
- \@coursecodei
- }
- }
- (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):\\
- \fontfamily{phv}\fontsize{14}{20}\fontseries{m}
- \fontshape{n}\selectfont
- \raggedright \@author{}
- }
- }
- (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
- --- }{}
- Naam:}
- }
- (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}{Docket No. --- }
- {}Rolnr.:}
- }
-
- (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,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]
- \raggedright \ifdef{\dateenglish}{End --- }
- {}Einde~: \@tend
- }
- }
- (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
-
- }
- }
- (3,27.7) node[anchor=north west] {
- \includegraphics[width=7cm]{\@logo}
- };
- \end{tikzpicture}
+ \node
+ [anchor=west,text width={\paperwidth-5cm},align=left,font=\large]
+ at (2.125,{\paperheight-5cm})
+ {%
+ \fontfamily{phv}\fontsize{12}{18}\fontseries{m}%
+ \fontshape{n}\selectfont%
+ \uantwerpendocsprop{seriesname} \@examgroupnumber{} \hfill \@examdate{}
+ };
+
+ \node[anchor=south west,align=left,inner sep=0pt] at (3,21)
+ {%
+ \fontfamily{phv}\fontsize{14}{19}\fontseries{b}%
+ \fontshape{n}\selectfont%
+ \uantwerpendocsprop{examname}
+ };
+
+ \node[anchor=south west,align=left,inner sep=0pt] at (3,19)
+ {%
+ \fontfamily{phv}\fontsize{12}{18}\fontseries{m}%
+ \fontshape{n}\selectfont%
+ \uantwerpendocsprop{lastname}
+ };
+ \foreach \nn in {0,1,...,33} {
+ \draw[fill=white] (3,18) ++({0.5*\nn},0) rectangle +(0.5,0.8);
+ }
+
+ \node[anchor=south west,align=left,inner sep=0pt] at (3,17)
+ {%
+ \fontfamily{phv}\fontsize{12}{18}\fontseries{m}%
+ \fontshape{n}\selectfont%
+ \uantwerpendocsprop{firstname}
};
+
+ \foreach \nn in {0,1,...,23} {
+ \draw[fill=white] (3,16) ++({0.5*\nn},0) rectangle +(0.5,0.8);
+ }
+
+ \node[anchor=south west,align=left,inner sep=0pt] at (16,17)
+ {%
+ \fontfamily{phv}\fontsize{12}{18}\fontseries{m}%
+ \fontshape{n}\selectfont%
+ \uantwerpendocsprop{docketname}
+ };
+ \foreach \nn in {0,1,...,7} {
+ \draw[fill=white] (16,16) ++({0.5*\nn},0) rectangle +(0.5,0.8);
+ }
+
+ \node[anchor=south west,align=left,inner sep=0pt,text width=17cm]
+ at (3,14)
+ {%
+ \fontfamily{phv}\fontsize{12}{21}\fontseries{m}%
+ \fontshape{n}\selectfont%
+ \uantwerpendocsprop{examdurationname}: \@examlength
+ };
+ \node[anchor=south west,align=left,inner sep=0pt,text width=17cm]
+ at (3,11)
+ {%
+ \fontfamily{phv}\fontsize{12}{15}\fontseries{m}%
+ \fontshape{n}\selectfont%
+ \begin{tabular}{@{}l@{}ll}%
+ \uantwerpendocsprop{examstartname}& : & \@tstart\\
+ \uantwerpendocsprop{examendname} & : & \@tend
+ \end{tabular}
+ };
+
+ \node[anchor=south west,align=left,inner sep=0pt,text width=17cm]
+ at (3,8)
+ {%
+ \fontfamily{phv}\fontsize{12}{21}\fontseries{m}%
+ \fontshape{n}\selectfont%
+ \roomsname: \jointrooms{, }
+ };
+
+ \node
+ [anchor=base west,uauamain,
+ text width={\paperwidth-5cm},align=left,font=\LARGE]
+ at (2.125,{\paperheight-6.5cm})
+ {\textsf{\textbf{\@author}}};
+
+ \fill[gray] (2.125,6)
+ -- (\paperwidth,6)
+ -- (\paperwidth,2.625)
+ -- (2.55,2.625)
+ arc (-90:-180:0.425)
+ -- cycle;
+
+ \node[white,anchor=west,align=left,font=\large]
+ (SN) at (2.55,4.9)
+ {
+ \begin{tabular}{@{}l@{~\,}p{14.5cm}}
+ \textsf{\lecturersname}
+ & \textsf{\textbf{\jointlecturers{ | }}}
+ \end{tabular}
+ };
+
+ \node[white,anchor=west,text width=17.5cm,align=left,font=\small]
+ at (2.55,3.7)
+ {\textsf{\@degree{}}\\
+ \textsf{\textbf{\@faculty{}}}};
+
+ \node[anchor=west] at (2.125,1.313)
+ {\includegraphics[width=4.75cm]{\logopos}};
\end{tikzpicture}
}
}
- \vspace*{17cm}
- \ifx\@qrtitle\@emptymacro
- \else
- \@extrainfo
- \fi
+ ~\par\relax
+ \clearpage
+ \lfoot[\small \@shorttitle]{\small \@shorttitle}
+ \rfoot[\small Groep \@examgroupnumber{} ---
+ \@academicyear]{\small Groep \@examgroupnumber{} --- \@academicyear}
+ \renewcommand*{\footrulewidth}{1pt}
}
-%</ex>
+%</ex>
% \end{macrocode}
% \end{macro}
-%
-%
+%
+%
% \subsection{Auxiliary functions to typeset exams}
-%
+%
% \begin{macro}{\question}
-% Add a small box with the weight of the question on the current line
-% (right aligned).
-%
+% Add a small box with the weight of the question on the current line
+% (right aligned).
+%
% \begin{macrocode}
-%<*ex>
+%<*ex>
\newcounter{question}
\setcounter{question}{0}
-\renewcommand\thequestion{\@arabic\c@question}
+\renewcommand*\thequestion{\@arabic\c@question}
\newcommand{\question}[1]{
\stepcounter{question}
\thequestion.~#1%
}
-%</ex>
+%</ex>
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\questionweight}
-% Add a small box with the weight of the question on the current line
-% (right aligned).
-%
+% Add a small box with the weight of the question on the current line
+% (right aligned).
+%
% \begin{macrocode}
-%<*ex>
-\newcommand{\questionweight}[1]{%
+%<*ex>
+\newcommand*{\questionweight}[1]{%
\hspace{\fill}
\begin{tabular}{|c|}
\hline
- \small \weightname: #1\\
+ \small \uantwerpendocsprop{weightname}: #1\\
\hline
\end{tabular}\\
}
-%</ex>
+%</ex>
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\engdut}
-% typesets the question in two columns, the left column taking the
-% English variant of the question and the right column taking the
-% Dutch variant.
-% \changes{v2.1}{2018/06/20}{\@ Increased intercolumn spacing for engdut}
+% typesets the question in two columns, the left column taking the
+% English variant of the question and the right column taking the
+% Dutch variant.
+% \changes{v2.1}{2018/06/20}{\@ Increased intercolumn spacing for engdut}
% \begin{macrocode}
-%<*ex>
+%<*ex>
\newcommand{\engdut}[2]{%
\begin{tabular}{ccc}%
\selectlanguage{english}%
@@ -4158,123 +4283,123 @@ L: \@qrlectureri
#1
\end{minipage}%
&~~~&
- \selectlanguage{dutch}%
- \begin{minipage}[t]{0.45\textwidth}%
- #2
- \end{minipage}%
+ \selectlanguage{dutch}%
+ \begin{minipage}[t]{0.45\textwidth}%
+ #2
+ \end{minipage}%
\end{tabular}
\selectlanguage{english}%
}
-%</ex>
+%</ex>
% \end{macrocode}
% \end{macro}
-%
-%
+%
+%
% \changes{v2.1}{2018/06/20}{Allow for setting the multiple choice
% mark symbol}
% \begin{macro}{\setmcsymbol}
-% sets the symbol to be used as multiple choice mark (by default a
-% square).
+% sets the symbol to be used as multiple choice mark (by default a
+% square).
% \begin{macrocode}
-%<*ex>
-\newcommand\@mcsymbol{\square}
-\newcommand\setmcsymbol[1]{\renewcommand\@mcsymbol{#1}}
-%</ex>
+%<*ex>
+\newcommand*\@mcsymbol{\square}
+\newcommand*\setmcsymbol[1]{\renewcommand\@mcsymbol{#1}}
+%</ex>
% \end{macrocode}
% \end{macro}
-%
+%
% \changes{v2.1}{2018/06/20}{Corrected erroneous line breaking}
% \begin{macro}{\mc}
-% typesets a multiple choice answer candidate (monolingual, i.e. in a
-% single column).
+% typesets a multiple choice answer candidate (monolingual, i.e. in a
+% single column).
% \begin{macrocode}
-%<*ex>
+%<*ex>
\newcommand\mc[1]{%
\hfill\break\qquad\begin{tabular}{cc}
- $\@mcsymbol$
- &
- \begin{minipage}[t]{0.9\textwidth}%
- #1
- \end{minipage}%
- \end{tabular}
-}
-%</ex>
+ $\@mcsymbol$
+ &
+ \begin{minipage}[t]{0.9\textwidth}%
+ #1
+ \end{minipage}%
+ \end{tabular}
+ }
+%</ex>
% \end{macrocode}
% \end{macro}
-%
+%
% \changes{v2.1}{2018/06/20}{Corrected erroneous line breaking}
-%
+%
% \begin{macro}{\engdutmc}
-% typesets a multiple choice answer candidate in two columns, the left
-% column taking the English variant of the question and the right
-% column taking the Dutch variant.
-%
+% typesets a multiple choice answer candidate in two columns, the left
+% column taking the English variant of the question and the right
+% column taking the Dutch variant.
+%
% \begin{macrocode}
-%<*ex>
+%<*ex>
\newcommand{\engdutmc}[2]{%
\hfill\break\begin{tabular}{cccc}
- $\@mcsymbol$
- &
- \selectlanguage{english}%
- \begin{minipage}[t]{0.42\textwidth}%
- #1
- \end{minipage}%
- &---&
- \selectlanguage{dutch}%
- \begin{minipage}[t]{0.42\textwidth}%
- #2
- \end{minipage}%
- \end{tabular}
- \selectlanguage{english}%
-}
-%</ex>
+ $\@mcsymbol$
+ &
+ \selectlanguage{english}%
+ \begin{minipage}[t]{0.42\textwidth}%
+ #1
+ \end{minipage}%
+ &---&
+ \selectlanguage{dutch}%
+ \begin{minipage}[t]{0.42\textwidth}%
+ #2
+ \end{minipage}%
+ \end{tabular}
+ \selectlanguage{english}%
+ }
+%</ex>
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\insertsolutionspagepartial}
% fills the remainder of the page with 'fill-out' squares.
% as observing/controlling the current line position in \LaTeX{} is
% not easiy, one has to provide the number of centimeters below the
% bottom of the page, one wants to start the fill-out squares.
-%
+%
% \changes{v2.5}{}{Corrected for 'one page too early' in solutionspagepartial}
-%
+%
% \begin{macrocode}
-%<*ex>
+%<*ex>
\newcommand\insertsolutionspagepartial[1]{
~\relax
\AddToShipoutPicture*{%
\put(0,0){%
\begin{tikzpicture}
\clip (0,0) rectangle (21,#1);
-% \draw[densely dotted, step=0.5cm,black!20] (0.999,0.990) grid (20,1.5);
- \draw[densely dotted, step=0.5cm,black!20] (0.999,1.499) grid (2,2.5);
- \draw[densely dotted, step=0.5cm,black!20] (18.999,1.499) grid (20,2.5);
-
- \draw[densely dotted, step=0.5cm,black!20] (0.999,2.499) grid (20,27);
- \draw[densely dotted, step=0.5cm,black!20] (0.999,27) grid (16,28);
- \draw[densely dotted, step=0.5cm,black!20] (19.499,27) grid (20,28);
- \draw[densely dotted, step=0.5cm,black!20] (0.99,27.999) grid
- (20,28.5);
- \draw[ultra thick] (1,#1) -- (20,#1);
- \end{tikzpicture}
- }
- }%
- \clearpage
- \relax
+% \draw[densely dotted, step=0.5cm,black!20] (0.999,0.990) grid (20,1.5);
+\draw[densely dotted, step=0.5cm,black!20] (0.999,1.499) grid (2,2.5);
+\draw[densely dotted, step=0.5cm,black!20] (18.999,1.499) grid (20,2.5);
+
+\draw[densely dotted, step=0.5cm,black!20] (0.999,2.499) grid (20,27);
+\draw[densely dotted, step=0.5cm,black!20] (0.999,27) grid (16,28);
+\draw[densely dotted, step=0.5cm,black!20] (19.499,27) grid (20,28);
+\draw[densely dotted, step=0.5cm,black!20] (0.99,27.999) grid
+(20,28.5);
+\draw[ultra thick] (1,#1) -- (20,#1);
+\end{tikzpicture}
+}
+}%
+\clearpage
+\relax
}
-%</ex>
+%</ex>
% \end{macrocode}
% \end{macro}
-%
+%
% \begin{macro}{\insertsolutionspage}
% inserts a full solutions page, i.e. flushes the current page and
% inserts a full page with 'fill-out' squares.
% The argument allows for specifying a watermark text (e.g. 'Scrap
% paper').
-%
+%
% \begin{macrocode}
-%<*ex>
+%<*ex>
\newcommand\insertsolutionspage[1]{
\clearpage
\AddToShipoutPicture*{%
@@ -4291,59 +4416,34 @@ L: \@qrlectureri
}
\put(120,150){\rotatebox{60}{\textcolor{watermark}{
\fontfamily{phv}\fontsize{105}{130}\fontseries{m}\fontshape{n}\selectfont
- #1}
+ #1}
}
}
}%
~\relax
}
-%</ex>
+%</ex>
% \end{macrocode}
% \end{macro}
-%
+%
% We add a lastpage label to the final page
% \begin{macrocode}
-%<*ex>
+%<*ex>
\AtEndDocument{
\label{lastpage}
}
-%</ex>
-% \end{macrocode
-%
+%</ex>
+% \end{macrocode
+%
% \subsection{References}
% \begin{macrocode}
-%<*ct|bmt|pt>
-\IfFileExists{varioref.sty}{\RequirePackage{varioref}}{}
-%</ct|bmt|pt>
-%
-%<*ct>
-\IfFileExists{hyperref.sty}{
- \RequirePackage[backref,hyperindex=true,pagebackref=true]{hyperref}
- \hypersetup{
- breaklinks=true,
- colorlinks=true,
- citecolor=black,
- filecolor=black,
- linkcolor=black,
- pageanchor=true,
- pdfpagemode=UseOutlines,
- urlcolor=black
- }
- \AtBeginDocument{
- \hypersetup{
- pdftitle={\@title},
- pdfsubject={\@subtitle},
- pdfauthor={\@author}
- }
- }
-}{}
-%</ct>
-%
-%
-%<*bmt|pt>
-\IfFileExists{hyperref.sty}{
- \RequirePackage[backref,hyperindex=true,pagebackref=true]{hyperref}
+%<*ct|bmt|pt|rp>
+\AtBeginDocument{
+ \@ifpackageloaded{hyperref}{
\hypersetup{
+ backref=true,
+ hyperindex=true,
+ pagebackref=true,
breaklinks=true,
colorlinks=true,
citecolor=black,
@@ -4351,23 +4451,21 @@ L: \@qrlectureri
linkcolor=black,
pageanchor=true,
pdfpagemode=UseOutlines,
- urlcolor=black
+ urlcolor=black,
+ pdftitle={\@title},
+ pdfsubject={\@subtitle},
+ pdfauthor={\@author}
}
- \AtBeginDocument{
- \hypersetup{
- pdftitle={\@title},
- pdfsubject={\@subtitle},
- pdfauthor={\@author}
- }
- }
-}{}
-%</bmt|pt>
+ }{}
+}
+%</ct|bmt|pt|rp>
% \end{macrocode}
+%
% \section{The beamer theme}
% \subsection{User guide}
-%
+%
% \begin{verbatim}
-%<*bmrug>
+%<*bmrug>
\documentclass[aspectratio=1610]{beamer}
\usetheme[ti]{uantwerpen}
\usepackage[english]{babel}
@@ -4375,12 +4473,12 @@ L: \@qrlectureri
% The packages below are for demonstration purpose only.
% They are not required for the template to work
\usepackage{metalogo}
-\usepackage{lipsum}
+\usepackage{kantlipsum}
\usepackage{pgfplots}
\usepackage{booktabs}
% some stuff to typeset code
-\newcommand\command[1]{{\tt \textbackslash #1}}
+\newcommand*\command[1]{{\tt \textbackslash #1}}
\NewEnviron{codesnippet}[1][0.8\textwidth]{
\scriptsize
\qquad\framebox[#1][l]{\texttt{
@@ -4391,9 +4489,9 @@ L: \@qrlectureri
}
}
}
-\newcommand\ind[1][2ex]{\hspace*{#1}}
-\newcommand\bframe[1][]{\command{begin}\{#1frame\}}
-\newcommand\eframe[1][]{\command{end}\{#1frame\}}
+\newcommand*\ind[1][2ex]{\hspace*{#1}}
+\newcommand*\bframe[1][]{\command{begin}\{#1frame\}}
+\newcommand*\eframe[1][]{\command{end}\{#1frame\}}
\title{This is your \texttt{\textbackslash{}title{}}}
\subtitle[my short title]{This is your \texttt{\textbackslash{}subtitle{}}}
@@ -4436,9 +4534,9 @@ L: \@qrlectureri
You can load the package in your preamble as:
\begin{codesnippet}
- \command{documentclass}[aspectratio=1610]\{beamer\}\\
- \command{usetheme}[theme-options-go-here]\{uantwerpen\}\\
- \command{usepackage}[english]\{babel\}
+ \command{documentclass}[aspectratio=1610]\{beamer\}\\
+ \command{usetheme}[theme-options-go-here]\{uantwerpen\}\\
+ \command{usepackage}[english]\{babel\}
\end{codesnippet}
\heading{Remarks}
@@ -4542,7 +4640,7 @@ L: \@qrlectureri
\ind\command{maketitle}\\
\eframe
\end{codesnippet}
-
+
with no option, or one of: \texttt{normal}, \texttt{negative},
\texttt{negativefill}.
\end{frame}
@@ -4610,8 +4708,8 @@ L: \@qrlectureri
\begin{itemize}
\item You don't need to specify the normal canvas, it is the
default.
- \item In handout mode the negative and negativefill canvas will be
- typeset as normal canvas (to allow for easy printing).
+ \item In handout mode the negative and negativefill canvas will be
+ typeset as normal canvas (to allow for easy printing).
\item The graphic option has many variants that we will discuss later.
\end{itemize}
\end{frame}
@@ -4619,7 +4717,7 @@ L: \@qrlectureri
\begin{frame}[negativefill]
{A negativefill slide}
{with a subtle subtitle}
- \lipsum[1]
+ \kant[1]
\end{frame}
\begin{frame}[negative,t]
@@ -4675,22 +4773,22 @@ L: \@qrlectureri
can be specified as \LaTeX-color \emph{sidecolor}\\
\textcolor{basecolor}{Base color}:
can be specified as \LaTeX-color
- \emph{basecolor}
-
- \heading{Advice}\\
- \begin{itemize}
- \item Stick to the standard colors or use grayscale tints!
- \item Only use color when functional (e.g. in graphs)
- \end{itemize}
-
- \heading{Alert}
- You can use \alert{\command{alert{}}} to grab the attention of the
- user. It will typeset your content in \alert{red}.
-
- \heading{Not taking any advice?}\\
- You can fiddle with the colors, but do so in smart way.
- Use \command{setbeamercolor}. You can see how it is used in the
- \texttt{beamercolorthemeuantwerpen.sty} file.
+ \emph{basecolor}
+
+ \heading{Advice}\\
+ \begin{itemize}
+ \item Stick to the standard colors or use grayscale tints!
+ \item Only use color when functional (e.g. in graphs)
+ \end{itemize}
+
+ \heading{Alert}
+ You can use \alert{\command{alert{}}} to grab the attention of the
+ user. It will typeset your content in \alert{red}.
+
+ \heading{Not taking any advice?}\\
+ You can fiddle with the colors, but do so in smart way.
+ Use \command{setbeamercolor}. You can see how it is used in the
+ \texttt{beamercolorthemeuantwerpen.sty} file.
\end{frame}
\begin{frame}[t]
@@ -4757,7 +4855,7 @@ L: \@qrlectureri
\end{center}
\end{frame}
-
+
\begin{l3qframe}[rqgraphic]
{Some Random Title}
{Please, adapt!}
@@ -4776,8 +4874,8 @@ L: \@qrlectureri
\subheading{Remarks}
\begin{itemize}
\item Load photo as:\\
- \command{includegraphics[width=0.25\command{paperwidth}, min height=\command{textheight}]
- \{image.jpg\}}
+ \command{includegraphics[width=0.25\command{paperwidth}, min height=\command{textheight}]
+ \{image.jpg\}}
\item If \texttt{rqgraphic} is specified without argument, a standard photo
is loaded.
\item Note: you can avoid rounding the corner using the
@@ -5012,7 +5110,7 @@ L: \@qrlectureri
\ind\ind\command{uantwerpencallout}[fill opacity=0.5]\{4.5\}\{2.5\}\{\\
\ind\ind\ind\command{bfseries} I'll be back!\textbackslash\textbackslash[1ex]\\
\ind\ind\ind Arnold Schwarzenegger\}\\
- \}
+ \}
\eframe
\end{codesnippet}
\medskip
@@ -5128,10 +5226,10 @@ L: \@qrlectureri
that you must load after (!) the \command{usetheme} command.\\[1ex]
\begin{codesnippet}[0.95\textwidth]
\command{AtBeginDocument\{}\\
- \ind\command{renewcommand}\command{logopos\{your-pos-logo-filename-here\}}\\
- \ind\command{renewcommand}\command{logoneg\{your-negative-logo-filename-here\}}\\
- \ind\command{renewcommand}\command{logomonowhite\{your-mono-logo-filename-here\}}\\
- \ind\command{renewcommand}\command{iconfile\{your-icon-filename-here\}}\\
+ \ind\command{renewcommand*}\command{logopos\{your-pos-logo-filename-here\}}\\
+ \ind\command{renewcommand*}\command{logoneg\{your-negative-logo-filename-here\}}\\
+ \ind\command{renewcommand*}\command{logomonowhite\{your-mono-logo-filename-here\}}\\
+ \ind\command{renewcommand*}\command{iconfile\{your-icon-filename-here\}}\\
\ind\command{colorlet\{maincolor\}\{your-favorite-color\}}\\
\ind\command{colorlet\{sidecolor\}\{your-secondfavorite-color\}}\\
\ind\command{colorlet\{basecolor\}\{some-solid-color\}}\\
@@ -5169,113 +5267,41 @@ L: \@qrlectureri
\end{frame}
\end{document}
-%</bmrug>
+%</bmrug>
% \end{verbatim}
-%
+%
% \subsection{Implementation}
-%
+%
% \subsubsection{Main beamer theme}
-%
+%
% \begin{macrocode}
-%<*bmr>
-% Copyright 2021 by Walter Daems <walter.daems@uantwerpen.be>
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-%
-% See the file doc/licenses/LICENSE for more details.
+%<*bmr>
+% Copyright 2021 by Walter Daems <walter.daems@uantwerpen.be>
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/licenses/LICENSE for more details.
\newif\if@nofonts
\@nofontsfalse
\DeclareOption{nofonts}{\@nofontstrue}
-\newif\if@neutralcolors
-\@neutralcolorsfalse
-\DeclareOption{neutralcolors}{\@neutralcolorstrue}
-\newcommand\colormodel{rgb}
-\newif\if@cmyk
-\@cmykfalse
-\DeclareOption{cmyk}{\renewcommand\colormodel{cmyk}\@cmyktrue}
-\DeclareOption{rgb}{\renewcommand\colormodel{rgb}\@cmykfalse}
+\input{uantwerpencommonoptions.clo}
-\newcommand\fselector{ua}
-\newcommand\lselector{en}
-\newlength\logounitheight
-\setlength\logounitheight{0.8cm}
-\DeclareOption{be}{
- \renewcommand\fselector{be}
- \setlength\logounitheight{1cm}
-}
-\DeclareOption{fbd}{
- \renewcommand\fselector{fbd}
- \setlength\logounitheight{1cm}
-}
-\DeclareOption{ggw}{
- \renewcommand\fselector{ggw}
- \setlength\logounitheight{1cm}
-}
-\DeclareOption{lw}{
- \renewcommand\fselector{lw}
- \setlength\logounitheight{1cm}
-}
-\DeclareOption{ow}{
- \renewcommand\fselector{ow}
- \setlength\logounitheight{1cm}
-}
-\DeclareOption{re}{
- \renewcommand\fselector{re}
- \setlength\logounitheight{1cm}
-}
-\DeclareOption{sw}{
- \renewcommand\fselector{sw}
- \setlength\logounitheight{1cm}
-}
-\DeclareOption{ti}{
- \renewcommand\fselector{ti}
- \setlength\logounitheight{1cm}
-}
-\DeclareOption{we}{
- \renewcommand\fselector{we}
- \setlength\logounitheight{1cm}
-}
-\DeclareOption{iob}{
- \renewcommand\fselector{iob}
- \setlength\logounitheight{1cm}
-}
+\ProcessOptions
-\AtBeginDocument{
- \makeatother
- \@ifpackageloaded{babel}{
- \addto\captionsdutch{
- \renewcommand\lselector{nl}
- }
- }
- \makeatletter
+\RequirePackage{uantwerpencolorlogoscheme}
- \newcommand\logopos{Logos/logo-uantwerpen-\fselector-\lselector-\colormodel-pos}
- \newcommand\logoneg{Logos/logo-uantwerpen-\fselector-\lselector-\colormodel-neg}
- \newcommand\logomonowhite{Logos/logo-uantwerpen-\fselector-\lselector-\colormodel-mono-white}
- \newcommand\iconfile{Logos/icon-uantwerpen-\fselector-\colormodel}
+\AtBeginDocument{
\def\appropriatelogo{\logopos}
\def\appropriateslidenumber{%
\usebeamercolor{pageno in head/foot}%
\insertframenumber/\inserttotalframenumber}%
}
-\ProcessOptions
-
-\if@neutralcolors
-\newcommand\maincolor{uauaside}
-\newcommand\sidecolor{uauamain}
-\newcommand\basecolor{uauaside}
-\else
-\newcommand\maincolor{ua\fselector main}
-\newcommand\sidecolor{ua\fselector side}
-\newcommand\basecolor{uauaside}
-\fi
-
\mode<presentation>
\RequirePackage{tikz}
@@ -5298,102 +5324,26 @@ L: \@qrlectureri
\mode
<all>
-%</bmr>
+%</bmr>
% \end{macrocode}
-%
+%
% \subsubsection{Beamer color theme}
% \begin{macrocode}
-%<*bmrcolor>
-% Copyright 2021 by Walter Daems <walter.daems@uantwerpen.be>
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-%
-% See the file doc/licenses/LICENSE for more details.
+%<*bmrcolor>
+% Copyright 2021 by Walter Daems <walter.daems@uantwerpen.be>
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/licenses/LICENSE for more details.
\mode<presentation>
-\if@cmyk
-
-%% UAntwerpen
-\definecolor{uauamain}{cmyk}{0.00,0.96,0.82,0.01}
-\definecolor{uauaside}{cmyk}{1.00,0.71,0.00,0.51}
-%% Faculteit Bedrijfswetenschappen en Economie
-\definecolor{uabemain}{cmyk}{0.58,0.00,1.00,0.04}
-\definecolor{uabeside}{cmyk}{0.29,0.04,0.41,0.00}
-%% Faculteit Farmaceutische, Biomedische en Diergeneeskundige Wetenschappen
-\definecolor{uafbdmain}{cmyk}{0.65,0.03,0.00,0.00}
-\definecolor{uafbdside}{cmyk}{0.33,0.03,0.00,0.00}
-%% Faculteit Geneeskunde en Gezondheidswetenschappen
-\definecolor{uaggwmain}{cmyk}{0.61,0.55,0.00,0.00}
-\definecolor{uaggwside}{cmyk}{0.21,0.27,0.03,0.00}
-%% Faculteit Letteren en Wijsbegeerte
-\definecolor{ualwmain}{cmyk}{0.00,0.27,0.85,0.00}
-\definecolor{ualwside}{cmyk}{0.00,0.16,0.51,0.00}
-%% Faculteit Ontwerpwetenschappen
-\definecolor{uaowmain}{cmyk}{0.53,0.25,0.26,0.05}
-\definecolor{uaowside}{cmyk}{0.25,0.08,0.16,0.00}
-%% Faculteit Rechten
-\definecolor{uaremain}{cmyk}{0.10,1.00,0.90,0.05}
-\definecolor{uareside}{cmyk}{0.04,0.45,0.36,0.00}
-%% Faculteit Sociale Wetenschappen
-\definecolor{uaswmain}{cmyk}{0.08,0.00,1.00,0.26}
-\definecolor{uaswside}{cmyk}{0.20,0.11,0.50,0.00}
-%% Faculteit Toegepaste Ingenieurswetenschappen
-\definecolor{uatimain}{cmyk}{0.31,1.00,0.00,0.01}
-\definecolor{uatiside}{cmyk}{0.11,0.30,0.02,0.00}
-%% Faculteit Wetenschappen
-\definecolor{uawemain}{cmyk}{1.00,0.20,0.00,0.25}
-\definecolor{uaweside}{cmyk}{0.40,0.08,0.00,0.10}
-%% IOB
-\definecolor{uaiobmain}{cmyk}{0.05,0.75,1.00,0.00}
-\definecolor{uaiobside}{cmyk}{0.40,0.08,0.00,0.10}
-
-\else
-
-%% UAntwerpen
-\definecolor{uauamain}{RGB}{234,44,56}
-\definecolor{uauaside}{RGB}{0,46,101}
-%% Faculteit Bedrijfswetenschappen en Economie
-\definecolor{uabemain}{RGB}{101,168,18}
-\definecolor{uabeside}{RGB}{185,213,169}
-%% Faculteit Farmaceutische, Biomedische en Diergeneeskundige Wetenschappen
-\definecolor{uafbdmain}{RGB}{68,184,243}
-\definecolor{uafbdside}{RGB}{181,221,247}
-%% Faculteit Geneeskunde en Gezondheidswetenschappen
-\definecolor{uaggwmain}{RGB}{117,117,203}
-\definecolor{uaggwside}{RGB}{198,182,210}
-%% Faculteit Letteren en Wijsbegeerte
-\definecolor{ualwmain}{RGB}{241,181,61}
-\definecolor{ualwside}{RGB}{255,218,145}
-%% Faculteit Ontwerpwetenschappen
-\definecolor{uaowmain}{RGB}{130,161,173}
-\definecolor{uaowside}{RGB}{200,217,216}
-%% Faculteit Rechten
-\definecolor{uaremain}{RGB}{210,8,36}
-\definecolor{uareside}{RGB}{237,157,144}
-%% Faculteit Sociale Wetenschappen
-\definecolor{uaswmain}{RGB}{173,165,0}
-\definecolor{uaswside}{RGB}{215,211,148}
-%% Faculteit Toegepaste Ingenieurswetenschappen
-\definecolor{uatimain}{RGB}{177,0,151}
-\definecolor{uatiside}{RGB}{221,184,210}
-%% Faculteit Wetenschappen
-\definecolor{uawemain}{RGB}{0,108,169}
-\definecolor{uaweside}{RGB}{151,192,223}
-%% IOB
-\definecolor{uaiobmain}{RGB}{230,98,8}
-\definecolor{uaiobside}{RGB}{151,192,223}
-
-\fi
+\RequirePackage{uantwerpencolorlogoscheme}
%% define main color
-\colorlet{maincolor}{\maincolor}
-\colorlet{sidecolor}{\sidecolor}
-\colorlet{basecolor}{\basecolor}
-
\setbeamercolor{palette primary}{fg=maincolor}
\setbeamercolor{palette secondary}{fg=sidecolor}
\setbeamercolor{palette tertiary}{fg=uauaside}
@@ -5452,27 +5402,27 @@ L: \@qrlectureri
\setbeamercolor{inverse subsection name}{fg=white!75!maincolor}
\mode
<all>
-%</bmrcolor>
+%</bmrcolor>
% \end{macrocode}
-%
+%
% \subsubsection{Beamer font theme}
-%
+%
% \begin{macrocode}
-%<*bmrfont>
-% Copyright 2021 by Walter Daems
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-%
-% See the file doc/licenses/LICENSE for more details.
+%<*bmrfont>
+% Copyright 2021 by Walter Daems
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the file doc/licenses/LICENSE for more details.
\usetikzlibrary{calc}
\if@nofonts
\else
- \RequirePackage{iftex}
+\RequirePackage{iftex}
% Uncomment the following line if in MiKTeX you get the error
% message that \ifluatex is already defined.
% You first option is to update all your packages both in user as in
@@ -5545,7 +5495,7 @@ L: \@qrlectureri
\setbeamerfont{footline}{parent={tiny structure}}
\setbeamerfont{frametitle}
- {parent=structure,size=\renewcommand{\baselinestretch}{0.85}\LARGE\bfseries}
+ {parent=structure,size=\renewcommand*{\baselinestretch}{0.85}\LARGE\bfseries}
\setbeamerfont{framesubtitle}{parent=frametitle,size=\normalsize\bfseries}
\setbeamerfont{caption}{size=\small}
@@ -5626,7 +5576,7 @@ L: \@qrlectureri
\newif\if@noround
\@noroundfalse
-\newcommand\uantwerpenleftshape[3][]{
+\newcommand*\uantwerpenleftshape[3][]{
\newcommand\mycradius{0.05*(\getlength{\paperheight}-1.6)}%
\coordinate (bl) at #2;
\coordinate (tr) at #3;
@@ -5637,7 +5587,7 @@ L: \@qrlectureri
arc(-90:-180:{\mycradius}) -- cycle;
\fi
}
-\newcommand\uantwerpenrightshape[3][]{
+\newcommand*\uantwerpenrightshape[3][]{
\newcommand\mycradius{0.05*(\getlength{\paperheight}-1.6)}%
\coordinate (bl) at #2;
\coordinate (tr) at #3;
@@ -5649,7 +5599,7 @@ L: \@qrlectureri
\fi
}
-\newcommand\darken[2][0.5]{%
+\newcommand*\darken[2][0.5]{%
\begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
\node (a) {#2};
\fill[fill=black,opacity=#1] (a.south west) rectangle (a.north east);
@@ -5678,7 +5628,7 @@ L: \@qrlectureri
\end{tikzpicture}
}
-\newcommand\uantwerpenicon[1][scale=1]{
+\newcommand*\uantwerpenicon[1][scale=1]{
\includegraphics[#1]{\iconfile}
}
@@ -5708,8 +5658,8 @@ L: \@qrlectureri
\mode<presentation>
\newcommand*\getlength[1]{\strip@pt#1/28.45274}
-\newcommand\pw{\getlength{\paperwidth}}%
-\newcommand\ph{\getlength{\paperheight}}%
+\newcommand*\pw{\getlength{\paperwidth}}%
+\newcommand*\ph{\getlength{\paperheight}}%
\newif\if@rhtext
\@rhtextfalse
@@ -6334,9 +6284,9 @@ L: \@qrlectureri
\newdimen\yupright
\newdimen\xcurrent
\newdimen\ycurrent
-\newcommand\extractloleft[1]{\path (#1);\pgfgetlastxy{\xloleft}{\yloleft};}
-\newcommand\extractupright[1]{\path (#1);\pgfgetlastxy{\xupright}{\yupright};}
-\newcommand\extractcurrent[1]{\path (#1);\pgfgetlastxy{\xcurrent}{\ycurrent};}
+\newcommand*\extractloleft[1]{\path (#1);\pgfgetlastxy{\xloleft}{\yloleft};}
+\newcommand*\extractupright[1]{\path (#1);\pgfgetlastxy{\xupright}{\yupright};}
+\newcommand*\extractcurrent[1]{\path (#1);\pgfgetlastxy{\xcurrent}{\ycurrent};}
\DeclareRobustCommand\place{\@ifnextchar[{\@place}{\@place[align=left] }}
\def\@place[#1] at (#2,#3)#4{
diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpendocs.ins b/macros/latex/contrib/uantwerpendocs/uantwerpendocs.ins
index caf675dfb6..e21ec6b85c 100644
--- a/macros/latex/contrib/uantwerpendocs/uantwerpendocs.ins
+++ b/macros/latex/contrib/uantwerpendocs/uantwerpendocs.ins
@@ -15,7 +15,7 @@
%% The Current Maintainer of this work is Walter Daems.
%%
-\input docstrip.tex
+\input l3docstrip.tex
\keepsilent
\usedir{tex/latex/uantwerpendocs}
@@ -42,6 +42,8 @@ The Current Maintainer of this work is Walter Daems.
\endpreamble
+\generate{\file{uantwerpencommonoptions.clo}{\from{uantwerpendocs.dtx}{clo}}}
+\generate{\file{uantwerpencolorlogoscheme.sty}{\from{uantwerpendocs.dtx}{cls}}}
\generate{\file{uantwerpencoursetext.cls}{\from{uantwerpendocs.dtx}{ct}}}
\generate{\file{uantwerpencoursetext-example.tex}{\from{uantwerpendocs.dtx}{ct-example}}}
@@ -53,6 +55,9 @@ The Current Maintainer of this work is Walter Daems.
\generate{\file{uantwerpenphdthesis-example1.tex}{\from{uantwerpendocs.dtx}{pt-example1}}}
\generate{\file{uantwerpenphdthesis-example2.tex}{\from{uantwerpendocs.dtx}{pt-example2}}}
+\generate{\file{uantwerpenreport.cls}{\from{uantwerpendocs.dtx}{rp}}}
+\generate{\file{uantwerpenreport-example.tex}{\from{uantwerpendocs.dtx}{rp-example}}}
+
\generate{\file{uantwerpenletter.cls}{\from{uantwerpendocs.dtx}{le}}}
\generate{\file{uantwerpenletter.cfg}{\from{uantwerpendocs.dtx}{le-cfg}}}
\generate{\file{uantwerpenletter-example.tex}{\from{uantwerpendocs.dtx}{le-example}}}
@@ -67,6 +72,10 @@ The Current Maintainer of this work is Walter Daems.
\generate{\file{beamerouterthemeuantwerpen.sty}{\from{uantwerpendocs.dtx}{bmrouter}}}
\generate{\file{beamerthemeuantwerpen.sty}{\from{uantwerpendocs.dtx}{bmr}}}
\generate{\file{beamerthemeuantwerpenuserguide.tex}{\from{uantwerpendocs.dtx}{bmrug}}}
+\nopreamble
+\nopostamble
+\generate{\file{uantwerpendocs-nl.data}{\from{uantwerpendocs.dtx}{nldata}}}
+\generate{\file{uantwerpendocs-en.data}{\from{uantwerpendocs.dtx}{endata}}}
\obeyspaces
\Msg{****************************************************************}
@@ -78,8 +87,13 @@ The Current Maintainer of this work is Walter Daems.
\Msg{* uantwerpenmasterthesis.cls *}
\Msg{* uantwerpenbamathesis.cls *}
\Msg{* uantwerpenphdthesis.cls *}
+\Msg{* uantwerpenreport.cls *}
\Msg{* uantwerpenletter.cls *}
\Msg{* uantwerpenexam.cls *}
+\Msg{* uantwerpendocs-nl.data *}
+\Msg{* uantwerpendocs-en.data *}
+\Msg{* uantwerpencommonoptions.clo *}
+\Msg{* uantwerpencolorlogoscheme.sty *}
\Msg{* beamercolorthemeuantwerpen.sty *}
\Msg{* beamerfontthemeuantwerpen.sty *}
\Msg{* beamerinnerthemeuantwerpen.sty *}
diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpendocs.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpendocs.pdf
index dee1f993f9..e446d17203 100644
--- a/macros/latex/contrib/uantwerpendocs/uantwerpendocs.pdf
+++ b/macros/latex/contrib/uantwerpendocs/uantwerpendocs.pdf
Binary files differ
diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example1.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example1.pdf
index b33cfe3477..f91e3fd766 100644
--- a/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example1.pdf
+++ b/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example1.pdf
Binary files differ
diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example2.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example2.pdf
index 7e606d13f7..6a1131b814 100644
--- a/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example2.pdf
+++ b/macros/latex/contrib/uantwerpendocs/uantwerpenexam-example2.pdf
Binary files differ
diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpenletter-example.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpenletter-example.pdf
index 1caa00fe49..fbb07439fa 100644
--- a/macros/latex/contrib/uantwerpendocs/uantwerpenletter-example.pdf
+++ b/macros/latex/contrib/uantwerpendocs/uantwerpenletter-example.pdf
Binary files differ
diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example1.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example1.pdf
index 5d49fcba41..8220f2216d 100644
--- a/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example1.pdf
+++ b/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example1.pdf
Binary files differ
diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example2.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example2.pdf
index 2469c14255..f5fc78abb1 100644
--- a/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example2.pdf
+++ b/macros/latex/contrib/uantwerpendocs/uantwerpenphdthesis-example2.pdf
Binary files differ
diff --git a/macros/latex/contrib/uantwerpendocs/uantwerpenreport-example.pdf b/macros/latex/contrib/uantwerpendocs/uantwerpenreport-example.pdf
new file mode 100644
index 0000000000..da2af47217
--- /dev/null
+++ b/macros/latex/contrib/uantwerpendocs/uantwerpenreport-example.pdf
Binary files differ