uantwerpendocs (3aug21)

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

1 files changed, 171 insertions, 46 deletions

diff --git a/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx b/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx
index 6b6be0147ac..0301cb5e362 100644
--- a/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx
+++ b/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx
@@ -36,11 +36,10 @@
 %<le>\ProvidesClass{uantwerpenletter}
 %<ex>\ProvidesClass{uantwerpenexam}
 %<bmr>\ProvidesPackage{beamerthemeuantwerpen}
-%<cls|ct|bmt|mt|pt|rp|le|ex|bmr>    [2021/07/11 v4.0 .dtx skeleton file]
-%
+%<cls|ct|bmt|mt|pt|rp|le|ex|bmr>    [2021/08/03 v4.1 .dtx skeleton file]
 %<mt>\errmessage{This class is obsolete, use the uantwerpenbamathesis class instead !}
-\def\fileversion{4.0}
-\def\filedate{2021/07/11}
+\def\fileversion{4.1}
+\def\filedate{2021/08/03}
 %<*driver>
 \documentclass[a4paper]{ltxdoc}
 \usepackage{makeidx}
@@ -115,6 +114,8 @@
 % improvements based on use feedback
 % and major rework to benefit from expl3, removed all diploma codes
 % to ease maintainability}
+% \changes{v4.1}{2021/08/03}{\@ Adapted coursetext again to
+% universitas agreement + added bleed version for phd texts + small bugfixes}
 %
 % \DoNotIndex{\newcommand,\newenvironment,\begin,\bfseries,\draw,\clip,\else,\fi,\if,\fill,\filldraw,\ifthenelse,\ifx,\textwidth,\node,\\,\@empty,\@emptymacro,\@tempdima,\@tempdimb,\@tempswatrue,\{,\},\ ,\bf,\BODY,\break,\Alph,\and,\define@key,\color,\dx,\dy,\g,\gdef,\hbox,\tiny,\scriptsize,\footnotesize,\small,\normalsize,\large,\Large,\LARGE,\huge,\Huge,\l,\LaTeX,\let,\p@,\relax,\renewcommand,\Requirepackage,\textbf,\textsf,\texttt,\textbackslash,}
 % \setlength{\parindent}{0em}
@@ -222,8 +223,10 @@
 % \item Prenton RP Pro for the logos and sublogos; all the logoware is
 %   included in this package, so nothing to worry about.
 % \item ITC Officina Sans for posters, titlepages, cards a.s.o.\\
-%   This font is not included in this package and is not a part of the
-%   \LaTeX{} standard fonts. However, if you have a valid license, for
+%   This font is not a part of the \LaTeX{} standard fonts.
+%   It is also not provided with this package. I cannot do
+%   this without incurring legal problems (the font is not free).
+%   However, if you have a valid license, for
 %   this font, I can help you to set it up, such that you can typeset
 %   proper title pages for course texts, PhD theses and the like. Just
 %   send me an e-mail.
@@ -534,8 +537,17 @@
 %       \bottomrule
 %   \end{tabular}
 % \end{center}
-% You can specify the correct faculty using the following options:
-% This will activate the correct color scheme and logoset.
+%
+% \DescribeMacro{cameraready} [phdthesis/coursetext]\\
+% For the |phdthesis| class, this option forces the book format to be
+% printed on A4 with bleed space. This accomodates what your printshop
+% requires you to provide as a camera-ready copy.
+%
+% For the |coursetext| class, this options removes the colored areas
+% and the logo from the titlepage (and removes the finalpage
+% altogether) to allow for universitas to print the text of your
+% titlepage on a standard sheet that contains these colored areas and
+% the logo (pre-printed).
 %
 % \DescribeMacro{copyright} [coursetext]\\
 %   This option forces printing a watermark on every page. For the
@@ -562,13 +574,18 @@
 % \item to make a text ready for electronic distribution:
 % |a4paper|, |copyright|.
 % \item to make a camera-ready text (for printing):
