diff options
author | Karl Berry <karl@freefriends.org> | 2021-11-11 21:08:43 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-11-11 21:08:43 +0000 |
commit | 238bcabc1e50cbc742df6e0da0df9a363cc17541 (patch) | |
tree | c6e71bd10e045bf13c3f64b304227a3bf82a211c /Master/texmf-dist/tex | |
parent | 4c13b78957a91b800c9ed56fbc7fb3478424f08d (diff) |
uantwerpendocs (11nov21)
git-svn-id: svn://tug.org/texlive/trunk@61030 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
9 files changed, 158 insertions, 62 deletions
diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty index b7bad38cd0a..a4370a0a5b9 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{beamerthemeuantwerpen} - [2021/10/04 v4.2 .dtx skeleton file] + [2021/11/11 v4.3 .dtx skeleton file] diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls index 841534140a8..3e742b68d35 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenbamathesis} - [2021/10/04 v4.2 .dtx skeleton file] + [2021/11/11 v4.3 .dtx skeleton file] \newif\if@filled \DeclareOption{filled}{\@filledtrue} \input{uantwerpencommonoptions.clo} @@ -37,14 +37,13 @@ \addtolength{\parskip}{0.75\baselineskip} \setcounter{secnumdepth}{3} \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{expl3} \RequirePackage{xparse} \RequirePackage{iftex} \RequirePackage{xstring} \RequirePackage{etoolbox} \RequirePackage{ifthen} \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{} -\newcommand{\@emptymacro}{} \RequirePackage{graphicx} \RequirePackage{soul} \RequirePackage[export]{adjustbox} @@ -196,7 +195,6 @@ } \ExplSyntaxOn \NewDocumentCommand{\uantwerpendocsdegree}{m}{ - \typeout{#1} \prop_item:Nx \g__uantwerpendocs_data_prop { #1 } } \ExplSyntaxOff diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty index 27bfa0fae89..bee7f6d3bb3 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty @@ -25,7 +25,7 @@ %% The Current Maintainer of this work is Walter Daems. %% \ProvidesPackage{uantwerpencolorlogoscheme} - [2021/10/04 v4.2 .dtx skeleton file] + [2021/11/11 v4.3 .dtx skeleton file] \if@cmyk %% UAntwerpen \definecolor{uauamain}{cmyk}{0.00,0.96,0.82,0.01} diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls index 153d4f6ebfc..ea2a7557e3d 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpencoursetext} - [2021/10/04 v4.2 .dtx skeleton file] + [2021/11/11 v4.3 .dtx skeleton file] \newif\if@modern \@modernfalse \DeclareOption{modern}{\@moderntrue} @@ -44,14 +44,13 @@ \addtolength{\parskip}{0.75\baselineskip} \setcounter{secnumdepth}{3} \RequirePackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry} -\RequirePackage[check-declarations]{expl3} % I use this during debug phase +\RequirePackage{expl3} \RequirePackage{xparse} \RequirePackage{iftex} \RequirePackage{xstring} \RequirePackage{etoolbox} \RequirePackage{ifthen} \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{} -\newcommand{\@emptymacro}{} \RequirePackage{graphicx} \RequirePackage{soul} \RequirePackage[export]{adjustbox} @@ -142,6 +141,17 @@ \uantwerpendocspropread{doctype} \makeatletter } +\ExplSyntaxOn +\cs_generate_variant:Nn \prop_item:Nn{ Nx } +\NewDocumentCommand{\uantwerpendocsdoctype}{m}{ + \prop_item:Nx \g__uantwerpendocs_data_prop { #1 } +} +\ExplSyntaxOff +\ExplSyntaxOn +\NewDocumentCommand{\uantwerpendocsdegree}{m}{ + \prop_item:Nx \g__uantwerpendocs_data_prop { #1 } +} +\ExplSyntaxOff \newcommand*{\facultyacronym}[1]{ \PackageError{uantwerpendocs} {The '\protect\facultyacronym{}' macro is no longer available. Use diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-nl.data b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-nl.data index 58772d70900..f3ab840d823 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-nl.data +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-nl.data @@ -8,7 +8,7 @@ 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-iob = Instituut voor Ontwikkelingsbeleid- en beheer org-ua = Universiteit Antwerpen arr = Alle rechten voorbehouden of = van diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls index 827087e2a99..d6b0c01fae6 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenexam} - [2021/10/04 v4.2 .dtx skeleton file] + [2021/11/11 v4.3 .dtx skeleton file] \newif\if@examiner \DeclareOption{examiner}{\@examinertrue} \input{uantwerpencommonoptions.clo} @@ -37,14 +37,13 @@ \addtolength{\parskip}{0.75\baselineskip} \setcounter{secnumdepth}{3} \RequirePackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry} -\RequirePackage[check-declarations]{expl3} % I use this during debug phase +\RequirePackage{expl3} \RequirePackage{xparse} \RequirePackage{iftex} \RequirePackage{xstring} \RequirePackage{etoolbox} \RequirePackage{ifthen} \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{} -\newcommand{\@emptymacro}{} \RequirePackage{graphicx} \RequirePackage{soul} \RequirePackage[export]{adjustbox} @@ -108,6 +107,17 @@ \uantwerpendocspropread{doctype} \makeatletter } +\ExplSyntaxOn +\cs_generate_variant:Nn \prop_item:Nn{ Nx } +\NewDocumentCommand{\uantwerpendocsdoctype}{m}{ + \prop_item:Nx \g__uantwerpendocs_data_prop { #1 } +} +\ExplSyntaxOff +\ExplSyntaxOn +\NewDocumentCommand{\uantwerpendocsdegree}{m}{ + \prop_item:Nx \g__uantwerpendocs_data_prop { #1 } +} +\ExplSyntaxOff \newcommand*{\facultyacronym}[1]{ \PackageError{uantwerpendocs} {The '\protect\facultyacronym{}' macro is no longer available. Use @@ -277,7 +287,7 @@ \fontfamily{phv}\fontsize{18}{22}\fontseries{b}% \fontshape{n}\selectfont% \@course{} - \ifx\@exampart\@emptymacro + \ifx\@exampart\@empty \else --- \@exampart\fi }; \node diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls index 7db3920346e..39aca508f9b 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls @@ -26,9 +26,11 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenletter} - [2021/10/04 v4.2 .dtx skeleton file] + [2021/11/11 v4.3 .dtx skeleton file] \newif\if@filled \DeclareOption{filled}{\@filledtrue} +\newif\if@nofoldline +\DeclareOption{nofoldline}{\@nofoldlinetrue} \input{uantwerpencommonoptions.clo} \ExecuteOptions{a4paper,10pt,final,oneside,openright} \ProcessOptions @@ -39,14 +41,13 @@ \setcounter{secnumdepth}{3} \RequirePackage[top=1in, bottom=1in, left=1.34in, right=1in]{geometry} \RequirePackage[normalem]{ulem} -\RequirePackage[check-declarations]{expl3} % I use this during debug phase +\RequirePackage{expl3} \RequirePackage{xparse} \RequirePackage{iftex} \RequirePackage{xstring} \RequirePackage{etoolbox} \RequirePackage{ifthen} \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{} -\newcommand{\@emptymacro}{} \RequirePackage{graphicx} \RequirePackage{soul} \RequirePackage[export]{adjustbox} @@ -124,24 +125,85 @@ \newcommand*{\logo}[1]{\renewcommand*{\@logo}{#1}} \newcommand*{\@unit}{} \newcommand*{\unit}[1]{\renewcommand*{\@unit}{#1}} -\newcommand*{\@emailuser}{} -\newcommand*{\@emaildomain}{} -\newcommand*{\email}[2]{\renewcommand*{\@emailuser}{#1}\renewcommand*{\@emaildomain}{#2}} -\newcommand*{\@phone}{} -\newcommand*{\phone}[1]{\renewcommand*{\@phone}{#1}} -\newcommand*{\@fax}{} -\newcommand*{\fax}[1]{\renewcommand*{\@fax}{#1}} -\newcommand*{\@mobile}{} -\newcommand*{\mobile}[1]{\renewcommand*{\@mobile}{#1}} +\ExplSyntaxOn +\seq_new:N \g__uantwerpendocs_emailaddresses +\cs_new:Nn \__uantwerpendocs_addemailaddress:nn { + \seq_gpush:Nn \g__uantwerpendocs_emailaddresses {#1\tat{}#2} +} +\NewDocumentCommand{\email}{mm}{ + \__uantwerpendocs_addemailaddress:nn { #1 } { #2 } +} +\NewDocumentCommand{\jointemails}{m}{ + \seq_use:Nn \g__uantwerpendocs_emailaddresses { #1 } +} +\NewDocumentCommand{\ifemails}{m}{ + \seq_if_empty:NTF \g__uantwerpendocs_emailaddresses {} {#1} +} +\AtBeginDocument{ + \seq_greverse:N \g__uantwerpendocs_emailaddresses +} +\ExplSyntaxOff +\ExplSyntaxOn +\seq_new:N \g__uantwerpendocs_phonenumbers +\cs_new:Nn \__uantwerpendocs_addphonenumber:n { + \seq_gpush:Nn \g__uantwerpendocs_phonenumbers {#1} +} +\NewDocumentCommand{\phone}{m}{ + \__uantwerpendocs_addphonenumber:n { #1 } +} +\NewDocumentCommand{\jointphones}{m}{ + \seq_use:Nn \g__uantwerpendocs_phonenumbers { #1 } +} +\NewDocumentCommand{\ifphones}{m}{ + \seq_if_empty:NTF \g__uantwerpendocs_phonenumbers {} {#1} +} +\AtBeginDocument{ + \seq_greverse:N \g__uantwerpendocs_phonenumbers +} +\ExplSyntaxOff +\ExplSyntaxOn +\seq_new:N \g__uantwerpendocs_faxnumbers +\cs_new:Nn \__uantwerpendocs_addfaxnumber:n { + \seq_gpush:Nn \g__uantwerpendocs_faxnumbers {#1} +} +\NewDocumentCommand{\fax}{m}{ + \__uantwerpendocs_addfaxnumber:n { #1 } +} +\NewDocumentCommand{\jointfaxes}{m}{ + \seq_use:Nn \g__uantwerpendocs_faxnumbers { #1 } +} +\NewDocumentCommand{\iffaxes}{m}{ + \seq_if_empty:NTF \g__uantwerpendocs_faxnumbers {} {#1} +} +\AtBeginDocument{ + \seq_greverse:N \g__uantwerpendocs_faxnumbers +} +\ExplSyntaxOff +\ExplSyntaxOn +\seq_new:N \g__uantwerpendocs_mobilenumbers +\cs_new:Nn \__uantwerpendocs_addmobilenumber:n { + \seq_gpush:Nn \g__uantwerpendocs_mobilenumbers {#1} +} +\NewDocumentCommand{\mobile}{m}{ + \__uantwerpendocs_addmobilenumber:n { #1 } +} +\NewDocumentCommand{\jointmobiles}{m}{ + \seq_use:Nn \g__uantwerpendocs_mobilenumbers { #1 } +} +\NewDocumentCommand{\ifmobiles}{m}{ + \seq_if_empty:NTF \g__uantwerpendocs_mobilenumbers {} {#1} +} +\AtBeginDocument{ + \seq_greverse:N \g__uantwerpendocs_mobilenumbers +} +\ExplSyntaxOff \newcommand*{\@returnaddress}{<specify return-address using \textbackslash\{single-line-return-address\}>} \renewcommand*{\returnaddress}[1]{\renewcommand*{\@returnaddress}{#1}} \newcommand*{\@to}{<Specify addressee using \textbackslash{}to\{name\}>} \renewcommand*{\to}[1]{\renewcommand*{\@to}{#1}} -\newcommand*{\@toorganization}{<Specify organization using - \textbackslash{}toorganization\{\}>} +\newcommand*{\@toorganization}{} \newcommand*{\toorganization}[1]{\renewcommand*{\@toorganization}{#1}} -\newcommand*{\@toaddress}{<Specify (multiline) destination - address\\using \textbackslash{}toaddress\{\}>} +\newcommand*{\@toaddress}{} \newcommand*{\toaddress}[1]{\renewcommand*{\@toaddress}{#1}} \newcommand*{\@subject}{-} \newcommand*{\subject}[1]{\renewcommand*{\@subject}{#1}} @@ -181,33 +243,40 @@ \newcommand\maketitle{% \pagestyle{fancy} \thispagestyle{empty} - \begin{tikzpicture}[overlay,remember picture] - \path (current page.north west) +(1.8cm,-1.2cm) - node[anchor=north west] { - \includegraphics[height=1.1cm]{\@logo} - }; - \draw (current page.north west) - +(1cm,-98mm) -- +(1.5cm,-98mm); - % 90 x 45 - % pos: 20mm van kant, 15mm van onderkant - \path (current page.north east) +(-100mm,-65mm) - node[anchor=west,text width=80mm,align=left] { - \scriptsize\textcolor{gray}{\uline{\@returnaddress}}\\* - \normalsize\@to\\* - \@toorganization\\* - \@toaddress - }; - \end{tikzpicture} + \AddToShipoutPicture*{% + \put(0,0){% + \begin{tikzpicture}[inner sep=0pt,outer sep=0pt] + \clip (0,0) rectangle(\paperwidth,\paperheight); + \path (current page.north west) +(1.8cm,-1.2cm) + node[anchor=north west] { + \includegraphics[height=1.1cm]{\@logo} + }; + \if@nofoldline\else + \draw (current page.north west) + +(1cm,-98mm) -- +(1.5cm,-98mm); + \fi + % 90 x 45 + % pos: 20mm van kant, 15mm van onderkant + \path (current page.north east) +(-100mm,-65mm) + node[anchor=west,text width=80mm,align=left] { + \scriptsize\textcolor{gray}{\uline{\@returnaddress}}\\* + \normalsize\@to\\* + \ifx\@toorganization\@empty\else\@toorganization\\*\fi% + \@toaddress + }; + \end{tikzpicture} + } + } ~\\[3ex] \textcolor{uauaside}{\textbf{\@sender}} - \ifx\@senderrole\@emptymacro\\[1.75ex]\else \\*\@senderrole\\[1.75ex]\fi + \ifx\@senderrole\@empty\\[1.75ex]\else \\*\@senderrole\\[1.75ex]\fi \@faculty - \ifx\@unit\@emptymacro\else\\* \@unit\fi~\\[1.75ex] + \ifx\@unit\@empty\else\\* \@unit\fi~\\[1.75ex] \@address\\[1.75ex] - \ifx\@email\@emptymacro\else E \@emailuser\tat{}\@emaildomain\\\fi - \ifx\@phone\@emptymacro\else T \@phone\\\fi - \ifx\@fax\@emptymacro\else F \@fax\\\fi - \ifx\@mobile\@emptymacro\else M \@mobile\\\fi + \ifemails{E~\jointemails{\\\phantom{E~}}\\} + \ifphones{T~\jointphones{\\\phantom{T~}}\\} + \iffaxes{F~\jointfaxes{\\\phantom{F~}}\\} + \ifmobiles{M~\jointmobiles{\\\phantom{M~}}\\} ~\\[4ex] \begin{tikzpicture}[anchor=north west,align=left,outer sep=0,inner sep=0] \path @@ -222,10 +291,10 @@ \AtEndDocument{ \@closing\\*[3ex]\@signature~\\[3ex] \@sender - \ifx\@senderrole\@emptymacro\\[8ex]\else\\*\@senderrole\\[8ex]\fi + \ifx\@senderrole\@empty\\[8ex]\else\\*\@senderrole\\[8ex]\fi \setlength{\parskip}{0em} - \ifx\@carboncopy\@emptymacro\else CC: \@carboncopy\\[4ex]\fi - \ifx\@enclosed\@emptymacro\else ENCL: \@enclosed\fi + \ifx\@carboncopy\@empty\else CC: \@carboncopy\\[4ex]\fi + \ifx\@enclosed\@empty\else ENCL: \@enclosed\fi \label{lastpage} } \endinput diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls index 3aa93735a2c..12222ea184b 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenphdthesis} - [2021/10/04 v4.2 .dtx skeleton file] + [2021/11/11 v4.3 .dtx skeleton file] \newif\if@filled \DeclareOption{filled}{\@filledtrue} \newif\if@cameraready @@ -41,14 +41,13 @@ \RequirePackage[paperwidth=180mm,paperheight=260mm, top=2.5cm,bottom=2.5cm,left=2.6cm,right=1.8cm,twoside] {geometry} -\RequirePackage[check-declarations]{expl3} % I use this during debug phase +\RequirePackage{expl3} \RequirePackage{xparse} \RequirePackage{iftex} \RequirePackage{xstring} \RequirePackage{etoolbox} \RequirePackage{ifthen} \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{} -\newcommand{\@emptymacro}{} \RequirePackage{graphicx} \RequirePackage{soul} \RequirePackage[export]{adjustbox} @@ -140,6 +139,17 @@ \uantwerpendocspropread{doctype} \makeatletter } +\ExplSyntaxOn +\cs_generate_variant:Nn \prop_item:Nn{ Nx } +\NewDocumentCommand{\uantwerpendocsdoctype}{m}{ + \prop_item:Nx \g__uantwerpendocs_data_prop { #1 } +} +\ExplSyntaxOff +\ExplSyntaxOn +\NewDocumentCommand{\uantwerpendocsdegree}{m}{ + \prop_item:Nx \g__uantwerpendocs_data_prop { #1 } +} +\ExplSyntaxOff \newcommand*{\facultyacronym}[1]{ \PackageError{uantwerpendocs} {The '\protect\facultyacronym{}' macro is no longer available. Use diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls index fe27942879a..ca5a01dbeac 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenreport} - [2021/10/04 v4.2 .dtx skeleton file] + [2021/11/11 v4.3 .dtx skeleton file] \newif\if@copyright \DeclareOption{copyright}{\@copyrighttrue} \newif\if@filled @@ -39,14 +39,13 @@ \addtolength{\parskip}{0.75\baselineskip} \setcounter{secnumdepth}{3} \RequirePackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry} -\RequirePackage[check-declarations]{expl3} % I use this during debug phase +\RequirePackage{expl3} \RequirePackage{xparse} \RequirePackage{iftex} \RequirePackage{xstring} \RequirePackage{etoolbox} \RequirePackage{ifthen} \IfFileExists{shellesc.sty}{\RequirePackage{shellesc}}{} -\newcommand{\@emptymacro}{} \RequirePackage{graphicx} \RequirePackage{soul} \RequirePackage[export]{adjustbox} |