diff options
Diffstat (limited to 'Master')
38 files changed, 1446 insertions, 597 deletions
diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/beamerthemeuantwerpenuserguide.pdf b/Master/texmf-dist/doc/latex/uantwerpendocs/beamerthemeuantwerpenuserguide.pdf Binary files differindex 9f8e225c71e..4d63ea5dce7 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/beamerthemeuantwerpenuserguide.pdf +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/beamerthemeuantwerpenuserguide.pdf diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/beamerthemeuantwerpenuserguide.tex b/Master/texmf-dist/doc/latex/uantwerpendocs/beamerthemeuantwerpenuserguide.tex index c0dee701287..8c1ddcdc824 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/beamerthemeuantwerpenuserguide.tex +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/beamerthemeuantwerpenuserguide.tex @@ -24,9 +24,6 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{4.1} -\def\filedate{2021/08/03} - \documentclass[aspectratio=1610]{beamer} @@ -401,8 +398,8 @@ \begin{center}\small \begin{tabular}{ccc} \toprule - \bf frame option & \bf graphic on frame - & \bf corresponding frame derivative\\ + \bfseries frame option & \bfseries graphic on frame + & \bfseries corresponding frame derivative\\ \midrule lqgraphic & left quarter & r3qframe \\ rqgraphic & right quarter & l3qframe \\ @@ -768,6 +765,27 @@ \end{columns} \end{frame} +\begin{frame}[t] + {Block material} + {Nothing special} + + \vfill + \begin{block}{This is a block} + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac + arcu est, vel posuere velit. In congue erat vel lorem ornare pretium. + \end{block} + \vfill + \begin{exampleblock}{This is an example block} + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac + arcu est, vel posuere velit. In congue erat vel lorem ornare pretium. + \end{exampleblock} + \vfill + \begin{alertblock}{This is an alert block} + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac + arcu est, vel posuere velit. In congue erat vel lorem ornare pretium. + \end{alertblock} + \vfill +\end{frame} \section{Advanced material} \begin{frame}[negative] diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.pdf b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.pdf Binary files differindex 78da7dc3e65..6231268cc11 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.pdf +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.pdf diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex index 568b4116883..d4612077517 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex @@ -24,9 +24,7 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{4.1} -\def\filedate{2021/08/03} -\documentclass[a4paper,11pt,twoside,openright,english,ti]{uantwerpenbamathesis} +\documentclass[ti,twoside,openright,a4paper,11pt]{uantwerpenbamathesis} \usepackage[dutch]{babel} % or english if your text is in English \usepackage{kantlipsum} % this is just for some dummy text, please remove @@ -36,17 +34,31 @@ % yourself! This allows you to put it in the % correct order with the other packages you load! -\title{Minimax optimisatie voor performantieruimtemodellering} +\usepackage{mathptmx} +\iftutex +\usepackage{fontspec} +\setmainfont{Calibri} % comment this line out if you want computer + % modern as main font, or feel free to select + % any other font +\setsansfont{Calibri} +\usepackage{sansmathaccent} +\fi + +\bamadegree{ti-nl-ma-ei} + +\title{Minimax optimisatie voor performantie- + ruimtemodellering} % either don't split titles, or do so with hypen + % and a newline +\subtitle{Deze subtitel mag je weglaten} \author{Bert Bibber} -\supervisor{prof. dr. ir. Kumulus}{Universiteit Antwerpen} -\supervisor{prof. dr. Hilarius Warwinkel}{TNT-Bang, N.V.} -\supervisor{ing. Piet Pienter}{POM} +\supervisor{prof. dr. ir. P. Kumulus}{UAntwerpen} +\supervisor{prof. dr. ir. E. Snuffel}{UAntwerpen} +\cosupervisor{ing. P. Pienter}{Cosys, UAntwerpen} +\extsupervisor{prof. dr. H. Warwinkel}{TNT-Bang, N.V.} + +\academicyear{2021 - 2022} -\academicyear{2021-2022} -\degree{Bachelor of Science in de industri\"ele wetenschappen - elektronica-ICT} -\defenselocation{Antwerpen} -\defensedate{juni 2021} \begin{document} @@ -59,10 +71,16 @@ \mainmatter \chapter*{Inleiding} +\insettext{Bene vixit qui bene latuit!} + \kant[1] \chapter{Onderzoeksvraag} +\insetquote{As any dedicated reader can clearly see, the Ideal of + practical reason is a representation of + as far as I know, the things themselves, a vast overexaggeration.} + \section{Het gebeuren} \kant[2] @@ -73,6 +91,20 @@ \kant[3] +\kant[4] + +\kant[5] + +\kant[6] + +\kant[7] + +\kant[8] + +\kant[9] + +\kant[10] + \chapter{Literatuurstudie} \chapter{Theoretische achtergrond} @@ -86,12 +118,9 @@ \chapter{Symbolen} \chapter{Referentielijst} -\makefinalpage - \end{document} - \endinput %% %% End of file `uantwerpenbamathesis-example.tex'. diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf Binary files differindex 1c92a8aff28..ea7a46b5781 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex index 9490171b65e..02df871cf1c 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex @@ -24,8 +24,6 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{4.1} -\def\filedate{2021/08/03} \documentclass[ti,a4paper,11pt,oneside,openright,cameraready]{uantwerpencoursetext} \usepackage[english,dutch]{babel} @@ -111,7 +109,6 @@ \end{document} - \endinput %% %% End of file `uantwerpencoursetext-example.tex'. diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpendocs.pdf b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpendocs.pdf Binary files differindex 2f26c889a0f..ad37df0ecc6 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpendocs.pdf +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpendocs.pdf diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.pdf b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.pdf Binary files differindex 53e867b1914..0c082ec5448 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.pdf +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.pdf diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex index b816acf48e8..0635c2aea41 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex @@ -24,8 +24,6 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{4.1} -\def\filedate{2021/08/03} \documentclass[ti,a4paper,10pt]{uantwerpenexam} \usepackage{newpxtext} % demonstration of some fine font packages \usepackage{newpxmath} @@ -120,7 +118,6 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in \end{document} - \endinput %% %% End of file `uantwerpenexam-example1.tex'. diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.pdf b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.pdf Binary files differindex 8855238b4af..ba83514aa1a 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.pdf +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.pdf diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex index 6da71ce9c4c..44ce670ac78 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex @@ -24,8 +24,6 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{4.1} -\def\filedate{2021/08/03} \documentclass[ti,a4paper,10pt]{uantwerpenexam} \usepackage{newpxtext} % demonstration of some fine font packages \usepackage{newpxmath} @@ -211,7 +209,6 @@ \end{document} - \endinput %% %% End of file `uantwerpenexam-example2.tex'. diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf Binary files differindex 939e0f136ef..0f3b342b4b8 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.tex b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.tex index 8e095f5478e..fb4bdf4b2f1 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.tex +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.tex @@ -24,8 +24,6 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{4.1} -\def\filedate{2021/08/03} \documentclass[ti,a4paper]{uantwerpenletter} %% As a good UAntwerpen citizen, you would use the calibri font. @@ -99,7 +97,6 @@ \end{document} - \endinput %% %% End of file `uantwerpenletter-example.tex'. diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.pdf b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.pdf Binary files differindex 6cff2f5a1f9..395aca9a58f 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.pdf +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.pdf diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex index 3be870750fe..0dbc7466a79 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex @@ -24,8 +24,6 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{4.1} -\def\filedate{2021/08/03} \documentclass[ti,10pt,twoside,openright,filled]{uantwerpenphdthesis} \usepackage{mathptmx} @@ -126,7 +124,6 @@ \end{document} - \endinput %% %% End of file `uantwerpenphdthesis-example1.tex'. diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.pdf b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.pdf Binary files differindex 1b2c9d775a2..dcf054e25c7 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.pdf +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.pdf diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex index 77d6aeae3ef..6f9d00f3dc3 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex @@ -24,8 +24,6 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{4.1} -\def\filedate{2021/08/03} \documentclass[ti,10pt,twoside,openright,filled,cameraready]{uantwerpenphdthesis} \usepackage{newpxtext} @@ -118,7 +116,6 @@ \end{document} - \endinput %% %% End of file `uantwerpenphdthesis-example2.tex'. diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenreport-example.pdf b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenreport-example.pdf Binary files differindex a11f574693c..e48df6e1297 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenreport-example.pdf +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenreport-example.pdf diff --git a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenreport-example.tex b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenreport-example.tex index 7bef8834103..78455849593 100644 --- a/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenreport-example.tex +++ b/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenreport-example.tex @@ -24,8 +24,6 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{4.1} -\def\filedate{2021/08/03} \documentclass[10pt,twoside,openright,filled]{uantwerpenreport} \usepackage{mathptmx} @@ -111,7 +109,6 @@ \end{document} - \endinput %% %% End of file `uantwerpenreport-example.tex'. diff --git a/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx b/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx index 0301cb5e362..0b0b87df965 100644 --- a/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx +++ b/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx @@ -36,14 +36,15 @@ %<le>\ProvidesClass{uantwerpenletter} %<ex>\ProvidesClass{uantwerpenexam} %<bmr>\ProvidesPackage{beamerthemeuantwerpen} -%<cls|ct|bmt|mt|pt|rp|le|ex|bmr> [2021/08/03 v4.1 .dtx skeleton file] +%<cls|ct|bmt|mt|pt|rp|le|ex|bmr> [2021/10/04 v4.2 .dtx skeleton file] %<mt>\errmessage{This class is obsolete, use the uantwerpenbamathesis class instead !} -\def\fileversion{4.1} -\def\filedate{2021/08/03} %<*driver> \documentclass[a4paper]{ltxdoc} +\def\fileversion{4.2}% +\def\filedate{2021/10/04}% \usepackage{makeidx} \usepackage{alltt} +\usepackage{longtable} \usepackage{booktabs} \usepackage{metalogo} \IfFileExists{tocbibind.sty}{\usepackage{tocbibind}}{} @@ -311,10 +312,16 @@ % % \title{<put your title here>} % \author{<put your name here>} +% +% % you can specify, no, one or multiple names in the categories +% % supervisor (= promotor), cosupervisor (= copromotor), +% % extsupervisor (= externe promotor) % \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>} +% \cosupervisor{<put supervisor's name(s) here>}{<affiliation goes here>} +% \cosupervisor{<put supervisor's name(s) here>}{<affiliation goes here>} +% \extsupervisor{<put supervisor's name(s) here>}{<affiliation goes here>} +% \extsupervisor{<put supervisor's name(s) here>}{<affiliation goes here>} % % % classmarker % \academicyear{<XXXX-YYYY>} @@ -643,12 +650,10 @@ % This macro indicates which version of the course this is. % % -% \DescribeMacro{\defensedate} [bamathesis / phdthesis] (mandatory)\\ -% Date of the bamathesis defense in Dutch, in the form 'month year', -% e.g. ``juni 2012''. In case of a PhD thesis, only the year should be -% mentioned. +% \DescribeMacro{\defensedate} [phdthesis] (mandatory)\\ +% Only the year should be mentioned. % -% \DescribeMacro{\defenselocation} [bamathesis / phdthesis] +% \DescribeMacro{\defenselocation} [phdthesis] % (optional)\\ % Location of the defense. Defaults to ``Antwerpen''. % @@ -671,20 +676,55 @@ % \DescribeMacro{\phddegree} [phdthesis] (discontinued)\\ % This macro is no longer used. Use |\degree{}| instead. % -% \DescribeMacro{\degree} [bmthesis,phdthesis,coursetext] (mandatory)\\ +% \DescribeMacro{\degree} [bamathesis,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 +% be the Dutch title. For programmes in English it 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. +% Students of FTI and FWET, can use the |\bamadegree| command instead. +% +% \DescribeMacro{\bamadoctype} [bamadocument] (mandatory)\\ +% This allows to set the nature of the thesis. The proper values of +% the argument are listed below. Don't use this macro when you are +% using the |\bamadegree| macro (see below), unless you want to change +% the document type to 'project'. % +% \begin{center} +% % This data comes from uantwerpendocs-doctype.data +% \begingroup +% \catcode`\^^M=13% +% \def^^M{~\\}% +% \catcode`\==4 %~ +% \begin{longtable}{p{3cm}p{8.5cm}}% +% \toprule argument \\ \midrule ~\input{uantwerpendocs-doctype.data} +% \bottomrule% +% \end{longtable}% +% \endgroup +% \end{center} +% +% \DescribeMacro{\bamadegree} [bamathesis] (mandatory)\\ +% This allows to specify the official degree through an +% abbreviation. Using this abbreviation +% \begin{center} +% % This data comes from uantwerpendocs-degree.data +% \begingroup +% \catcode`\^^M=13% +% \def^^M{~\\}% +% \catcode`\==4 %~ +% \begin{longtable}{p{3cm}p{8.5cm}}% +% \toprule argument & degree \\ \midrule \input{uantwerpendocs-degree.data} +% \bottomrule% +% \end{longtable}% +% \endgroup +% \end{center} +% % \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 @@ -1007,7 +1047,13 @@ % % \begin{verbatim} %<*bmt-example> -\documentclass[a4paper,11pt,twoside,openright,english,ti]{uantwerpenbamathesis} +\documentclass[ti,twoside,openright,a4paper,11pt]{uantwerpenbamathesis} +% 1. specify your faculty in the options above! This will trigger the +% correct color scheme and logos. +% FTI = ti +% FWET = we +% 2. for two-sided theses, specify 'twoside' and 'openright' as options +% for one-sided theses, specify 'oneside' and 'openany' as options \usepackage[dutch]{babel} % or english if your text is in English \usepackage{kantlipsum} % this is just for some dummy text, please remove @@ -1017,17 +1063,36 @@ % yourself! This allows you to put it in the % correct order with the other packages you load! -\title{Minimax optimisatie voor performantieruimtemodellering} +\usepackage{mathptmx} +\iftutex +\usepackage{fontspec} +\setmainfont{Calibri} % comment this line out if you want computer + % modern as main font, or feel free to select + % any other font +\setsansfont{Calibri} +\usepackage{sansmathaccent} +\fi + +\bamadegree{ti-nl-ma-ei} + +\title{Minimax optimisatie voor performantie- + ruimtemodellering} % either don't split titles, or do so with hypen + % and a newline +\subtitle{Deze subtitel mag je weglaten} \author{Bert Bibber} -\supervisor{prof. dr. ir. Kumulus}{Universiteit Antwerpen} -\supervisor{prof. dr. Hilarius Warwinkel}{TNT-Bang, N.V.} -\supervisor{ing. Piet Pienter}{POM} +% you can specify multiple supervisors, cosupervisors and external supervisors +% in Dutch: promotoren, copromotoren (dagelijkse begeleiders) en bedrijfspromotoren +\supervisor{prof. dr. ir. P. Kumulus}{UAntwerpen} +\supervisor{prof. dr. ir. E. Snuffel}{UAntwerpen} +\cosupervisor{ing. P. Pienter}{Cosys, UAntwerpen} +\extsupervisor{prof. dr. H. Warwinkel}{TNT-Bang, N.V.} -\academicyear{2021-2022} -\degree{Bachelor of Science in de industri\"ele wetenschappen - elektronica-ICT} -\defenselocation{Antwerpen} -\defensedate{juni 2021} +% keep the spaces around the dash! +\academicyear{2021 - 2022} + +% you can specify a company logo +%\companylogo{\includegraphics[width=4.5cm,height=2.5cm,keepaspectratio]{companylogo.jpg}} \begin{document} @@ -1040,10 +1105,16 @@ \mainmatter \chapter*{Inleiding} +\insettext{Bene vixit qui bene latuit!} + \kant[1] \chapter{Onderzoeksvraag} +\insetquote{As any dedicated reader can clearly see, the Ideal of + practical reason is a representation of + as far as I know, the things themselves, a vast overexaggeration.} + \section{Het gebeuren} \kant[2] @@ -1054,6 +1125,21 @@ \kant[3] +\kant[4] + +\kant[5] + +\kant[6] + +\kant[7] + +\kant[8] + +\kant[9] + +\kant[10] + + \chapter{Literatuurstudie} \chapter{Theoretische achtergrond} @@ -1067,8 +1153,6 @@ \chapter{Symbolen} \chapter{Referentielijst} -\makefinalpage - \end{document} %</bmt-example> % \end{verbatim} @@ -2046,14 +2130,16 @@ 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. +% We load the |book| class for course texts, reports and PhD theses, and the +% scrbook class for bachelor and master theses. % \begin{macrocode} %<*ct|bmt|pt|rp> \input{uantwerpencommonoptions.clo} \ExecuteOptions{a4paper,11pt,final,oneside,openright} \ProcessOptions\relax -\LoadClassWithOptions{book} %</ct|bmt|pt|rp> +%<ct|pt|rp>\LoadClassWithOptions{book} +%<bmt>\LoadClassWithOptions{scrbook} % We load the |letter| class for letters %<*le> \input{uantwerpencommonoptions.clo} @@ -2091,15 +2177,21 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in % Let's reduce the margins to 1 inch each for the documents that are % unlikely to be glue bound: % \begin{macrocode} -%<*ct|bmt|rp|ex> +%<*ct|rp|ex> \RequirePackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry} -%</ct|bmt|rp|ex> +%</ct|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> +%</pt> +% Also, let's follow the office templates for the bachelor's and +% master's theses: +%<*bmt> +\RequirePackage[top=2.6cm, bottom=2.5cm, left=3.5cm, right=1.6cm]{geometry} +%</bmt> +% Letters are a little bit different: %<*le> \RequirePackage[top=1in, bottom=1in, left=1.34in, right=1in]{geometry} \RequirePackage[normalem]{ulem} @@ -2110,8 +2202,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in % 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{expl3} +\RequirePackage[check-declarations]{expl3} % I use this during debug phase \RequirePackage{xparse} %</ct|bmt|pt|rp|le|ex> % \end{macrocode} @@ -2165,10 +2257,11 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in % \begin{macrocode} %<*ct|bmt|pt|rp|le|ex> \RequirePackage{graphicx} +\RequirePackage{soul} \RequirePackage[export]{adjustbox} \RequirePackage{color} \RequirePackage{tikz} -\usetikzlibrary{positioning} +\usetikzlibrary{positioning,calc} \RequirePackage{eso-pic} %</ct|bmt|pt|rp|le|ex> %<*ct|rp> @@ -2201,18 +2294,65 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in % % \begin{macrocode} %<*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} -\definecolor{uacorporange}{cmyk} {0.00,0.32,1.00,0.09} -\definecolor{uaftifresh}{cmyk} {0.34,1.00,0.00,0.00} -\definecolor{uaftisober}{cmyk} {0.10,1.00,0.00,0.49} \definecolor{lightgray}{cmyk} {0.00,0.00,0.00,0.05} \definecolor{darkgray}{cmyk} {0.00,0.00,0.00,0.80} \definecolor{watermark}{cmyk} {0.00,0.00,0.00,0.05} %</ct|bmt|pt|rp|le|ex> % \end{macrocode} % +% \subsection{Fancy highlighting} +% \changes{v4.2}{2021/10/04}{Added highlighting facilities} +% Though I'm not keen on highlighting, the style gurus have decided to +% put highlighting in the titles of the bachelor's and master's +% theses. The macro blow highlights a token sequence using white text +% on the main color. +% \begin{macrocode} +%<*bmt> +\newcommand\@uantwerpendocshl[1]{\begin{lrbox}{\@tempboxa}#1\end{lrbox}\@uantwerpendocshlbox{\@tempboxa}} +\newcommand{\@uantwerpendocshlbox}[1]{% + \tikz{% + \pgfpathrectangle{\pgfpoint{1pt}{0pt}}{\pgfpoint{\wd #1}{\ht #1}}% + \pgfusepath{use as bounding box}% + \node[anchor=base + west,align=center,fill=maincolor,text=white,outer sep=0pt,inner + xsep=5pt, inner ysep=0pt,minimum height=\ht\strutbox+1pt]{\raisebox{1pt}{\strut}\strut\usebox{#1}}; + }% +} +%</bmt> +% \end{macrocode} +% +% \subsection{Fancy inset texts and quotes} +% \changes{v4.2}{2021/10/04}{Added some fancy inset texts and quotes} +% \begin{macrocode} +%<*bmt|pt|ct|rp> +\newcommand\insettext[1]{ + \textcolor{basecolor}{ + \begin{tabular}{@{\hskip3ex\textcolor{maincolor}{\vrule width 2.5pt}\hskip3ex\large\bfseries}p{0.88\textwidth}} + \strut #1 + \end{tabular} + } +} +\newcommand\insetquote[1]{ + \insettext{ + \begin{tikzpicture}[scale=0.65] + \fill[green!60!black] (0.4,0) -- (0.5,0) -- (0.75,-0.15) -- (0.75,0) -- + (0.9,0) arc(-90:0:0.1) -- (1,0.65) arc(0:90:0.1) -- (0.1,0.75) arc + (90:180:0.1) -- (0,0.1) arc(-180:-90:0.1) -- cycle; + \foreach \x in {0.35,0.7} { + \begin{scope}[shift={(\x,0.425)},scale=0.25] + \fill[white] (0,0) circle[radius=0.5]; + \fill[white] (0.5,0) arc(0:-90:1) -- + (-0.5,-0.725) arc(-90:0:0.725) -- cycle; + \end{scope} + } + \end{tikzpicture}\\ + #1 + } +} +%</bmt|pt|ct|rp> +% \end{macrocode} +% +% % \subsection{Camera-ready version} % \changes{v4.1}{2021/08/03}{Added cameraready option} % For the course texts, this means printing no artwork (as universitas @@ -2230,12 +2370,9 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in %</pt> % \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} +% \subsection{Data dictionary and parser} +% % Let's start by defining our dictionary: % \begin{macrocode} %<*ct|bmt|pt|rp|le|ex> @@ -2253,19 +2390,15 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in \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> +\NewDocumentCommand{\uantwerpendocspropread}{m}{ + \@@_datareader:n { #1 } +} \cs_generate_variant:Nn \prop_gput:Nnn{ Nxx } \cs_new_nopar:Npn \@@_dataparser:w #1 = #2!! { \tl_set:Nn \l_tmpa_tl {#1} @@ -2303,6 +2436,17 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in %</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} +% 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). +% +% % \begin{macrocode} %<*ct|bmt|pt|rp|le|ex> \newcommand*\@logo{\logopos} @@ -2317,6 +2461,8 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in } } {} + \uantwerpendocspropread{degree} + \uantwerpendocspropread{doctype} \makeatletter } %</ct|bmt|pt|rp|le|ex> @@ -2324,104 +2470,253 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in % % 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 +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 +cosupervisorname = Cosupervisor +cosupervisorsname = Cosupervisors +extsupervisorname = External supervisor +extsupervisorsname = External 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 +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 +cosupervisorname = Copromotor +cosupervisorsname = Copromotoren +extsupervisorname = Externe Promotor +extsupervisorsname = Externe 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{Bachelor and Master document types} +% \changes{v4.2}{2021/10/04}{Added bachelor/master document types} +% \begin{macrocode} +%<*doctypedata> +nl-ba = Bachelorproef +nl-ma = Masterproef +nl-pr = Projectverslag +en-ba = Bachelor's thesis +en-ma = Master's thesis +en-pr = Project report +%</doctypedata> +% \end{macrocode} +% +% \begin{macrocode} +%<*bmt> +\ExplSyntaxOn +\cs_generate_variant:Nn \prop_item:Nn{ Nx } +\NewDocumentCommand{\uantwerpendocsdoctype}{m}{ + \prop_item:Nx \g_@@_data_prop { #1 } +} +\ExplSyntaxOff +%</bmt> +% \end{macrocode} +% +% \subsection{Bachelor and Master disclaimers} +% \changes{v4.2}{2021/10/04}{Added bachelor/master disclaimers} +% \begin{macrocode} +%<*bmt> +\newcommand\disclaimer[1]{ + Disclaimer #1\newline\newline + This document is an examination document that has not been + corrected for any errors identified. Without prior written + permission of both the supervisor(s) and the author(s), any copying, + copying, using or realizing this publication or parts thereof + is prohibited. For requests for information regarding the copying + and/or use and/or realisation of parts of this publication, please + contact to the university at which the author is registered. + \newline\newline + Prior written permission from the supervisor(s) is also + required for the use for industrial or commercial utility of the + (original) methods, products, circuits and programs described in this + thesis, and for the submission of this publication for participation + in scientific prizes or competitions. + \newline\newline + This document is in accordance with the master thesis regulations and the + Code of Conduct. It has been reviewed by the supervisor and the attendant. +} +\AtBeginDocument{ + \makeatother + \@ifpackageloaded{babel}{ + \addto\captionsdutch{% + \renewcommand\disclaimer[1]{ + Disclaimer #1\newline\newline + Dit document is een examendocument dat niet werd gecorrigeerd voor + eventueel vastgestelde fouten. Zonder voorafgaande schriftelijke + toestemming van zowel de promotor(en) als de auteur(s) is overnemen, + kopiëren, gebruiken of realiseren van deze uitgave of gedeelten ervan + verboden. Voor aanvragen tot of informatie i.v.m. het overnemen en/of + gebruik en/of realisatie van gedeelten uit deze publicatie, wendt u + tot de universiteit waaraan de auteur is ingeschreven. + \newline\newline + Voorafgaande schriftelijke toestemming van de promotor(en) is eveneens + vereist voor het aanwenden van de in dit afstudeerwerk beschreven + (originele) methoden, producten, schakelingen en programma's voor + industrieel of commercieel nut en voor de inzending van deze + publicatie ter deelname aan wetenschappelijke prijzen of wedstrijden. + \newline\newline + Dit document is in overeenstemming met het masterproefreglement en de + gedragscode en nagekeken door promotor en begeleider. + } + } + }{} + \makeatletter +} +%</bmt> +% \end{macrocode} +% +% +% \subsection{Educational degrees} +% +% \changes{v4.2}{2021/10/04}{Added bachelor/master degrees of FTI and FWET} +% \begin{macrocode} +%<*degreedata> +ti-nl-ba-bk = Bachelor of Science in de industriële wetenschappen: bouwkunde +ti-nl-ba-ch = Bachelor of Science in de industriële wetenschappen: chemie +ti-nl-ba-em = Bachelor of Science in de industriële wetenschappen: elektromechanica +ti-nl-ba-ei = Bachelor of Science in de industriële wetenschappen: elektronica-ICT +ti-nl-ma-bk = Master of Science in de industriële wetenschappen: bouwkunde +ti-nl-ma-bch = Master of Science in de industriële wetenschappen: biochemie +ti-nl-ma-ch = Master of Science in de industriële wetenschappen: chemie +ti-nl-ma-em = Master of Science in de industriële wetenschappen: elektromechanica +ti-nl-ma-ei = Master of Science in de industriële wetenschappen: elektronica-ICT +ti-en-ma-ei = Master of Science in Electronics and ICT Engineering Technology +ti-nl-eduma-wtstem = Educatieve master of Science in de wetenschappen en technologie: STEM +we-nl-eduma-wtstem = Educatieve master of Science in de wetenschappen en technologie: STEM +we-nl-eduma-wtbchbt = Educatieve master of Science in de wetenschappen en technologie: biochemie en biotechnologie +we-nl-eduma-wtbio = Educatieve master of Science in de wetenschappen en technologie: biologie +we-nl-eduma-wtch = Educatieve master of Science in de wetenschappen en technologie: chemie +we-nl-eduma-wtfy = Educatieve master of Science in de wetenschappen en technologie: fysica +we-nl-eduma-wtinf = Educatieve master of Science in de wetenschappen en technologie: informatica +we-nl-eduma-wtwi = Educatieve master of Science in de wetenschappen en technologie: wiskunde +we-nl-ba-bircg = Bachelor of Science in de bio-ingenieurswetenschappen: cel- en genbiotechnologie +we-nl-ba-birvt = Bachelor of Science in de bio-ingenieurswetenschappen: chemie en voedingstechnologie +we-nl-ba-birlb = Bachelor of Science in de bio-ingenieurswetenschappen: land- en bosbeheer +we-nl-ba-birmt = Bachelor of Science in de bio-ingenieurswetenschappen: milieutechnologie +we-nl-ba-bio = Bachelor of Science in de biologie +we-nl-ma-bioeg = Master of Science in de biologie: evolutie en gedragsbiologie +we-en-ma-biocr = Master of Science in biology: biodiversity, conservation and restoration +we-en-ma-biogcb = Master of Science in biology: global change biology +we-en-ma-biomb = Master of Science in molecular biology +we-nl-ba-ch = Bachelor of Science in de chemie +we-en-ma-ch = Master of Science in chemistry +we-nl-ba-inf = Bachelor of Science in de informatica +we-en-ma-infcn = Master of Science in computer science: computer networks +we-en-ma-infdsai = Master of Science in computer science: data science and artificial intelligence +we-en-ma-infse = Master of Science in computer science: software engineering +we-nl-ma-infcn = Master of Science in de informatica: computernetwerken +we-nl-ma-infdsai = Master of Science in de informatica: data science en artificiële intelligentie +we-nl-ma-infse = Master of Science in de informatica: software engineering +we-nl-ba-fy = Bachelor of Science in de fysica +we-nl-ma-fy = Master of Science in de fysica +we-en-ma-fy = Master of Science in physics +we-nl-ba-wi = Master of Science in wiskunde +we-nl-ma-wifw = Master of Science in wiskunde: fundamentele wiskunde +we-nl-ma-wiftw = Master of Science in wiskunde: financiële en toegepaste wiskunde +%</degreedata> +% \end{macrocode} +% +% \begin{macrocode} +%<*bmt> +\ExplSyntaxOn +\NewDocumentCommand{\uantwerpendocsdegree}{m}{ + \typeout{#1} + \prop_item:Nx \g_@@_data_prop { #1 } +} +\ExplSyntaxOff +%</bmt> +% \end{macrocode} +% +% % \subsection{Tags} % % \begin{macro}{\facultyacronym} @@ -2459,17 +2754,6 @@ weightname = Gewicht % the title page, in the header/footer and to set the appropriate % |hyperref| tag (if it is loaded). % \begin{macrocode} -%<*bmt> -\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|rp> \newcommand*{\@subtitle}{~} \newcommand*{\subtitle}[1]{% @@ -2546,6 +2830,17 @@ weightname = Gewicht % \end{macrocode} % \end{macro} % +% \begin{macro}{\companylogo} +% This macro sets the |\@companylogo| tag that later will be used on +% the title page. +% \begin{macrocode} +%<*bmt> +\newcommand*{\@companylogo}{} +\newcommand*{\companylogo}[1]{\renewcommand*{\@companylogo}{#1}} +%</bmt> +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\lecturer} % This macro adds lecturers (Dutch: titularissen) to the course % notes. @@ -2570,7 +2865,9 @@ weightname = Gewicht \if_int_compare:w \seq_count:N \g_@@_lecturers > 1 \uantwerpendocsprop{lecturersname} \else: + \if_int_compare:w \seq_count:N \g_@@_lecturers > 0 \uantwerpendocsprop{lecturername} + \fi \fi: } \AtBeginDocument{ @@ -2620,7 +2917,6 @@ weightname = Gewicht % \begin{macrocode} %<*bmt|pt> \ExplSyntaxOn - \seq_new:N \g_@@_supervisors \seq_new:N \g_@@_supervisorswithaffiliation \cs_new:Nn \@@_addsupervisor:nn { @@ -2630,26 +2926,100 @@ weightname = Gewicht \NewDocumentCommand{\supervisor}{mm}{ \@@_addsupervisor:nn { #1 } { #2 } } -\NewDocumentCommand{\jointsupervisors}{m}{ - \seq_use:Nn \g_@@_supervisors { #1 } +\NewDocumentCommand{\jointsupervisors}{mm}{ + \seq_use:Nnnn \g_@@_supervisors { #2 } { #1 } { #2 } } -\NewDocumentCommand{\jointsupervisorswithaffiliation}{m}{ - \seq_use:Nn \g_@@_supervisorswithaffiliation { #1 } +\NewDocumentCommand{\jointsupervisorswithaffiliation}{mm}{ + \seq_use:Nnnn \g_@@_supervisorswithaffiliation { #2 } { #1 } { #2 } } -\NewDocumentCommand{\supervisorsname}{}{ - \if_int_compare:w \seq_count:N \g_@@_supervisors > 1 - \uantwerpendocsprop{supervisorsname} +\NewDocumentCommand{\supervisorsname}{m}{ + \if_int_compare:w \seq_count:N \g_@@_supervisors > 2 + \uantwerpendocsprop{supervisorsname} #1 \else: - \if_int_compare:w \seq_count:N \g_@@_supervisors = 1 - \uantwerpendocsprop{supervisorname} + \if_int_compare:w \seq_count:N \g_@@_supervisors = 2 + \uantwerpendocsprop{supervisorname} #1 \else: \fi: \fi: } +%</bmt|pt> +%<*bmt> +\seq_new:N \g_@@_cosupervisors +\seq_new:N \g_@@_cosupervisorswithaffiliation +\cs_new:Nn \@@_addcosupervisor:nn { + \seq_gpush:Nn \g_@@_cosupervisors { #1 } + \seq_gpush:Nn \g_@@_cosupervisorswithaffiliation { #1,~#2 } +} +\NewDocumentCommand{\cosupervisor}{mm}{ + \@@_addcosupervisor:nn { #1 } { #2 } +} +\NewDocumentCommand{\jointcosupervisors}{mm}{ + \seq_use:Nnnn \g_@@_cosupervisors { #2 } { #1 } { #2 } +} +\NewDocumentCommand{\jointcosupervisorswithaffiliation}{mm}{ + \seq_use:Nnnn \g_@@_cosupervisorswithaffiliation { #2 } { #1 } { #2 } +} +\NewDocumentCommand{\cosupervisorsname}{m}{ + \if_int_compare:w \seq_count:N \g_@@_cosupervisors > 2 + \uantwerpendocsprop{cosupervisorsname} #1 + \else: + \if_int_compare:w \seq_count:N \g_@@_cosupervisors = 2 + \uantwerpendocsprop{cosupervisorname} #1 + \else: + \fi: + \fi: +} +\seq_new:N \g_@@_extsupervisors +\seq_new:N \g_@@_extsupervisorswithaffiliation +\cs_new:Nn \@@_addextsupervisor:nn { + \seq_gpush:Nn \g_@@_extsupervisors { #1 } + \seq_gpush:Nn \g_@@_extsupervisorswithaffiliation { #1,~#2 } +} +\NewDocumentCommand{\extsupervisor}{mm}{ + \@@_addextsupervisor:nn { #1 } { #2 } +} +\NewDocumentCommand{\jointextsupervisors}{mm}{ + \seq_use:Nnnn \g_@@_extsupervisors { #2 } { #1 } { #2 } +} +\NewDocumentCommand{\jointextsupervisorswithaffiliation}{mm}{ + \seq_use:Nnnn \g_@@_extsupervisorswithaffiliation { #2 } { #1 } { #2 } +} +\NewDocumentCommand{\extsupervisorsname}{m}{ + \if_int_compare:w \seq_count:N \g_@@_extsupervisors > 2 + \uantwerpendocsprop{extsupervisorsname} #1 + \else: + \if_int_compare:w \seq_count:N \g_@@_extsupervisors = 2 + \uantwerpendocsprop{extsupervisorname} #1 + \else: + \fi: + \fi: +} +%</bmt> +%<*pt> +\AtBeginDocument{ + \seq_gpush:Nn \g_@@_supervisors {} + \seq_greverse:N \g_@@_supervisors + \seq_gpush:Nn \g_@@_supervisorswithaffiliation {} + \seq_greverse:N \g_@@_supervisorswithaffiliation +} +%</pt> +%<*bmt> \AtBeginDocument{ + \seq_gpush:Nn \g_@@_supervisors {} \seq_greverse:N \g_@@_supervisors + \seq_gpush:Nn \g_@@_supervisorswithaffiliation {} \seq_greverse:N \g_@@_supervisorswithaffiliation + \seq_gpush:Nn \g_@@_cosupervisors {} + \seq_greverse:N \g_@@_cosupervisors + \seq_gpush:Nn \g_@@_cosupervisorswithaffiliation {} + \seq_greverse:N \g_@@_cosupervisorswithaffiliation + \seq_gpush:Nn \g_@@_extsupervisors {} + \seq_greverse:N \g_@@_extsupervisors + \seq_gpush:Nn \g_@@_extsupervisorswithaffiliation {} + \seq_greverse:N \g_@@_extsupervisorswithaffiliation } +%</bmt> +%<*bmt|pt> \ExplSyntaxOff %</bmt|pt> % \end{macrocode} @@ -2735,6 +3105,47 @@ weightname = Gewicht % \end{macrocode} % \end{macro} % +% \begin{macro}{\bamadoctype} +% This macro sets the |\@bamadoctype| tag that later will +% be used on the title pages. +% +% \begin{macrocode} +%<*bmt|pt|ct|ex> +\newcommand*\@bamadoctype{ + \PackageError{uantwerpendocs} + {Please, specify the offical document type, either using + the '\protect\bamadoctype{}' macro or the '\protect\bamadegree{}' + macro in the preamble of your document.} + {See the uantwerpendocs manual}} +\newcommand*\bamadoctype[1]{ + \renewcommand*\@bamadoctype{\uantwerpendocsdoctype{#1}} +} +%</bmt|pt|ct|ex> +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\bamadegree} +% This macro sets the |\@bamadoctype| and |\@degree| tags that later will +% be used on the title pages. +% +% \begin{macrocode} +%<*bmt|pt|ct|ex> +\ExplSyntaxOn +\NewDocumentCommand{\bamadegree}{m}{ + \seq_new:N \l_@@_degreechunks + \regex_extract_all:nnN { [^-]+ } { #1 } \l_@@_degreechunks + \bamadoctype{\seq_item:Nn\l_@@_degreechunks {2} - \seq_item:Nn\l_@@_degreechunks {3}} + \degree{\uantwerpendocsdegree{ + \seq_item:Nn\l_@@_degreechunks {1} - + \seq_item:Nn\l_@@_degreechunks {2} - + \seq_item:Nn\l_@@_degreechunks {3} - + \seq_item:Nn\l_@@_degreechunks {4} }} +} +\ExplSyntaxOff +%</bmt|pt|ct|ex> +% \end{macrocode} +% \end{macro} +% % % \begin{macro}{\programme} % This macro is no longer in use. @@ -2836,10 +3247,10 @@ weightname = Gewicht % This macro sets the |\@defensedate| tags that later will % be used on the title page. % \begin{macrocode} -%<*bmt|pt> +%<*pt> \newcommand*\@defensedate{ERROR} \newcommand*{\defensedate}[1]{\renewcommand*\@defensedate{#1}} -%</bmt|pt> +%</pt> % \end{macrocode} % \end{macro} % @@ -2847,10 +3258,10 @@ weightname = Gewicht % This macro sets the |\@defenselocation| tags that later will % be used on the title page. % \begin{macrocode} -%<*bmt|pt> +%<*pt> \newcommand*\@defenselocation{Antwerpen} \newcommand*{\defenselocation}[1]{\renewcommand*\@defenselocation{#1}} -%</bmt|pt> +%</pt> % \end{macrocode} % \end{macro} % @@ -2912,7 +3323,10 @@ weightname = Gewicht %<*ct|rp> \newcommand{\@copyrightnotices}{} \newcommand{\copyrightnotices}[1]{\renewcommand{\@copyrightnotices}{#1}} -%</ct|rp> +%</ct|rp> +%<*bmt> +\newcommand{\@copyrightnotices}{\disclaimer{\@bamadoctype}} +%</bmt> % \end{macrocode} % \end{macro} % @@ -3282,6 +3696,27 @@ weightname = Gewicht % \end{macrocode} % \end{macro} % +% +% \subsection{Dirty reverse video tricks} +% +% \begin{macrocode} +%<*bmt> +\ExplSyntaxOn +\seq_new:N \l_title_seq +\cs_generate_variant:Nn \seq_set_split:Nnn { Nnf } +\cs_new_nopar:Npn \@@_reversevideo:f #1 +{ + \seq_set_split:Nnf \l_title_seq {~} { #1 } + \seq_set_map:NNn \l_title_seq \l_title_seq {\@uantwerpendocshl{##1}} + \seq_use:Nnnn \l_title_seq { ~ } { ~ } { ~ } +} +\NewDocumentCommand{\reversevideo}{m}{ + \@@_reversevideo:f { #1 } +} +\ExplSyntaxOff +%</bmt> +% \end{macrocode} +% % \subsection{Header and Footer} % The |fancyhdr| package is used to make a decent header and footer. % The header and footer of the |coursetext| class are defined to be: @@ -3306,9 +3741,39 @@ weightname = Gewicht % \end{macrocode} % % The header and footer of the |bamathesis| class are -% defined to be: +% defined to be: % \begin{macrocode} -%<*bmt|pt|rp> +%<*bmt> +\AtBeginDocument{ + \setlength{\headheight}{13.7pt} + \renewcommand*{\headrulewidth}{0pt} + \renewcommand*{\footrulewidth}{0pt} + \newsavebox\smallogo + \savebox\smallogo{\raisebox{-1ex}{\includegraphics[width=2.5cm]{\logopos}}} + \if@twoside + \lhead[]{\footnotesize\slshape\rightmark} + \chead[]{} + \rhead[\footnotesize\slshape\leftmark]{} + \lfoot[\footnotesize\thepage~\textcolor{maincolor}{\textbf{|}}]{\usebox\smallogo} + \cfoot[\footnotesize\@bamadoctype]{\footnotesize\@bamadoctype} + \rfoot[\usebox\smallogo]{\footnotesize\textcolor{maincolor}{\textbf{|}}~\thepage} + \else + \lhead[]{\footnotesize\slshape\leftmark} + \chead[]{} + \rhead[]{} + \lfoot[]{\usebox\smallogo} + \cfoot[]{\footnotesize\@bamadoctype} + \rfoot[]{\footnotesize\textcolor{maincolor}{\textbf{|}}~\thepage} + \fi + \fancypagestyle{plain}{\pagestyle{fancy}} + % \patchcmd{\chapter}{\thispagestyle{plain}}{\thispagestyle{fancy}}{}{} +} +%</bmt> +% \end{macrocode} +% +% The header and foter of the |phdthesis| and |report| are defined to be: +% \begin{macrocode} +%<*pt|rp> \if@twoside \lhead[\thepage]{\slshape\rightmark} \chead[]{} @@ -3324,7 +3789,7 @@ weightname = Gewicht \cfoot[]{} \rfoot[]{} \fi -%</bmt|pt|rp> +%</pt|rp> % \end{macrocode} % % The header and footer of the |letter| class are @@ -3371,11 +3836,11 @@ weightname = Gewicht \renewcommand*{\footrulewidth}{1pt} \pagenumbering{arabic} %</ct> -%<*mt|pt|rp|le> +%<*pt|rp|le> \setlength{\headheight}{13.7pt} \renewcommand*{\headrulewidth}{0pt} \renewcommand*{\footrulewidth}{0pt} -%</mt|pt|rp|le> +%</pt|rp|le> %<*ex> \setlength{\headheight}{13.7pt} \renewcommand*{\headrulewidth}{0pt} @@ -3414,11 +3879,16 @@ weightname = Gewicht \copyright{} \@versionyear{} \uantwerpendocsprop{org-ua}, \uantwerpendocsprop{arr}. } %</ct|rp> +%<*bmt> +\newcommand{\@crnotice}{ + \@copyrightnotices +} +%</bmt> % \end{macrocode} % \end{macro} % % -% \subsection{Fancy chapter headers for the phdthesis class} +% \subsection{Fancy chapter headers for the phdthesis and report class} % % \changes{v2.1}{2018/06/20}{Added appropriate % \textbackslash{}appendix command} @@ -3430,20 +3900,20 @@ weightname = Gewicht \vspace*{1ex}% \begin{flushright} \makebox[0pt][l]{\rule[-0.4em]{10cm}{1.8em}}\textcolor{white} - {\bf\LARGE~\chaptername~} + {\LARGE\textbf{~\chaptername~}} \raisebox{-24pt}{ \begin{tikzpicture} \foreach \theta in {0,5,...,355} { \node[color=white] at (\theta:0.025) - {\bf\fontsize{72}{12}\selectfont\thechapter}; + {\fontsize{72}{12}\selectfont\textbf{\thechapter}}; } \node[color=gray] at (0,0) - {\bf\fontsize{72}{12}\selectfont\thechapter}; + {\fontsize{72}{12}\selectfont\textbf{\thechapter}}; \end{tikzpicture} }\hspace*{-8pt} \par\nobreak \interlinepenalty\@M - \bf\huge\textcolor{darkgray}{\rule[-0.5ex]{0em}{2.6ex}~#1} + \huge\textbf{\textcolor{darkgray}{\rule[-0.5ex]{0em}{2.6ex}~#1}} \par\nobreak \end{flushright} \rule{\textwidth}{1pt} @@ -3456,7 +3926,7 @@ weightname = Gewicht \def\@makeschapterhead#1{% \vspace*{1ex}% \begin{flushright} - \bf\LARGE\textcolor{darkgray}{\rule[-0.5ex]{0em}{2.6ex}~#1} + \LARGE\textbf{\textcolor{darkgray}{\rule[-0.5ex]{0em}{2.6ex}~#1}} \end{flushright} \rule{\textwidth}{1pt} \vspace{5\p@}\par @@ -3470,6 +3940,17 @@ weightname = Gewicht %</pt|rp> % \end{macrocode} % +% \subsection{Fancy chapter headers for the bamathesis class} +% +% \changes{v4.2}{2021/10/04}{Now using scrbook for bamathesis, with +% colored chapter and section titles} +% \begin{macrocode} +%<*bmt> +\addtokomafont{section}{\color{basecolor}} +\addtokomafont{chapter}{\color{basecolor}} +%</bmt> +% \end{macrocode} +% % \subsection{Title page for the masterthesis and coursetext clases} % % The title page is generated using the |\maketitle| command. As the @@ -3695,7 +4176,7 @@ weightname = Gewicht % \changes{v1.7}{2016/05/01}{Embedded babel translations of keywords % into title page} % \begin{macrocode} -%<*bmt> +%<*bmt> \renewcommand\maketitle{% \pagestyle{empty} \begin{titlepage} @@ -3703,62 +4184,66 @@ weightname = Gewicht \put(0,0){% \begin{tikzpicture}[inner sep=0pt,outer sep=0pt] \clip (0,0) rectangle(\paperwidth,\paperheight); - \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}} + [anchor=north east,align=right] + at (\paperwidth-1.6cm,\paperheight-2.6cm) + {\bfseries\large + \uantwerpendocsprop{acyearname}\\[.75ex]\Large\@academicyear}; + \node (title) + [anchor=north west,align=left, + text width={\paperwidth-5.1cm},font=\Huge,text=white, + xshift=1pt] + at (3.5cm,\paperheight-6.4cm) + {\sethlcolor{maincolor}% + \textsf{\textbf{\reversevideo{\@title}}}\\ + \textsf{\reversevideo{\@subtitle}}}; + \node + [anchor=north west,font=\LARGE,yshift=-1cm,xshift=-1pt] + at (title.south west) + {% + \textsf{\textbf{\@author}} }; \node - [anchor=west,text width={\paperwidth-5cm},align=left,font=\Large,uauaside] - at (2.125,{\paperheight-5cm}) - { - \textsf{\textbf{\@subtitle}} + [anchor=west,align=left, + text width={\paperwidth-5.1cm},font=\normalsize] + at (3.5cm,12cm) + {\textsf{\@bamadoctype}\\% + \textsf{\textbf{\@degree}} }; \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} + [anchor=west,align=left, + text width={\paperwidth-5.1cm},font=\normalsize] + at (3.5cm,7.5cm) + {\supervisorsname{\\} + \textbf{\jointsupervisorswithaffiliation{\\}{~\\~\\}}% + \cosupervisorsname{\\} + \textbf{\jointcosupervisorswithaffiliation{\\}{~\\~\\}}% + \extsupervisorsname{\\} + \textbf{\jointextsupervisorswithaffiliation{\\}{}} }; + \ifx\@companylogo\@empty + \else + \node[anchor=south east] at + (\pagewidth-1.6cm,1.5cm) + {\@companylogo}; + \fi - \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}}; + + \node[anchor=south west] at + (1.6cm,1.5cm) + {\includegraphics[width=6.2cm]{\logopos}}; \end{tikzpicture} } } \end{titlepage}% ~\par\relax \clearpage + \vspace*{\stretch{1}} + \@crnotice + \clearpage \setcounter{footnote}{0}% \global\let\thanks\relax \global\let\maketitle\relax @@ -3781,19 +4266,6 @@ weightname = Gewicht % \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); - \fill[lightgray] (0,0) rectangle (2.125cm,2.625cm); - \end{tikzpicture} - }; - \end{tikzpicture} } %</bmt> % \end{macrocode} @@ -3867,8 +4339,8 @@ weightname = Gewicht (SN) at (2.55,4.9) { \begin{tabular}{@{}l@{~\,}p{11.5cm}} - \textsf{\supervisorsname} - & \textsf{\textbf{\jointsupervisors{ | }}} + \textsf{\supervisorsname{}} + & \textsf{\textbf{\jointsupervisors{ | }{}}} \end{tabular} }; @@ -3910,8 +4382,8 @@ weightname = Gewicht \hfill \begin{minipage}[b]{0.4\textwidth} \flushright - \supervisorsname\\ - \jointsupervisors{\\} + \supervisorsname{\\} + \jointsupervisors{\\}{} \end{minipage} \end{center} \clearpage @@ -3919,8 +4391,8 @@ weightname = Gewicht \textbf{\uantwerpendocsprop{jurychairmanname}}\hfill\break \@jurychairman{}\ifdefvoid{\@jurychairmanaff}{}{, \@jurychairmanaff}\\ \hfill\break - \textbf{\supervisorsname}\hfill\break - \jointsupervisorswithaffiliation{\\}\\ + \textbf{\supervisorsname{}}\hfill\break + \jointsupervisorswithaffiliation{\\}{\\} \hfill\break \textbf{\uantwerpendocsprop{jurymembersname}}\hfill\break \jointjurymembers{\\} @@ -4163,7 +4635,7 @@ weightname = Gewicht }; \end{tikzpicture} ~\\[3ex] - \textcolor{uacorpblue}{\bf \@sender} + \textcolor{uauaside}{\textbf{\@sender}} \ifx\@senderrole\@emptymacro\\[1.75ex]\else \\*\@senderrole\\[1.75ex]\fi \@faculty \ifx\@unit\@emptymacro\else\\* \@unit\fi~\\[1.75ex] @@ -4966,8 +5438,8 @@ weightname = Gewicht \begin{center}\small \begin{tabular}{ccc} \toprule - \bf frame option & \bf graphic on frame - & \bf corresponding frame derivative\\ + \bfseries frame option & \bfseries graphic on frame + & \bfseries corresponding frame derivative\\ \midrule lqgraphic & left quarter & r3qframe \\ rqgraphic & right quarter & l3qframe \\ @@ -5334,6 +5806,27 @@ weightname = Gewicht \end{columns} \end{frame} +\begin{frame}[t] + {Block material} + {Nothing special} + + \vfill + \begin{block}{This is a block} + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac + arcu est, vel posuere velit. In congue erat vel lorem ornare pretium. + \end{block} + \vfill + \begin{exampleblock}{This is an example block} + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac + arcu est, vel posuere velit. In congue erat vel lorem ornare pretium. + \end{exampleblock} + \vfill + \begin{alertblock}{This is an alert block} + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac + arcu est, vel posuere velit. In congue erat vel lorem ornare pretium. + \end{alertblock} + \vfill +\end{frame} \section{Advanced material} \begin{frame}[negative] @@ -5485,7 +5978,11 @@ weightname = Gewicht \setbeamercolor{inverse subheading}{fg=white!75!maincolor} \setbeamercolor{block body}{bg=black!4} -\setbeamercolor{block title}{bg=black!8} +\setbeamercolor{block title}{bg=black!8,fg=maincolor} +\setbeamercolor{block body example}{bg=black!4} +\setbeamercolor{block title example}{bg=black!8} +\setbeamercolor{block body alerted}{bg=black!4} +\setbeamercolor{block title alerted}{bg=black!8} \setbeamercolor{itemize item}{parent=normal text} \setbeamercolor{enumerate item}{parent=normal text} @@ -5631,7 +6128,7 @@ weightname = Gewicht \setbeamerfont{block body}{size=\scriptsize} \setbeamerfont{block body alerted}{parent={block body}} \setbeamerfont{block body example}{parent={block body}} -\setbeamerfont{block title}{size=\small,parent={structure,block body}} +\setbeamerfont{block title}{size=\small,series=\bfseries,parent={structure,block body}} \setbeamerfont{block title alerted}{parent={block title,alerted text}} \setbeamerfont{block title example}{parent={block title,example text}} diff --git a/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.ins b/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.ins index e21ec6b85c2..9994e85df2a 100644 --- a/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.ins +++ b/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.ins @@ -72,10 +72,14 @@ 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}}} +\generate{\file{uantwerpendocs-degree.data}{\from{uantwerpendocs.dtx}{degreedata}}} +\generate{\file{uantwerpendocs-doctype.data}{\from{uantwerpendocs.dtx}{doctypedata}}} \obeyspaces \Msg{****************************************************************} @@ -92,6 +96,7 @@ The Current Maintainer of this work is Walter Daems. \Msg{* uantwerpenexam.cls *} \Msg{* uantwerpendocs-nl.data *} \Msg{* uantwerpendocs-en.data *} +\Msg{* uantwerpendocs-edu.data *} \Msg{* uantwerpencommonoptions.clo *} \Msg{* uantwerpencolorlogoscheme.sty *} \Msg{* beamercolorthemeuantwerpen.sty *} diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/beamercolorthemeuantwerpen.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/beamercolorthemeuantwerpen.sty index 93068224efa..53b9c5dbd11 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/beamercolorthemeuantwerpen.sty +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/beamercolorthemeuantwerpen.sty @@ -24,9 +24,6 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{4.1} -\def\filedate{2021/08/03} - @@ -51,7 +48,11 @@ \setbeamercolor{inverse subheading}{fg=white!75!maincolor} \setbeamercolor{block body}{bg=black!4} -\setbeamercolor{block title}{bg=black!8} +\setbeamercolor{block title}{bg=black!8,fg=maincolor} +\setbeamercolor{block body example}{bg=black!4} +\setbeamercolor{block title example}{bg=black!8} +\setbeamercolor{block body alerted}{bg=black!4} +\setbeamercolor{block title alerted}{bg=black!8} \setbeamercolor{itemize item}{parent=normal text} \setbeamercolor{enumerate item}{parent=normal text} diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerfontthemeuantwerpen.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerfontthemeuantwerpen.sty index ad1d28033c0..06c12163d7d 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerfontthemeuantwerpen.sty +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerfontthemeuantwerpen.sty @@ -24,9 +24,6 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{4.1} -\def\filedate{2021/08/03} - @@ -118,7 +115,7 @@ \setbeamerfont{block body}{size=\scriptsize} \setbeamerfont{block body alerted}{parent={block body}} \setbeamerfont{block body example}{parent={block body}} -\setbeamerfont{block title}{size=\small,parent={structure,block body}} +\setbeamerfont{block title}{size=\small,series=\bfseries,parent={structure,block body}} \setbeamerfont{block title alerted}{parent={block title,alerted text}} \setbeamerfont{block title example}{parent={block title,example text}} diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerinnerthemeuantwerpen.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerinnerthemeuantwerpen.sty index 30bf56b957b..9841dee7f87 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerinnerthemeuantwerpen.sty +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerinnerthemeuantwerpen.sty @@ -24,9 +24,6 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{4.1} -\def\filedate{2021/08/03} - diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerouterthemeuantwerpen.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerouterthemeuantwerpen.sty index 8cd0bc7fdb7..d3a0ff39f85 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerouterthemeuantwerpen.sty +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerouterthemeuantwerpen.sty @@ -24,9 +24,6 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{4.1} -\def\filedate{2021/08/03} - diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty index 278a309b8f2..b7bad38cd0a 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty @@ -26,10 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{beamerthemeuantwerpen} - [2021/08/03 v4.1 .dtx skeleton file] -\def\fileversion{4.1} -\def\filedate{2021/08/03} - + [2021/10/04 v4.2 .dtx skeleton file] diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls index 4a7a5523694..841534140a8 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls @@ -26,20 +26,18 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenbamathesis} - [2021/08/03 v4.1 .dtx skeleton file] -\def\fileversion{4.1} -\def\filedate{2021/08/03} + [2021/10/04 v4.2 .dtx skeleton file] \newif\if@filled \DeclareOption{filled}{\@filledtrue} \input{uantwerpencommonoptions.clo} \ExecuteOptions{a4paper,11pt,final,oneside,openright} \ProcessOptions\relax -\LoadClassWithOptions{book} +\LoadClassWithOptions{scrbook} \setlength{\parindent}{0pt} \addtolength{\parskip}{0.75\baselineskip} \setcounter{secnumdepth}{3} -\RequirePackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry} -\RequirePackage{expl3} +\RequirePackage[top=2.6cm, bottom=2.5cm, left=3.5cm, right=1.6cm]{geometry} +\RequirePackage[check-declarations]{expl3} % I use this during debug phase \RequirePackage{xparse} \RequirePackage{iftex} \RequirePackage{xstring} @@ -48,23 +46,52 @@ \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{} \newcommand{\@emptymacro}{} \RequirePackage{graphicx} +\RequirePackage{soul} \RequirePackage[export]{adjustbox} \RequirePackage{color} \RequirePackage{tikz} -\usetikzlibrary{positioning} +\usetikzlibrary{positioning,calc} \RequirePackage{eso-pic} \RequirePackage{uantwerpencolorlogoscheme} \RequirePackage{fancyhdr} -\definecolor{uacorpbord}{cmyk} {0.00,1.00,0.60,0.37} -\definecolor{uacorpblue}{cmyk} {1.00,0.25,0.00,0.50} -\definecolor{uacorplightblue}{cmyk}{1.00,0.00,0.08,0.13} -\definecolor{uacorporange}{cmyk} {0.00,0.32,1.00,0.09} -\definecolor{uaftifresh}{cmyk} {0.34,1.00,0.00,0.00} -\definecolor{uaftisober}{cmyk} {0.10,1.00,0.00,0.49} \definecolor{lightgray}{cmyk} {0.00,0.00,0.00,0.05} \definecolor{darkgray}{cmyk} {0.00,0.00,0.00,0.80} \definecolor{watermark}{cmyk} {0.00,0.00,0.00,0.05} +\newcommand\@uantwerpendocshl[1]{\begin{lrbox}{\@tempboxa}#1\end{lrbox}\@uantwerpendocshlbox{\@tempboxa}} +\newcommand{\@uantwerpendocshlbox}[1]{% + \tikz{% + \pgfpathrectangle{\pgfpoint{1pt}{0pt}}{\pgfpoint{\wd #1}{\ht #1}}% + \pgfusepath{use as bounding box}% + \node[anchor=base + west,align=center,fill=maincolor,text=white,outer sep=0pt,inner + xsep=5pt, inner ysep=0pt,minimum height=\ht\strutbox+1pt]{\raisebox{1pt}{\strut}\strut\usebox{#1}}; + }% +} +\newcommand\insettext[1]{ + \textcolor{basecolor}{ + \begin{tabular}{@{\hskip3ex\textcolor{maincolor}{\vrule width 2.5pt}\hskip3ex\large\bfseries}p{0.88\textwidth}} + \strut #1 + \end{tabular} + } +} +\newcommand\insetquote[1]{ + \insettext{ + \begin{tikzpicture}[scale=0.65] + \fill[green!60!black] (0.4,0) -- (0.5,0) -- (0.75,-0.15) -- (0.75,0) -- + (0.9,0) arc(-90:0:0.1) -- (1,0.65) arc(0:90:0.1) -- (0.1,0.75) arc + (90:180:0.1) -- (0,0.1) arc(-180:-90:0.1) -- cycle; + \foreach \x in {0.35,0.7} { + \begin{scope}[shift={(\x,0.425)},scale=0.25] + \fill[white] (0,0) circle[radius=0.5]; + \fill[white] (0.5,0) arc(0:-90:1) -- + (-0.5,-0.725) arc(-90:0:0.725) -- cycle; + \end{scope} + } + \end{tikzpicture}\\ + #1 + } +} \ExplSyntaxOn \prop_new:N \g__uantwerpendocs_data_prop \NewDocumentCommand{\uantwerpendocsprop}{m}{ @@ -111,9 +138,68 @@ } } {} + \uantwerpendocspropread{degree} + \uantwerpendocspropread{doctype} \makeatletter } - +\ExplSyntaxOn +\cs_generate_variant:Nn \prop_item:Nn{ Nx } +\NewDocumentCommand{\uantwerpendocsdoctype}{m}{ + \prop_item:Nx \g__uantwerpendocs_data_prop { #1 } +} +\ExplSyntaxOff +\newcommand\disclaimer[1]{ + Disclaimer #1\newline\newline + This document is an examination document that has not been + corrected for any errors identified. Without prior written + permission of both the supervisor(s) and the author(s), any copying, + copying, using or realizing this publication or parts thereof + is prohibited. For requests for information regarding the copying + and/or use and/or realisation of parts of this publication, please + contact to the university at which the author is registered. + \newline\newline + Prior written permission from the supervisor(s) is also + required for the use for industrial or commercial utility of the + (original) methods, products, circuits and programs described in this + thesis, and for the submission of this publication for participation + in scientific prizes or competitions. + \newline\newline + This document is in accordance with the master thesis regulations and the + Code of Conduct. It has been reviewed by the supervisor and the attendant. +} +\AtBeginDocument{ + \makeatother + \@ifpackageloaded{babel}{ + \addto\captionsdutch{% + \renewcommand\disclaimer[1]{ + Disclaimer #1\newline\newline + Dit document is een examendocument dat niet werd gecorrigeerd voor + eventueel vastgestelde fouten. Zonder voorafgaande schriftelijke + toestemming van zowel de promotor(en) als de auteur(s) is overnemen, + kopiëren, gebruiken of realiseren van deze uitgave of gedeelten ervan + verboden. Voor aanvragen tot of informatie i.v.m. het overnemen en/of + gebruik en/of realisatie van gedeelten uit deze publicatie, wendt u + tot de universiteit waaraan de auteur is ingeschreven. + \newline\newline + Voorafgaande schriftelijke toestemming van de promotor(en) is eveneens + vereist voor het aanwenden van de in dit afstudeerwerk beschreven + (originele) methoden, producten, schakelingen en programma's voor + industrieel of commercieel nut en voor de inzending van deze + publicatie ter deelname aan wetenschappelijke prijzen of wedstrijden. + \newline\newline + Dit document is in overeenstemming met het masterproefreglement en de + gedragscode en nagekeken door promotor en begeleider. + } + } + }{} + \makeatletter +} +\ExplSyntaxOn +\NewDocumentCommand{\uantwerpendocsdegree}{m}{ + \typeout{#1} + \prop_item:Nx \g__uantwerpendocs_data_prop { #1 } +} +\ExplSyntaxOff \newcommand*{\facultyacronym}[1]{ \PackageError{uantwerpendocs} {The '\protect\facultyacronym{}' macro is no longer available. Use @@ -121,17 +207,9 @@ {The interface of uantwerpendocs 4.0 has been changed. See the uantwerpendocs manual under section '5.2 The class options explained'} } +\newcommand*{\@companylogo}{} +\newcommand*{\companylogo}[1]{\renewcommand*{\@companylogo}{#1}} \ExplSyntaxOn -\NewDocumentCommand{\@subtitle}{m}{ - \tl_new:N \l__uantwerpendocs_degree - \tl_set:Nx \l__uantwerpendocs_degree { \tl_head:N \@degree } - \tl_if_eq:NnTF \l__uantwerpendocs_degree { B } {\uantwerpendocsprop{bthesisname}} { - \tl_if_eq:NnTF \l__uantwerpendocs_degree { M } {\uantwerpendocsprop{mthesisname}} - {\uantwerpendocsprop{thesisname}}} -} -\ExplSyntaxOff -\ExplSyntaxOn - \seq_new:N \g__uantwerpendocs_supervisors \seq_new:N \g__uantwerpendocs_supervisorswithaffiliation \cs_new:Nn \__uantwerpendocs_addsupervisor:nn { @@ -141,25 +219,85 @@ \NewDocumentCommand{\supervisor}{mm}{ \__uantwerpendocs_addsupervisor:nn { #1 } { #2 } } -\NewDocumentCommand{\jointsupervisors}{m}{ - \seq_use:Nn \g__uantwerpendocs_supervisors { #1 } +\NewDocumentCommand{\jointsupervisors}{mm}{ + \seq_use:Nnnn \g__uantwerpendocs_supervisors { #2 } { #1 } { #2 } } -\NewDocumentCommand{\jointsupervisorswithaffiliation}{m}{ - \seq_use:Nn \g__uantwerpendocs_supervisorswithaffiliation { #1 } +\NewDocumentCommand{\jointsupervisorswithaffiliation}{mm}{ + \seq_use:Nnnn \g__uantwerpendocs_supervisorswithaffiliation { #2 } { #1 } { #2 } } -\NewDocumentCommand{\supervisorsname}{}{ - \if_int_compare:w \seq_count:N \g__uantwerpendocs_supervisors > 1 - \uantwerpendocsprop{supervisorsname} +\NewDocumentCommand{\supervisorsname}{m}{ + \if_int_compare:w \seq_count:N \g__uantwerpendocs_supervisors > 2 + \uantwerpendocsprop{supervisorsname} #1 \else: - \if_int_compare:w \seq_count:N \g__uantwerpendocs_supervisors = 1 - \uantwerpendocsprop{supervisorname} + \if_int_compare:w \seq_count:N \g__uantwerpendocs_supervisors = 2 + \uantwerpendocsprop{supervisorname} #1 + \else: + \fi: + \fi: +} +\seq_new:N \g__uantwerpendocs_cosupervisors +\seq_new:N \g__uantwerpendocs_cosupervisorswithaffiliation +\cs_new:Nn \__uantwerpendocs_addcosupervisor:nn { + \seq_gpush:Nn \g__uantwerpendocs_cosupervisors { #1 } + \seq_gpush:Nn \g__uantwerpendocs_cosupervisorswithaffiliation { #1,~#2 } +} +\NewDocumentCommand{\cosupervisor}{mm}{ + \__uantwerpendocs_addcosupervisor:nn { #1 } { #2 } +} +\NewDocumentCommand{\jointcosupervisors}{mm}{ + \seq_use:Nnnn \g__uantwerpendocs_cosupervisors { #2 } { #1 } { #2 } +} +\NewDocumentCommand{\jointcosupervisorswithaffiliation}{mm}{ + \seq_use:Nnnn \g__uantwerpendocs_cosupervisorswithaffiliation { #2 } { #1 } { #2 } +} +\NewDocumentCommand{\cosupervisorsname}{m}{ + \if_int_compare:w \seq_count:N \g__uantwerpendocs_cosupervisors > 2 + \uantwerpendocsprop{cosupervisorsname} #1 + \else: + \if_int_compare:w \seq_count:N \g__uantwerpendocs_cosupervisors = 2 + \uantwerpendocsprop{cosupervisorname} #1 + \else: + \fi: + \fi: +} +\seq_new:N \g__uantwerpendocs_extsupervisors +\seq_new:N \g__uantwerpendocs_extsupervisorswithaffiliation +\cs_new:Nn \__uantwerpendocs_addextsupervisor:nn { + \seq_gpush:Nn \g__uantwerpendocs_extsupervisors { #1 } + \seq_gpush:Nn \g__uantwerpendocs_extsupervisorswithaffiliation { #1,~#2 } +} +\NewDocumentCommand{\extsupervisor}{mm}{ + \__uantwerpendocs_addextsupervisor:nn { #1 } { #2 } +} +\NewDocumentCommand{\jointextsupervisors}{mm}{ + \seq_use:Nnnn \g__uantwerpendocs_extsupervisors { #2 } { #1 } { #2 } +} +\NewDocumentCommand{\jointextsupervisorswithaffiliation}{mm}{ + \seq_use:Nnnn \g__uantwerpendocs_extsupervisorswithaffiliation { #2 } { #1 } { #2 } +} +\NewDocumentCommand{\extsupervisorsname}{m}{ + \if_int_compare:w \seq_count:N \g__uantwerpendocs_extsupervisors > 2 + \uantwerpendocsprop{extsupervisorsname} #1 + \else: + \if_int_compare:w \seq_count:N \g__uantwerpendocs_extsupervisors = 2 + \uantwerpendocsprop{extsupervisorname} #1 \else: \fi: \fi: } \AtBeginDocument{ + \seq_gpush:Nn \g__uantwerpendocs_supervisors {} \seq_greverse:N \g__uantwerpendocs_supervisors + \seq_gpush:Nn \g__uantwerpendocs_supervisorswithaffiliation {} \seq_greverse:N \g__uantwerpendocs_supervisorswithaffiliation + \seq_gpush:Nn \g__uantwerpendocs_cosupervisors {} + \seq_greverse:N \g__uantwerpendocs_cosupervisors + \seq_gpush:Nn \g__uantwerpendocs_cosupervisorswithaffiliation {} + \seq_greverse:N \g__uantwerpendocs_cosupervisorswithaffiliation + \seq_gpush:Nn \g__uantwerpendocs_extsupervisors {} + \seq_greverse:N \g__uantwerpendocs_extsupervisors + \seq_gpush:Nn \g__uantwerpendocs_extsupervisorswithaffiliation {} + \seq_greverse:N \g__uantwerpendocs_extsupervisorswithaffiliation } \ExplSyntaxOff \newcommand*\@degree{ @@ -169,6 +307,27 @@ {See the uantwerpendocs manual} } \newcommand*\degree[1]{\renewcommand*\@degree{#1}} +\newcommand*\@bamadoctype{ + \PackageError{uantwerpendocs} + {Please, specify the offical document type, either using + the '\protect\bamadoctype{}' macro or the '\protect\bamadegree{}' + macro in the preamble of your document.} + {See the uantwerpendocs manual}} +\newcommand*\bamadoctype[1]{ + \renewcommand*\@bamadoctype{\uantwerpendocsdoctype{#1}} +} +\ExplSyntaxOn +\NewDocumentCommand{\bamadegree}{m}{ + \seq_new:N \l__uantwerpendocs_degreechunks + \regex_extract_all:nnN { [^-]+ } { #1 } \l__uantwerpendocs_degreechunks + \bamadoctype{\seq_item:Nn\l__uantwerpendocs_degreechunks {2} - \seq_item:Nn\l__uantwerpendocs_degreechunks {3}} + \degree{\uantwerpendocsdegree{ + \seq_item:Nn\l__uantwerpendocs_degreechunks {1} - + \seq_item:Nn\l__uantwerpendocs_degreechunks {2} - + \seq_item:Nn\l__uantwerpendocs_degreechunks {3} - + \seq_item:Nn\l__uantwerpendocs_degreechunks {4} }} +} +\ExplSyntaxOff \newcommand*{\diploma}[1]{ \PackageError{uantwerpendocs} {The '\protect\diploma{}' macro is no longer available. Use @@ -177,28 +336,52 @@ '\protect\degree' macro to specify your degree in full text (see the uantwerpendocs manual)'} } -\newcommand*\@defensedate{ERROR} -\newcommand*{\defensedate}[1]{\renewcommand*\@defensedate{#1}} -\newcommand*\@defenselocation{Antwerpen} -\newcommand*{\defenselocation}[1]{\renewcommand*\@defenselocation{#1}} \newcommand*{\@academicyear}{XXX-YYYY} \newcommand*{\academicyear}[1]{\renewcommand*{\@academicyear}{#1}} -\if@twoside - \lhead[\thepage]{\slshape\rightmark} +\newcommand{\@copyrightnotices}{\disclaimer{\@bamadoctype}} +\ExplSyntaxOn +\seq_new:N \l_title_seq +\cs_generate_variant:Nn \seq_set_split:Nnn { Nnf } +\cs_new_nopar:Npn \__uantwerpendocs_reversevideo:f #1 +{ + \seq_set_split:Nnf \l_title_seq {~} { #1 } + \seq_set_map:NNn \l_title_seq \l_title_seq {\@uantwerpendocshl{##1}} + \seq_use:Nnnn \l_title_seq { ~ } { ~ } { ~ } +} +\NewDocumentCommand{\reversevideo}{m}{ + \__uantwerpendocs_reversevideo:f { #1 } +} +\ExplSyntaxOff +\AtBeginDocument{ + \setlength{\headheight}{13.7pt} + \renewcommand*{\headrulewidth}{0pt} + \renewcommand*{\footrulewidth}{0pt} + \newsavebox\smallogo + \savebox\smallogo{\raisebox{-1ex}{\includegraphics[width=2.5cm]{\logopos}}} + \if@twoside + \lhead[]{\footnotesize\slshape\rightmark} \chead[]{} - \rhead[\slshape\leftmark]{\thepage} - \lfoot[]{} - \cfoot[]{} - \rfoot[]{} -\else - \lhead[]{\leftmark} + \rhead[\footnotesize\slshape\leftmark]{} + \lfoot[\footnotesize\thepage~\textcolor{maincolor}{\textbf{|}}]{\usebox\smallogo} + \cfoot[\footnotesize\@bamadoctype]{\footnotesize\@bamadoctype} + \rfoot[\usebox\smallogo]{\footnotesize\textcolor{maincolor}{\textbf{|}}~\thepage} + \else + \lhead[]{\footnotesize\slshape\leftmark} \chead[]{} - \rhead[]{\thepage} - \lfoot[]{} - \cfoot[]{} - \rfoot[]{} -\fi + \rhead[]{} + \lfoot[]{\usebox\smallogo} + \cfoot[]{\footnotesize\@bamadoctype} + \rfoot[]{\footnotesize\textcolor{maincolor}{\textbf{|}}~\thepage} + \fi + \fancypagestyle{plain}{\pagestyle{fancy}} + % \patchcmd{\chapter}{\thispagestyle{plain}}{\thispagestyle{fancy}}{}{} +} +\newcommand{\@crnotice}{ + \@copyrightnotices +} +\addtokomafont{section}{\color{basecolor}} +\addtokomafont{chapter}{\color{basecolor}} \renewcommand\maketitle{% \pagestyle{empty} \begin{titlepage} @@ -206,61 +389,65 @@ \put(0,0){% \begin{tikzpicture}[inner sep=0pt,outer sep=0pt] \clip (0,0) rectangle(\paperwidth,\paperheight); - \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}} + [anchor=north east,align=right] + at (\paperwidth-1.6cm,\paperheight-2.6cm) + {\bfseries\large + \uantwerpendocsprop{acyearname}\\[.75ex]\Large\@academicyear}; + \node (title) + [anchor=north west,align=left, + text width={\paperwidth-5.1cm},font=\Huge,text=white, + xshift=1pt] + at (3.5cm,\paperheight-6.4cm) + {\sethlcolor{maincolor}% + \textsf{\textbf{\reversevideo{\@title}}}\\ + \textsf{\reversevideo{\@subtitle}}}; + \node + [anchor=north west,font=\LARGE,yshift=-1cm,xshift=-1pt] + at (title.south west) + {% + \textsf{\textbf{\@author}} }; \node - [anchor=west,text width={\paperwidth-5cm},align=left,font=\Large,uauaside] - at (2.125,{\paperheight-5cm}) - { - \textsf{\textbf{\@subtitle}} + [anchor=west,align=left, + text width={\paperwidth-5.1cm},font=\normalsize] + at (3.5cm,12cm) + {\textsf{\@bamadoctype}\\% + \textsf{\textbf{\@degree}} }; \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} + [anchor=west,align=left, + text width={\paperwidth-5.1cm},font=\normalsize] + at (3.5cm,7.5cm) + {\supervisorsname{\\} + \textbf{\jointsupervisorswithaffiliation{\\}{~\\~\\}}% + \cosupervisorsname{\\} + \textbf{\jointcosupervisorswithaffiliation{\\}{~\\~\\}}% + \extsupervisorsname{\\} + \textbf{\jointextsupervisorswithaffiliation{\\}{}} }; - \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}}}; + \ifx\@companylogo\@empty + \else + \node[anchor=south east] at + (\pagewidth-1.6cm,1.5cm) + {\@companylogo}; + \fi - \node[anchor=west] at - (2.125,1.313) - {\includegraphics[width=4.75cm]{\logoposua}}; + \node[anchor=south west] at + (1.6cm,1.5cm) + {\includegraphics[width=6.2cm]{\logopos}}; \end{tikzpicture} } } \end{titlepage}% ~\par\relax \clearpage + \vspace*{\stretch{1}} + \@crnotice + \clearpage \setcounter{footnote}{0}% \global\let\thanks\relax \global\let\maketitle\relax @@ -273,19 +460,6 @@ \thispagestyle{empty} } \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[lightgray] (0,0) rectangle (2.125cm,2.625cm); - \end{tikzpicture} - }; - \end{tikzpicture} } \AtBeginDocument{ \@ifpackageloaded{hyperref}{ diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty index 9f651a774e5..27bfa0fae89 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty @@ -25,9 +25,7 @@ %% The Current Maintainer of this work is Walter Daems. %% \ProvidesPackage{uantwerpencolorlogoscheme} - [2021/08/03 v4.1 .dtx skeleton file] -\def\fileversion{4.1} -\def\filedate{2021/08/03} + [2021/10/04 v4.2 .dtx skeleton file] \if@cmyk %% UAntwerpen \definecolor{uauamain}{cmyk}{0.00,0.96,0.82,0.01} @@ -109,7 +107,6 @@ \fi - \endinput %% %% End of file `uantwerpencolorlogoscheme.sty'. diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencommonoptions.clo b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencommonoptions.clo index 0e61b9536df..facc845dc71 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencommonoptions.clo +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencommonoptions.clo @@ -25,8 +25,6 @@ %% The Current Maintainer of this work is Walter Daems. %% \ProvidesFile{uantwerpencommonoptions.clo} -\def\fileversion{4.1} -\def\filedate{2021/08/03} \newif\if@neutralcolors \@neutralcolorsfalse \DeclareOption{neutralcolors}{\@neutralcolorstrue} @@ -137,7 +135,6 @@ } - \endinput %% %% End of file `uantwerpencommonoptions.clo'. diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls index 15717027e3d..153d4f6ebfc 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls @@ -26,9 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpencoursetext} - [2021/08/03 v4.1 .dtx skeleton file] -\def\fileversion{4.1} -\def\filedate{2021/08/03} + [2021/10/04 v4.2 .dtx skeleton file] \newif\if@modern \@modernfalse \DeclareOption{modern}{\@moderntrue} @@ -46,7 +44,7 @@ \addtolength{\parskip}{0.75\baselineskip} \setcounter{secnumdepth}{3} \RequirePackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry} -\RequirePackage{expl3} +\RequirePackage[check-declarations]{expl3} % I use this during debug phase \RequirePackage{xparse} \RequirePackage{iftex} \RequirePackage{xstring} @@ -55,10 +53,11 @@ \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{} \newcommand{\@emptymacro}{} \RequirePackage{graphicx} +\RequirePackage{soul} \RequirePackage[export]{adjustbox} \RequirePackage{color} \RequirePackage{tikz} -\usetikzlibrary{positioning} +\usetikzlibrary{positioning,calc} \RequirePackage{eso-pic} \if@copyright \RequirePackage[contents={},color=lightgray,scale=3]{background} @@ -66,15 +65,33 @@ \RequirePackage{uantwerpencolorlogoscheme} \RequirePackage{fancyhdr} -\definecolor{uacorpbord}{cmyk} {0.00,1.00,0.60,0.37} -\definecolor{uacorpblue}{cmyk} {1.00,0.25,0.00,0.50} -\definecolor{uacorplightblue}{cmyk}{1.00,0.00,0.08,0.13} -\definecolor{uacorporange}{cmyk} {0.00,0.32,1.00,0.09} -\definecolor{uaftifresh}{cmyk} {0.34,1.00,0.00,0.00} -\definecolor{uaftisober}{cmyk} {0.10,1.00,0.00,0.49} \definecolor{lightgray}{cmyk} {0.00,0.00,0.00,0.05} \definecolor{darkgray}{cmyk} {0.00,0.00,0.00,0.80} \definecolor{watermark}{cmyk} {0.00,0.00,0.00,0.05} +\newcommand\insettext[1]{ + \textcolor{basecolor}{ + \begin{tabular}{@{\hskip3ex\textcolor{maincolor}{\vrule width 2.5pt}\hskip3ex\large\bfseries}p{0.88\textwidth}} + \strut #1 + \end{tabular} + } +} +\newcommand\insetquote[1]{ + \insettext{ + \begin{tikzpicture}[scale=0.65] + \fill[green!60!black] (0.4,0) -- (0.5,0) -- (0.75,-0.15) -- (0.75,0) -- + (0.9,0) arc(-90:0:0.1) -- (1,0.65) arc(0:90:0.1) -- (0.1,0.75) arc + (90:180:0.1) -- (0,0.1) arc(-180:-90:0.1) -- cycle; + \foreach \x in {0.35,0.7} { + \begin{scope}[shift={(\x,0.425)},scale=0.25] + \fill[white] (0,0) circle[radius=0.5]; + \fill[white] (0.5,0) arc(0:-90:1) -- + (-0.5,-0.725) arc(-90:0:0.725) -- cycle; + \end{scope} + } + \end{tikzpicture}\\ + #1 + } +} \ExplSyntaxOn \prop_new:N \g__uantwerpendocs_data_prop \NewDocumentCommand{\uantwerpendocsprop}{m}{ @@ -121,9 +138,10 @@ } } {} + \uantwerpendocspropread{degree} + \uantwerpendocspropread{doctype} \makeatletter } - \newcommand*{\facultyacronym}[1]{ \PackageError{uantwerpendocs} {The '\protect\facultyacronym{}' macro is no longer available. Use @@ -162,7 +180,9 @@ \if_int_compare:w \seq_count:N \g__uantwerpendocs_lecturers > 1 \uantwerpendocsprop{lecturersname} \else: + \if_int_compare:w \seq_count:N \g__uantwerpendocs_lecturers > 0 \uantwerpendocsprop{lecturername} + \fi \fi: } \AtBeginDocument{ @@ -177,6 +197,27 @@ {See the uantwerpendocs manual} } \newcommand*\degree[1]{\renewcommand*\@degree{#1}} +\newcommand*\@bamadoctype{ + \PackageError{uantwerpendocs} + {Please, specify the offical document type, either using + the '\protect\bamadoctype{}' macro or the '\protect\bamadegree{}' + macro in the preamble of your document.} + {See the uantwerpendocs manual}} +\newcommand*\bamadoctype[1]{ + \renewcommand*\@bamadoctype{\uantwerpendocsdoctype{#1}} +} +\ExplSyntaxOn +\NewDocumentCommand{\bamadegree}{m}{ + \seq_new:N \l__uantwerpendocs_degreechunks + \regex_extract_all:nnN { [^-]+ } { #1 } \l__uantwerpendocs_degreechunks + \bamadoctype{\seq_item:Nn\l__uantwerpendocs_degreechunks {2} - \seq_item:Nn\l__uantwerpendocs_degreechunks {3}} + \degree{\uantwerpendocsdegree{ + \seq_item:Nn\l__uantwerpendocs_degreechunks {1} - + \seq_item:Nn\l__uantwerpendocs_degreechunks {2} - + \seq_item:Nn\l__uantwerpendocs_degreechunks {3} - + \seq_item:Nn\l__uantwerpendocs_degreechunks {4} }} +} +\ExplSyntaxOff \newcommand*{\programme}[3]{ \PackageError{uantwerpendocs} {The '\protect\programme{}{}{}' macro is no longer available. Use diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-degree.data b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-degree.data new file mode 100644 index 00000000000..eed1ec09c90 --- /dev/null +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-degree.data @@ -0,0 +1,44 @@ + +ti-nl-ba-bk = Bachelor of Science in de industriële wetenschappen: bouwkunde +ti-nl-ba-ch = Bachelor of Science in de industriële wetenschappen: chemie +ti-nl-ba-em = Bachelor of Science in de industriële wetenschappen: elektromechanica +ti-nl-ba-ei = Bachelor of Science in de industriële wetenschappen: elektronica-ICT +ti-nl-ma-bk = Master of Science in de industriële wetenschappen: bouwkunde +ti-nl-ma-bch = Master of Science in de industriële wetenschappen: biochemie +ti-nl-ma-ch = Master of Science in de industriële wetenschappen: chemie +ti-nl-ma-em = Master of Science in de industriële wetenschappen: elektromechanica +ti-nl-ma-ei = Master of Science in de industriële wetenschappen: elektronica-ICT +ti-en-ma-ei = Master of Science in Electronics and ICT Engineering Technology +ti-nl-eduma-wtstem = Educatieve master of Science in de wetenschappen en technologie: STEM +we-nl-eduma-wtstem = Educatieve master of Science in de wetenschappen en technologie: STEM +we-nl-eduma-wtbchbt = Educatieve master of Science in de wetenschappen en technologie: biochemie en biotechnologie +we-nl-eduma-wtbio = Educatieve master of Science in de wetenschappen en technologie: biologie +we-nl-eduma-wtch = Educatieve master of Science in de wetenschappen en technologie: chemie +we-nl-eduma-wtfy = Educatieve master of Science in de wetenschappen en technologie: fysica +we-nl-eduma-wtinf = Educatieve master of Science in de wetenschappen en technologie: informatica +we-nl-eduma-wtwi = Educatieve master of Science in de wetenschappen en technologie: wiskunde +we-nl-ba-bircg = Bachelor of Science in de bio-ingenieurswetenschappen: cel- en genbiotechnologie +we-nl-ba-birvt = Bachelor of Science in de bio-ingenieurswetenschappen: chemie en voedingstechnologie +we-nl-ba-birlb = Bachelor of Science in de bio-ingenieurswetenschappen: land- en bosbeheer +we-nl-ba-birmt = Bachelor of Science in de bio-ingenieurswetenschappen: milieutechnologie +we-nl-ba-bio = Bachelor of Science in de biologie +we-nl-ma-bioeg = Master of Science in de biologie: evolutie en gedragsbiologie +we-en-ma-biocr = Master of Science in biology: biodiversity, conservation and restoration +we-en-ma-biogcb = Master of Science in biology: global change biology +we-en-ma-biomb = Master of Science in molecular biology +we-nl-ba-ch = Bachelor of Science in de chemie +we-en-ma-ch = Master of Science in chemistry +we-nl-ba-inf = Bachelor of Science in de informatica +we-en-ma-infcn = Master of Science in computer science: computer networks +we-en-ma-infdsai = Master of Science in computer science: data science and artificial intelligence +we-en-ma-infse = Master of Science in computer science: software engineering +we-nl-ma-infcn = Master of Science in de informatica: computernetwerken +we-nl-ma-infdsai = Master of Science in de informatica: data science en artificiële intelligentie +we-nl-ma-infse = Master of Science in de informatica: software engineering +we-nl-ba-fy = Bachelor of Science in de fysica +we-nl-ma-fy = Master of Science in de fysica +we-en-ma-fy = Master of Science in physics +we-nl-ba-wi = Master of Science in wiskunde +we-nl-ma-wifw = Master of Science in wiskunde: fundamentele wiskunde +we-nl-ma-wiftw = Master of Science in wiskunde: financiële en toegepaste wiskunde + diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-doctype.data b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-doctype.data new file mode 100644 index 00000000000..f92d2b6069a --- /dev/null +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-doctype.data @@ -0,0 +1,8 @@ + +nl-ba = Bachelorproef +nl-ma = Masterproef +nl-pr = Projectverslag +en-ba = Bachelor's thesis +en-ma = Master's thesis +en-pr = Project report + diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data index 777ddb2d6d8..024eb68df0f 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data @@ -1,51 +1,52 @@ -\def\fileversion{4.1} -\def\filedate{2021/08/03} - -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 +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 +cosupervisorname = Cosupervisor +cosupervisorsname = Cosupervisors +extsupervisorname = External supervisor +extsupervisorsname = External 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 diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-nl.data b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-nl.data index 2cf8e9e0a4d..58772d70900 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-nl.data +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-nl.data @@ -1,51 +1,52 @@ -\def\fileversion{4.1} -\def\filedate{2021/08/03} - -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 +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 +cosupervisorname = Copromotor +cosupervisorsname = Copromotoren +extsupervisorname = Externe Promotor +extsupervisorsname = Externe 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 diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls index 4172a414c01..827087e2a99 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls @@ -26,9 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenexam} - [2021/08/03 v4.1 .dtx skeleton file] -\def\fileversion{4.1} -\def\filedate{2021/08/03} + [2021/10/04 v4.2 .dtx skeleton file] \newif\if@examiner \DeclareOption{examiner}{\@examinertrue} \input{uantwerpencommonoptions.clo} @@ -39,7 +37,7 @@ \addtolength{\parskip}{0.75\baselineskip} \setcounter{secnumdepth}{3} \RequirePackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry} -\RequirePackage{expl3} +\RequirePackage[check-declarations]{expl3} % I use this during debug phase \RequirePackage{xparse} \RequirePackage{iftex} \RequirePackage{xstring} @@ -48,20 +46,15 @@ \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{} \newcommand{\@emptymacro}{} \RequirePackage{graphicx} +\RequirePackage{soul} \RequirePackage[export]{adjustbox} \RequirePackage{color} \RequirePackage{tikz} -\usetikzlibrary{positioning} +\usetikzlibrary{positioning,calc} \RequirePackage{eso-pic} \RequirePackage{uantwerpencolorlogoscheme} \RequirePackage{fancyhdr} -\definecolor{uacorpbord}{cmyk} {0.00,1.00,0.60,0.37} -\definecolor{uacorpblue}{cmyk} {1.00,0.25,0.00,0.50} -\definecolor{uacorplightblue}{cmyk}{1.00,0.00,0.08,0.13} -\definecolor{uacorporange}{cmyk} {0.00,0.32,1.00,0.09} -\definecolor{uaftifresh}{cmyk} {0.34,1.00,0.00,0.00} -\definecolor{uaftisober}{cmyk} {0.10,1.00,0.00,0.49} \definecolor{lightgray}{cmyk} {0.00,0.00,0.00,0.05} \definecolor{darkgray}{cmyk} {0.00,0.00,0.00,0.80} \definecolor{watermark}{cmyk} {0.00,0.00,0.00,0.05} @@ -111,9 +104,10 @@ } } {} + \uantwerpendocspropread{degree} + \uantwerpendocspropread{doctype} \makeatletter } - \newcommand*{\facultyacronym}[1]{ \PackageError{uantwerpendocs} {The '\protect\facultyacronym{}' macro is no longer available. Use @@ -140,7 +134,9 @@ \if_int_compare:w \seq_count:N \g__uantwerpendocs_lecturers > 1 \uantwerpendocsprop{lecturersname} \else: + \if_int_compare:w \seq_count:N \g__uantwerpendocs_lecturers > 0 \uantwerpendocsprop{lecturername} + \fi \fi: } \AtBeginDocument{ @@ -155,6 +151,27 @@ {See the uantwerpendocs manual} } \newcommand*\degree[1]{\renewcommand*\@degree{#1}} +\newcommand*\@bamadoctype{ + \PackageError{uantwerpendocs} + {Please, specify the offical document type, either using + the '\protect\bamadoctype{}' macro or the '\protect\bamadegree{}' + macro in the preamble of your document.} + {See the uantwerpendocs manual}} +\newcommand*\bamadoctype[1]{ + \renewcommand*\@bamadoctype{\uantwerpendocsdoctype{#1}} +} +\ExplSyntaxOn +\NewDocumentCommand{\bamadegree}{m}{ + \seq_new:N \l__uantwerpendocs_degreechunks + \regex_extract_all:nnN { [^-]+ } { #1 } \l__uantwerpendocs_degreechunks + \bamadoctype{\seq_item:Nn\l__uantwerpendocs_degreechunks {2} - \seq_item:Nn\l__uantwerpendocs_degreechunks {3}} + \degree{\uantwerpendocsdegree{ + \seq_item:Nn\l__uantwerpendocs_degreechunks {1} - + \seq_item:Nn\l__uantwerpendocs_degreechunks {2} - + \seq_item:Nn\l__uantwerpendocs_degreechunks {3} - + \seq_item:Nn\l__uantwerpendocs_degreechunks {4} }} +} +\ExplSyntaxOff \newcommand*{\programme}[3]{ \PackageError{uantwerpendocs} {The '\protect\programme{}{}{}' macro is no longer available. Use diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls index f4f748f37b1..7db3920346e 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls @@ -26,9 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenletter} - [2021/08/03 v4.1 .dtx skeleton file] -\def\fileversion{4.1} -\def\filedate{2021/08/03} + [2021/10/04 v4.2 .dtx skeleton file] \newif\if@filled \DeclareOption{filled}{\@filledtrue} \input{uantwerpencommonoptions.clo} @@ -41,7 +39,7 @@ \setcounter{secnumdepth}{3} \RequirePackage[top=1in, bottom=1in, left=1.34in, right=1in]{geometry} \RequirePackage[normalem]{ulem} -\RequirePackage{expl3} +\RequirePackage[check-declarations]{expl3} % I use this during debug phase \RequirePackage{xparse} \RequirePackage{iftex} \RequirePackage{xstring} @@ -50,20 +48,15 @@ \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{} \newcommand{\@emptymacro}{} \RequirePackage{graphicx} +\RequirePackage{soul} \RequirePackage[export]{adjustbox} \RequirePackage{color} \RequirePackage{tikz} -\usetikzlibrary{positioning} +\usetikzlibrary{positioning,calc} \RequirePackage{eso-pic} \RequirePackage{uantwerpencolorlogoscheme} \RequirePackage{fancyhdr} -\definecolor{uacorpbord}{cmyk} {0.00,1.00,0.60,0.37} -\definecolor{uacorpblue}{cmyk} {1.00,0.25,0.00,0.50} -\definecolor{uacorplightblue}{cmyk}{1.00,0.00,0.08,0.13} -\definecolor{uacorporange}{cmyk} {0.00,0.32,1.00,0.09} -\definecolor{uaftifresh}{cmyk} {0.34,1.00,0.00,0.00} -\definecolor{uaftisober}{cmyk} {0.10,1.00,0.00,0.49} \definecolor{lightgray}{cmyk} {0.00,0.00,0.00,0.05} \definecolor{darkgray}{cmyk} {0.00,0.00,0.00,0.80} \definecolor{watermark}{cmyk} {0.00,0.00,0.00,0.05} @@ -113,9 +106,10 @@ } } {} + \uantwerpendocspropread{degree} + \uantwerpendocspropread{doctype} \makeatletter } - \newcommand*{\facultyacronym}[1]{ \PackageError{uantwerpendocs} {The '\protect\facultyacronym{}' macro is no longer available. Use @@ -205,7 +199,7 @@ }; \end{tikzpicture} ~\\[3ex] - \textcolor{uacorpblue}{\bf \@sender} + \textcolor{uauaside}{\textbf{\@sender}} \ifx\@senderrole\@emptymacro\\[1.75ex]\else \\*\@senderrole\\[1.75ex]\fi \@faculty \ifx\@unit\@emptymacro\else\\* \@unit\fi~\\[1.75ex] diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls index b8571e27b00..3aa93735a2c 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls @@ -26,9 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenphdthesis} - [2021/08/03 v4.1 .dtx skeleton file] -\def\fileversion{4.1} -\def\filedate{2021/08/03} + [2021/10/04 v4.2 .dtx skeleton file] \newif\if@filled \DeclareOption{filled}{\@filledtrue} \newif\if@cameraready @@ -43,7 +41,7 @@ \RequirePackage[paperwidth=180mm,paperheight=260mm, top=2.5cm,bottom=2.5cm,left=2.6cm,right=1.8cm,twoside] {geometry} -\RequirePackage{expl3} +\RequirePackage[check-declarations]{expl3} % I use this during debug phase \RequirePackage{xparse} \RequirePackage{iftex} \RequirePackage{xstring} @@ -52,24 +50,43 @@ \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{} \newcommand{\@emptymacro}{} \RequirePackage{graphicx} +\RequirePackage{soul} \RequirePackage[export]{adjustbox} \RequirePackage{color} \RequirePackage{tikz} -\usetikzlibrary{positioning} +\usetikzlibrary{positioning,calc} \RequirePackage{eso-pic} \usepackage{ean13isbn} \RequirePackage{uantwerpencolorlogoscheme} \RequirePackage{fancyhdr} -\definecolor{uacorpbord}{cmyk} {0.00,1.00,0.60,0.37} -\definecolor{uacorpblue}{cmyk} {1.00,0.25,0.00,0.50} -\definecolor{uacorplightblue}{cmyk}{1.00,0.00,0.08,0.13} -\definecolor{uacorporange}{cmyk} {0.00,0.32,1.00,0.09} -\definecolor{uaftifresh}{cmyk} {0.34,1.00,0.00,0.00} -\definecolor{uaftisober}{cmyk} {0.10,1.00,0.00,0.49} \definecolor{lightgray}{cmyk} {0.00,0.00,0.00,0.05} \definecolor{darkgray}{cmyk} {0.00,0.00,0.00,0.80} \definecolor{watermark}{cmyk} {0.00,0.00,0.00,0.05} +\newcommand\insettext[1]{ + \textcolor{basecolor}{ + \begin{tabular}{@{\hskip3ex\textcolor{maincolor}{\vrule width 2.5pt}\hskip3ex\large\bfseries}p{0.88\textwidth}} + \strut #1 + \end{tabular} + } +} +\newcommand\insetquote[1]{ + \insettext{ + \begin{tikzpicture}[scale=0.65] + \fill[green!60!black] (0.4,0) -- (0.5,0) -- (0.75,-0.15) -- (0.75,0) -- + (0.9,0) arc(-90:0:0.1) -- (1,0.65) arc(0:90:0.1) -- (0.1,0.75) arc + (90:180:0.1) -- (0,0.1) arc(-180:-90:0.1) -- cycle; + \foreach \x in {0.35,0.7} { + \begin{scope}[shift={(\x,0.425)},scale=0.25] + \fill[white] (0,0) circle[radius=0.5]; + \fill[white] (0.5,0) arc(0:-90:1) -- + (-0.5,-0.725) arc(-90:0:0.725) -- cycle; + \end{scope} + } + \end{tikzpicture}\\ + #1 + } +} \if@cameraready \RequirePackage[cam,center,width=21truecm,height=29.7truecm]{crop} \fi @@ -119,9 +136,10 @@ } } {} + \uantwerpendocspropread{degree} + \uantwerpendocspropread{doctype} \makeatletter } - \newcommand*{\facultyacronym}[1]{ \PackageError{uantwerpendocs} {The '\protect\facultyacronym{}' macro is no longer available. Use @@ -142,7 +160,6 @@ } \newcommand\affiliation[1]{\renewcommand\@affiliation{#1}} \ExplSyntaxOn - \seq_new:N \g__uantwerpendocs_supervisors \seq_new:N \g__uantwerpendocs_supervisorswithaffiliation \cs_new:Nn \__uantwerpendocs_addsupervisor:nn { @@ -152,24 +169,26 @@ \NewDocumentCommand{\supervisor}{mm}{ \__uantwerpendocs_addsupervisor:nn { #1 } { #2 } } -\NewDocumentCommand{\jointsupervisors}{m}{ - \seq_use:Nn \g__uantwerpendocs_supervisors { #1 } +\NewDocumentCommand{\jointsupervisors}{mm}{ + \seq_use:Nnnn \g__uantwerpendocs_supervisors { #2 } { #1 } { #2 } } -\NewDocumentCommand{\jointsupervisorswithaffiliation}{m}{ - \seq_use:Nn \g__uantwerpendocs_supervisorswithaffiliation { #1 } +\NewDocumentCommand{\jointsupervisorswithaffiliation}{mm}{ + \seq_use:Nnnn \g__uantwerpendocs_supervisorswithaffiliation { #2 } { #1 } { #2 } } -\NewDocumentCommand{\supervisorsname}{}{ - \if_int_compare:w \seq_count:N \g__uantwerpendocs_supervisors > 1 - \uantwerpendocsprop{supervisorsname} +\NewDocumentCommand{\supervisorsname}{m}{ + \if_int_compare:w \seq_count:N \g__uantwerpendocs_supervisors > 2 + \uantwerpendocsprop{supervisorsname} #1 \else: - \if_int_compare:w \seq_count:N \g__uantwerpendocs_supervisors = 1 - \uantwerpendocsprop{supervisorname} + \if_int_compare:w \seq_count:N \g__uantwerpendocs_supervisors = 2 + \uantwerpendocsprop{supervisorname} #1 \else: \fi: \fi: } \AtBeginDocument{ + \seq_gpush:Nn \g__uantwerpendocs_supervisors {} \seq_greverse:N \g__uantwerpendocs_supervisors + \seq_gpush:Nn \g__uantwerpendocs_supervisorswithaffiliation {} \seq_greverse:N \g__uantwerpendocs_supervisorswithaffiliation } \ExplSyntaxOff @@ -213,6 +232,27 @@ {See the uantwerpendocs manual} } \newcommand*\degree[1]{\renewcommand*\@degree{#1}} +\newcommand*\@bamadoctype{ + \PackageError{uantwerpendocs} + {Please, specify the offical document type, either using + the '\protect\bamadoctype{}' macro or the '\protect\bamadegree{}' + macro in the preamble of your document.} + {See the uantwerpendocs manual}} +\newcommand*\bamadoctype[1]{ + \renewcommand*\@bamadoctype{\uantwerpendocsdoctype{#1}} +} +\ExplSyntaxOn +\NewDocumentCommand{\bamadegree}{m}{ + \seq_new:N \l__uantwerpendocs_degreechunks + \regex_extract_all:nnN { [^-]+ } { #1 } \l__uantwerpendocs_degreechunks + \bamadoctype{\seq_item:Nn\l__uantwerpendocs_degreechunks {2} - \seq_item:Nn\l__uantwerpendocs_degreechunks {3}} + \degree{\uantwerpendocsdegree{ + \seq_item:Nn\l__uantwerpendocs_degreechunks {1} - + \seq_item:Nn\l__uantwerpendocs_degreechunks {2} - + \seq_item:Nn\l__uantwerpendocs_degreechunks {3} - + \seq_item:Nn\l__uantwerpendocs_degreechunks {4} }} +} +\ExplSyntaxOff \newcommand*{\programme}[3]{ \PackageError{uantwerpendocs} {The '\protect\programme{}{}{}' macro is no longer available. Use @@ -274,20 +314,20 @@ \vspace*{1ex}% \begin{flushright} \makebox[0pt][l]{\rule[-0.4em]{10cm}{1.8em}}\textcolor{white} - {\bf\LARGE~\chaptername~} + {\LARGE\textbf{~\chaptername~}} \raisebox{-24pt}{ \begin{tikzpicture} \foreach \theta in {0,5,...,355} { \node[color=white] at (\theta:0.025) - {\bf\fontsize{72}{12}\selectfont\thechapter}; + {\fontsize{72}{12}\selectfont\textbf{\thechapter}}; } \node[color=gray] at (0,0) - {\bf\fontsize{72}{12}\selectfont\thechapter}; + {\fontsize{72}{12}\selectfont\textbf{\thechapter}}; \end{tikzpicture} }\hspace*{-8pt} \par\nobreak \interlinepenalty\@M - \bf\huge\textcolor{darkgray}{\rule[-0.5ex]{0em}{2.6ex}~#1} + \huge\textbf{\textcolor{darkgray}{\rule[-0.5ex]{0em}{2.6ex}~#1}} \par\nobreak \end{flushright} \rule{\textwidth}{1pt} @@ -300,7 +340,7 @@ \def\@makeschapterhead#1{% \vspace*{1ex}% \begin{flushright} - \bf\LARGE\textcolor{darkgray}{\rule[-0.5ex]{0em}{2.6ex}~#1} + \LARGE\textbf{\textcolor{darkgray}{\rule[-0.5ex]{0em}{2.6ex}~#1}} \end{flushright} \rule{\textwidth}{1pt} \vspace{5\p@}\par @@ -362,8 +402,8 @@ (SN) at (2.55,4.9) { \begin{tabular}{@{}l@{~\,}p{11.5cm}} - \textsf{\supervisorsname} - & \textsf{\textbf{\jointsupervisors{ | }}} + \textsf{\supervisorsname{}} + & \textsf{\textbf{\jointsupervisors{ | }{}}} \end{tabular} }; @@ -404,8 +444,8 @@ \hfill \begin{minipage}[b]{0.4\textwidth} \flushright - \supervisorsname\\ - \jointsupervisors{\\} + \supervisorsname{\\} + \jointsupervisors{\\}{} \end{minipage} \end{center} \clearpage @@ -413,8 +453,8 @@ \textbf{\uantwerpendocsprop{jurychairmanname}}\hfill\break \@jurychairman{}\ifdefvoid{\@jurychairmanaff}{}{, \@jurychairmanaff}\\ \hfill\break - \textbf{\supervisorsname}\hfill\break - \jointsupervisorswithaffiliation{\\}\\ + \textbf{\supervisorsname{}}\hfill\break + \jointsupervisorswithaffiliation{\\}{\\} \hfill\break \textbf{\uantwerpendocsprop{jurymembersname}}\hfill\break \jointjurymembers{\\} diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls index cf7882c2839..fe27942879a 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls @@ -26,9 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenreport} - [2021/08/03 v4.1 .dtx skeleton file] -\def\fileversion{4.1} -\def\filedate{2021/08/03} + [2021/10/04 v4.2 .dtx skeleton file] \newif\if@copyright \DeclareOption{copyright}{\@copyrighttrue} \newif\if@filled @@ -41,7 +39,7 @@ \addtolength{\parskip}{0.75\baselineskip} \setcounter{secnumdepth}{3} \RequirePackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry} -\RequirePackage{expl3} +\RequirePackage[check-declarations]{expl3} % I use this during debug phase \RequirePackage{xparse} \RequirePackage{iftex} \RequirePackage{xstring} @@ -50,10 +48,11 @@ \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{} \newcommand{\@emptymacro}{} \RequirePackage{graphicx} +\RequirePackage{soul} \RequirePackage[export]{adjustbox} \RequirePackage{color} \RequirePackage{tikz} -\usetikzlibrary{positioning} +\usetikzlibrary{positioning,calc} \RequirePackage{eso-pic} \if@copyright \RequirePackage[contents={},color=lightgray,scale=3]{background} @@ -61,15 +60,33 @@ \RequirePackage{uantwerpencolorlogoscheme} \RequirePackage{fancyhdr} -\definecolor{uacorpbord}{cmyk} {0.00,1.00,0.60,0.37} -\definecolor{uacorpblue}{cmyk} {1.00,0.25,0.00,0.50} -\definecolor{uacorplightblue}{cmyk}{1.00,0.00,0.08,0.13} -\definecolor{uacorporange}{cmyk} {0.00,0.32,1.00,0.09} -\definecolor{uaftifresh}{cmyk} {0.34,1.00,0.00,0.00} -\definecolor{uaftisober}{cmyk} {0.10,1.00,0.00,0.49} \definecolor{lightgray}{cmyk} {0.00,0.00,0.00,0.05} \definecolor{darkgray}{cmyk} {0.00,0.00,0.00,0.80} \definecolor{watermark}{cmyk} {0.00,0.00,0.00,0.05} +\newcommand\insettext[1]{ + \textcolor{basecolor}{ + \begin{tabular}{@{\hskip3ex\textcolor{maincolor}{\vrule width 2.5pt}\hskip3ex\large\bfseries}p{0.88\textwidth}} + \strut #1 + \end{tabular} + } +} +\newcommand\insetquote[1]{ + \insettext{ + \begin{tikzpicture}[scale=0.65] + \fill[green!60!black] (0.4,0) -- (0.5,0) -- (0.75,-0.15) -- (0.75,0) -- + (0.9,0) arc(-90:0:0.1) -- (1,0.65) arc(0:90:0.1) -- (0.1,0.75) arc + (90:180:0.1) -- (0,0.1) arc(-180:-90:0.1) -- cycle; + \foreach \x in {0.35,0.7} { + \begin{scope}[shift={(\x,0.425)},scale=0.25] + \fill[white] (0,0) circle[radius=0.5]; + \fill[white] (0.5,0) arc(0:-90:1) -- + (-0.5,-0.725) arc(-90:0:0.725) -- cycle; + \end{scope} + } + \end{tikzpicture}\\ + #1 + } +} \ExplSyntaxOn \prop_new:N \g__uantwerpendocs_data_prop \NewDocumentCommand{\uantwerpendocsprop}{m}{ @@ -116,9 +133,10 @@ } } {} + \uantwerpendocspropread{degree} + \uantwerpendocspropread{doctype} \makeatletter } - \newcommand*{\facultyacronym}[1]{ \PackageError{uantwerpendocs} {The '\protect\facultyacronym{}' macro is no longer available. Use @@ -191,20 +209,20 @@ \vspace*{1ex}% \begin{flushright} \makebox[0pt][l]{\rule[-0.4em]{10cm}{1.8em}}\textcolor{white} - {\bf\LARGE~\chaptername~} + {\LARGE\textbf{~\chaptername~}} \raisebox{-24pt}{ \begin{tikzpicture} \foreach \theta in {0,5,...,355} { \node[color=white] at (\theta:0.025) - {\bf\fontsize{72}{12}\selectfont\thechapter}; + {\fontsize{72}{12}\selectfont\textbf{\thechapter}}; } \node[color=gray] at (0,0) - {\bf\fontsize{72}{12}\selectfont\thechapter}; + {\fontsize{72}{12}\selectfont\textbf{\thechapter}}; \end{tikzpicture} }\hspace*{-8pt} \par\nobreak \interlinepenalty\@M - \bf\huge\textcolor{darkgray}{\rule[-0.5ex]{0em}{2.6ex}~#1} + \huge\textbf{\textcolor{darkgray}{\rule[-0.5ex]{0em}{2.6ex}~#1}} \par\nobreak \end{flushright} \rule{\textwidth}{1pt} @@ -217,7 +235,7 @@ \def\@makeschapterhead#1{% \vspace*{1ex}% \begin{flushright} - \bf\LARGE\textcolor{darkgray}{\rule[-0.5ex]{0em}{2.6ex}~#1} + \LARGE\textbf{\textcolor{darkgray}{\rule[-0.5ex]{0em}{2.6ex}~#1}} \end{flushright} \rule{\textwidth}{1pt} \vspace{5\p@}\par |