-% |a4paper|
+%   |a4paper|
+% \item to make a camera-ready coursetext (for printing at
+%   universitas):
+%   |a4paper|,|cameraready|
 % \item to make a letter:
 %   no options (filling a letter is discouraged)
 % \item to make an exam:
 %   no options (filling an exam is discouraged)
 % \item to make a PhD text:
 %   |twoside|, |openright| and (optionally) |filled|
+% \item to make a camera-ready PhD text:
+%   |twoside|, |openright|, |cameraready| and (optionally) |filled|
 % \item to make a report:
 %   |twoside|, |openright| and (optionally) |filled|
 % \end{itemize}
@@ -705,7 +722,7 @@
 % loaded), so that 
 % the PDF-document meta-information is correct.
 %
-% \DescribeMacro{\titlepageimage} [coursetext / phdthesis / report]
+% \DescribeMacro{\titlepageimage} [phdthesis / report]
 % (optional)\\
 % This sets the filename of the central image on the title page to
 % appear clipped % within the curves. For PhD theses this is highly
@@ -899,7 +916,7 @@
 %
 % \begin{verbatim}
 %<*ct-example> 
-\documentclass[ti,a4paper,11pt,oneside,openright,copyright]{uantwerpencoursetext}
+\documentclass[ti,a4paper,11pt,oneside,openright,cameraready]{uantwerpencoursetext}
 
 \usepackage[english,dutch]{babel}
 \usepackage{kantlipsum}  % this is just for some dummy text, please remove
@@ -921,8 +938,6 @@
 
 \academicyear{2021-2022}
 
-% \titlepageimage{Images/uantwerpen-keyboard.jpg} % this is optional
-
 \publisher{Universitas Cursusdienst |
   Prinsesstraat 16 |
   2000 Antwerpen |
@@ -997,7 +1012,8 @@
 \usepackage[dutch]{babel} % or english if your text is in English
 \usepackage{kantlipsum}   % this is just for some dummy text, please remove
 
-\usepackage{hyperref}     % New: you must load the hyperref package
+\usepackage[backref,hyperindex=true,pagebackref=true]{hyperref}
+                          % New: you must load the hyperref package
                           % yourself! This allows you to put it in the
                           % correct order with the other packages you load!
 
@@ -1071,7 +1087,6 @@
 \usepackage{fontspec}
 \setmainfont{Calibri}
 \setsansfont{Calibri}
-\usepackage{sansmathaccent}
 \else
 \usepackage{cmbright}
 \fi
@@ -1079,7 +1094,8 @@
 \usepackage[dutch]{babel} % or dutch if your text is in Dutch
 \usepackage{kantlipsum}   % this is just for some dummy text, please remove
 
-\usepackage{hyperref}     % New: you must load the hyperref package
+\usepackage[backref,hyperindex=true,pagebackref=true]{hyperref}
+                          % New: you must load the hyperref package
                           % yourself! This allows you to put it in the
                           % correct order with the other packages you load!
 
@@ -1169,7 +1185,7 @@
 % \paragraph{English}
 % \begin{verbatim}
 %<*pt-example2> 
-\documentclass[ti,10pt,twoside,openright,filled]{uantwerpenphdthesis}
+\documentclass[ti,10pt,twoside,openright,filled,cameraready]{uantwerpenphdthesis}
 
 % use some fancy font
 \usepackage{newpxtext}
@@ -1178,11 +1194,12 @@
 \usepackage[english]{babel} % or dutch if your text is in Dutch
 \usepackage{kantlipsum}  % this is just for some dummy text, please remove
 
-\usepackage{hyperref}     % New: you must load the hyperref package
-                          % yourself! This allows you to put it in the
-                          % correct order with the other packages you load!
+\usepackage[backref,hyperindex=true,pagebackref=true]{hyperref}
+                         % New: you must load the hyperref package
+                         % yourself! This allows you to put it in the
+                         % correct order with the other packages you load!
 
-\title{Harmonic Signal analysis\\based on Linear Operators}
+\title{Harmonic Signal analysis \\based on Linear Operators}
 \subtitle{How did Mindy linearly kill Mork's IC signal analyzer?}
 \author{Ing. Theodore Edgeoff}
 \affiliation{University of Antwerp\\
@@ -1283,7 +1300,8 @@
 \usepackage[dutch]{babel} % or dutch if your text is in Dutch
 \usepackage{kantlipsum}   % this is just for some dummy text, please remove
 
-\usepackage{hyperref}     % New: you must load the hyperref package
+\usepackage[backref,hyperindex=true,pagebackref=true]{hyperref}
+                          % New: you must load the hyperref package
                           % yourself! This allows you to put it in the
                           % correct order with the other packages you load!
 
@@ -1499,6 +1517,7 @@
                           % [dutch] for a monolingual version)
 
 \course{1876FTIDUM}{5-Bistrologie}
+\author{Walter Daems}     % can be omitted if 'lecturers' are sufficient
 \lecturer{Walter Daems}
 \degree{Bachelor of Science in de industri\"ele wetenschappen - elektronica-ICT}
 \academicyear{2017-2018}
@@ -1993,11 +2012,18 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
 % \changes{v1.9}{2018/03/02}{Implemented uantwerpenexam class}
 % \changes{v2.0}{2018/03/02}{Implemented uantwerpenphdthesis class}
 % \changes{v4.0}{2021/05/01}{Removed option qr again}
-% \changes{v4.0}{2021/07/11}{Removed options titlepagetableonly and titlepagenoartwork}
+% \changes{v4.0}{2021/07/11}{Removed options titlepagetableonly and
+% titlepagenoartwork}
+% \changes{v4.1}{2021/08/03}{Added option cameraready}
 %
 % Before loading the class, we provide the extra options.
 % 
 %    \begin{macrocode}
+%<*ct>
+\newif\if@modern
+\@modernfalse
+\DeclareOption{modern}{\@moderntrue}
+%</ct>
 %<*ct|rp>      
 \newif\if@copyright
 \DeclareOption{copyright}{\@copyrighttrue}
@@ -2012,6 +2038,10 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
 \newif\if@examiner
 \DeclareOption{examiner}{\@examinertrue}
 %</ex>
+%<*ct|pt>
+\newif\if@cameraready
+\DeclareOption{cameraready}{\@camerareadytrue}
+%</ct|pt>
 %    \end{macrocode}
 %
 %
@@ -2183,6 +2213,23 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
 %</ct|bmt|pt|rp|le|ex>
 %    \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
+% prints your front page on a pre-printed color page)
+% This is taken care of by the titlepage and finalpage environments,
+% so no extra code is needed here.
+%
+% For PhD texts, this means providing bleed space. We implemented this
+% using the very fine |crop| package.
+%    \begin{macrocode}
+%<*pt>
+\if@cameraready
+\RequirePackage[cam,center,width=21truecm,height=29.7truecm]{crop}
+\fi
+%</pt> 
+%    \end{macrocode}
+%
 % \subsection{Babel provisions}
 %
 % \changes{v1.7}{2016/05/01}{Added babel tags of elements
@@ -2219,6 +2266,7 @@ Welk van de onderstaande ingredi\"enten hoort niet thuis in
 % To this end, we use the following parsing infrastructure:
 %    \begin{macrocode}
 %<*ct|bmt|pt|rp|le|ex>
+\cs_generate_variant:Nn \prop_gput:Nnn{ Nxx }
 \cs_new_nopar:Npn \@@_dataparser:w #1 = #2!! {
   \tl_set:Nn \l_tmpa_tl {#1}
   \tl_set:Nn \l_tmpb_tl {#2}
@@ -3324,12 +3372,13 @@ weightname       = Gewicht
 \pagenumbering{arabic}
 %</ct>
 %<*mt|pt|rp|le>
+\setlength{\headheight}{13.7pt}
 \renewcommand*{\headrulewidth}{0pt}
 \renewcommand*{\footrulewidth}{0pt}
 %</mt|pt|rp|le>
 %<*ex>
+\setlength{\headheight}{13.7pt}
 \renewcommand*{\headrulewidth}{0pt}
-
 %</ex>
 %    \end{macrocode}
 %
@@ -3388,7 +3437,7 @@ weightname       = Gewicht
           \node[color=white] at (\theta:0.025)
           {\bf\fontsize{72}{12}\selectfont\thechapter};
         }
-        \node[color=uacorpblue] at (0,0)
+        \node[color=gray] at (0,0)
         {\bf\fontsize{72}{12}\selectfont\thechapter};
       \end{tikzpicture}
     }\hspace*{-8pt}
@@ -3439,6 +3488,7 @@ weightname       = Gewicht
   \begin{titlepage}
     \AddToShipoutPicture*{%
       \put(0,0){%
+        \if@modern
         \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
           \clip (0,0) rectangle(\paperwidth,\paperheight);
 
@@ -3508,6 +3558,70 @@ weightname       = Gewicht
           \node[anchor=west] at (2.125,1.313)
           {\includegraphics[width=4.75cm]{\logopos}};
         \end{tikzpicture}
+        \else
+        \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
+          \clip (0,0) rectangle(\paperwidth,\paperheight);
+          \if@cameraready
+          \else
+          \fill[uauamain] (0,29.7) -- (2.2,29.7) -- (2.2,21.435) arc
+          (0:-90:0.235) -- (0,21.2) -- cycle;
+          \node[anchor=west] at (2.2,1.8)
+          {\includegraphics[width=5.2cm]{\logoposua}};
+          \fi
+
+          \node
+          [anchor=north west,text width=14.75cm,align=left]
+          at (5,27.1)
+          {
+            \fontsize{16}{20}\selectfont\textsf{\textbf{\uantwerpendocsprop{acyearname}}}\\[1ex]
+            \fontsize{16}{20}\selectfont\textsf{\@academicyear}
+          };
+
+          \node
+          [anchor=north west,text width=14.75cm,align=left]
+          at (5,22.7)
+          {
+            \fontsize{16}{20}\selectfont\textsf{\@faculty}
+          };
+
+          \node
+          [anchor=north west,text width=14.75cm,align=left] (title)
+          at (5,20.9)
+          {
+            \fontsize{24}{30}\selectfont\textsf{\textbf{\@title}}\\[1ex]
+            \fontsize{18}{24}\selectfont\textsf{\@subtitle}
+          };
+
+          \node
+          [anchor=north west,below=of title,
+          text width=14.75cm,align=left,
+          yshift=-0.5cm]
+          {
+            \fontsize{12}{15}\selectfont{\textsf{\@degree}}
+          };
+
+          \node
+          [anchor=north west,text width=14.75cm,align=left] (title)
+          at (5,13.3)
+          {
+            \fontsize{12}{15}\selectfont\textsf{\textbf{\jointlecturers{\\}}}
+          };
+
+          \node
+          [anchor=north west,text width=14.75cm,align=left] (title)
+          at (5,10)
+          {
+            \fontsize{12}{15}\selectfont\textsf{\jointcourseswithcodes{\\}}
+          };
+
+          \node[anchor=east]
+          at (19,1.8)
+          {
+            \fontsize{12}{15}\selectfont\textsf{\@publishercode}
+          };
+
+        \end{tikzpicture}
+        \fi
       }
     }
   \end{titlepage}%
@@ -3543,19 +3657,32 @@ weightname       = Gewicht
 %    \begin{macrocode}
 %<*ct>
 \newcommand\makefinalpage{
+  \if@cameraready
+  \else
   \cleardoublepage
   \thispagestyle{empty}
+  \if@copyright\NoBgThispage\fi
   ~% intentionally blank page
   \clearpage
   \thispagestyle{empty}
-  \begin{tikzpicture}[remember picture,overlay]
-    \node at (current page.center) {
-      \begin{tikzpicture}[inner sep=0pt]
+  \if@copyright\NoBgThispage\fi
+  \AddToShipoutPicture*{%
+    \put(0,0){%
+      \if@modern
+      \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
         \clip (0,0) rectangle(\paperwidth,\paperheight);
         \fill[sidecolor] (0,0) rectangle (2.125cm,2.625cm);
       \end{tikzpicture}
-    };
-  \end{tikzpicture}
+      \else
+      \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
+        \clip (0,0) rectangle(\paperwidth,\paperheight);
+        \fill[uauamain] (0,21.2) rectangle (21,29.7);
+      \end{tikzpicture}
+      \fi
+    }
+  }
+  ~
+  \fi
 }
 %</ct> 
 %    \end{macrocode}
@@ -3694,18 +3821,18 @@ weightname       = Gewicht
     \AddToShipoutPicture*{%
       \put(0,0){%
         \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
-          \clip (0,0) rectangle(\paperwidth,\paperheight);
+          \useasboundingbox (0,0) rectangle(\paperwidth,\paperheight);
           \fill[lightgray]
-          (2.125,19) rectangle (\paperwidth,6);
+          (2.125,19) rectangle (\paperwidth+3mm,6);
           \begin{scope}
-            \clip (2.125,19) rectangle (\paperwidth,6);
+            \clip (2.125,19) rectangle (\paperwidth+3mm,6);
             \node[anchor=south west]
             at (2.125,6)
             {\ifx\@titlepageimage\@empty
               \else
               \includegraphics[keepaspectratio,
               scale=0.01,
-              min size={15.875cm}{13cm}]{\@titlepageimage}
+              min size={16.175cm}{13cm}]{\@titlepageimage}
               \fi};
           \end{scope}
 
@@ -3730,8 +3857,8 @@ weightname       = Gewicht
           {\textsf{\textbf{\@author}}};
           
           \fill[maincolor] (2.125,6)
-          -- (\paperwidth,6)
-          -- (\paperwidth,2.625)
+          -- (\paperwidth+3mm,6)
+          -- (\paperwidth+3mm,2.625)
           -- (2.55,2.625)
           arc (-90:-180:0.425)
           -- cycle;
@@ -3846,14 +3973,15 @@ weightname       = Gewicht
   ~% intentionally blank page
   \clearpage
   \thispagestyle{empty}
-  \begin{tikzpicture}[remember picture,overlay]
-    \node at (current page.center) {
-      \begin{tikzpicture}[inner sep=0pt]
-        \clip (0,0) rectangle(\paperwidth,\paperheight);
-        \fill[sidecolor] (0,0) rectangle (2.125cm,2.625cm);
+  \AddToShipoutPicture*{%
+    \put(0,0){%
+      \begin{tikzpicture}[inner sep=0pt,outer sep=0pt]
+        \useasboundingbox (0,0) rectangle (\paperwidth,\paperheight);
+        \fill[sidecolor] (-3mm,-3mm) rectangle (2.125cm,2.625cm);
       \end{tikzpicture}
-    };
-  \end{tikzpicture}
+    }
+  }
+  ~
 }
 %</pt> 
 %    \end{macrocode}
@@ -4441,9 +4569,6 @@ weightname       = Gewicht
 \AtBeginDocument{
   \@ifpackageloaded{hyperref}{
     \hypersetup{
-      backref=true,
-      hyperindex=true,
-      pagebackref=true,
       breaklinks=true,
       colorlinks=true,
       citecolor=black,