texlive[48061] Master/texmf-dist: uantwerpendocs (20jun18)
commits+karl at tug.org
commits+karl at tug.org
Wed Jun 20 23:03:52 CEST 2018
Revision: 48061
http://tug.org/svn/texlive?view=revision&revision=48061
Author: karl
Date: 2018-06-20 23:03:52 +0200 (Wed, 20 Jun 2018)
Log Message:
-----------
uantwerpendocs (20jun18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf
trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex
trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpendocs.pdf
trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.pdf
trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex
trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.pdf
trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex
trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf
trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.pdf
trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex
trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.pdf
trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex
trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.pdf
trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex
trunk/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx
trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls
trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls
trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls
trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex 2018-06-20 05:54:15 UTC (rev 48060)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex 2018-06-20 21:03:52 UTC (rev 48061)
@@ -109,7 +109,6 @@
\chapter{Besluit}
-\backmatter
\appendix
\chapter{Symbolen}
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpendocs.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex 2018-06-20 05:54:15 UTC (rev 48060)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex 2018-06-20 21:03:52 UTC (rev 48061)
@@ -76,6 +76,8 @@
Succes!
}
\studentnr{127}
+\setmcsymbol{\bigcirc}
+
\begin{document}
\maketitle
\question{[VLATOP-BISTRO]}
@@ -95,7 +97,7 @@
\mc{Eieren}
\mc{Suiker}
-\insertsolutionspagepartial{22}
+\insertsolutionspagepartial{2}
\insertsolutionspage{}
\clearpage
@@ -111,7 +113,7 @@
Gault-Millau.
\end{enumerate}
-\insertsolutionspagepartial{25}
+\insertsolutionspagepartial{23}
\foreach \i in {1,2,3} {
\insertsolutionspage{}
}
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex 2018-06-20 05:54:15 UTC (rev 48060)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex 2018-06-20 21:03:52 UTC (rev 48061)
@@ -167,7 +167,7 @@
\insertsolutionspage{}
}
\foreach \i in {1,2} {
- \insertsolutionspage{Kladpapier}
+ \insertsolutionspage{Scrap/Klad}
}
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex 2018-06-20 05:54:15 UTC (rev 48060)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex 2018-06-20 21:03:52 UTC (rev 48061)
@@ -77,7 +77,6 @@
\chapter{Besluit}
-\backmatter
\appendix
\chapter{Symbolen}
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex 2018-06-20 05:54:15 UTC (rev 48060)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex 2018-06-20 21:03:52 UTC (rev 48061)
@@ -30,13 +30,15 @@
\usepackage{mathptmx}
\usepackage{fontspec}
-\setmainfont{Times New Roman}
\setsansfont{Calibri}
\usepackage[dutch]{babel} % or dutch if your text is in Dutch
\usepackage{lipsum} % this is just for some dummy text, please remove
-\title{Harmonische Signaalanalyse\\met behulp van\\Lineaire Operatoren}
+\title{Harmonische Signaalanalyse\\met behulp van Lineaire
+ Operatoren}
+\subtitle{Waarom moeten titels van doctoraatsthesissen toch altijd
+ lang en onverstaanbaar zijn?}
\author{Ing. Theofiel Hoekaff}
\facultyacronym{TI}
\programme{PHD}{IW}{EI}
@@ -106,11 +108,10 @@
\lipsum[25]
-\backmatter
\appendix
-
\chapter{Symbolen}
+\chapter{Publicaties}
\makefinalpage
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex 2018-06-20 05:54:15 UTC (rev 48060)
+++ trunk/Master/texmf-dist/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex 2018-06-20 21:03:52 UTC (rev 48061)
@@ -28,10 +28,14 @@
\def\filedate{2018/05/16}
\documentclass[b5paper,10pt,twoside,openright,filled]{uantwerpenphdthesis}
+\usepackage{newpxtext}
+\usepackage{newpxmath}
+
\usepackage[english]{babel} % or dutch if your text is in Dutch
\usepackage{lipsum} % this is just for some dummy text, please remove
\title{Harmonic Signal analysis\\based on Linear Operators}
+\subtitle{How did Mindy linearly kill Mork's IC signal analyzer?}
\author{Ing. Theodore Edgeoff}
\facultyacronym{TI}
\affiliation{University of Antwerp\\
@@ -101,7 +105,6 @@
\lipsum[25]
-\backmatter
\appendix
\chapter{Symbols}
Modified: trunk/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx 2018-06-20 05:54:15 UTC (rev 48060)
+++ trunk/Master/texmf-dist/source/latex/uantwerpendocs/uantwerpendocs.dtx 2018-06-20 21:03:52 UTC (rev 48061)
@@ -30,7 +30,7 @@
%<pt>\ProvidesClass{uantwerpenphdthesis}
%<le>\ProvidesClass{uantwerpenletter}
%<ex>\ProvidesClass{uantwerpenexam}
-%<ct|mt|pt|le|ex> [2018/05/16 v2.0 .dtx skeleton file]
+%<ct|mt|pt|le|ex> [2018/06/20 v2.1 .dtx skeleton file]
%
\def\fileversion{2.0}
\def\filedate{2018/05/16}
@@ -91,6 +91,8 @@
% package}
% \changes{v2.0}{2018/05/16}{\@ Implemented uantwerpenphdthesis class
% into package}
+% \changes{v2.1}{2018/06/20}{\@ Bugfix release after promotion event
+% on research day}
%
%
% \DoNotIndex{\newcommand,\newenvironment}
@@ -343,7 +345,6 @@
%
% % write your PhD text here
%
-% \backmatter
% \appendix
%
% % write appendix material here
@@ -653,7 +654,7 @@
% uses for its internal administration. It may be a proprietary code,
% or an ISBN number.
%
-% \DescribeMacro{\subtitle} [coursetext] (optional)\\
+% \DescribeMacro{\subtitle} [coursetext / phdthesis] (optional)\\
% This macro sets the title of the document. You may use this
% \begin{itemize}
% \item to further clarify the title
@@ -929,7 +930,6 @@
\chapter{Besluit}
-\backmatter
\appendix
\chapter{Symbolen}
@@ -998,7 +998,6 @@
\chapter{Besluit}
-\backmatter
\appendix
\chapter{Symbolen}
@@ -1021,13 +1020,15 @@
% You may want to use common fonts
\usepackage{mathptmx}
\usepackage{fontspec}
-\setmainfont{Times New Roman}
\setsansfont{Calibri}
\usepackage[dutch]{babel} % or dutch if your text is in Dutch
\usepackage{lipsum} % this is just for some dummy text, please remove
-\title{Harmonische Signaalanalyse\\met behulp van\\Lineaire Operatoren}
+\title{Harmonische Signaalanalyse\\met behulp van Lineaire
+ Operatoren}
+\subtitle{Waarom moeten titels van doctoraatsthesissen toch altijd
+ lang en onverstaanbaar zijn?}
\author{Ing. Theofiel Hoekaff}
\facultyacronym{TI}
\programme{PHD}{IW}{EI}
@@ -1097,11 +1098,10 @@
\lipsum[25]
-\backmatter
\appendix
-
\chapter{Symbolen}
+\chapter{Publicaties}
% Put your bibliography here using BibTeX
\makefinalpage
@@ -1115,10 +1115,15 @@
%<*pt-example2>
\documentclass[b5paper,10pt,twoside,openright,filled]{uantwerpenphdthesis}
+% use some fancy font
+\usepackage{newpxtext}
+\usepackage{newpxmath}
+
\usepackage[english]{babel} % or dutch if your text is in Dutch
\usepackage{lipsum} % this is just for some dummy text, please remove
\title{Harmonic Signal analysis\\based on Linear Operators}
+\subtitle{How did Mindy linearly kill Mork's IC signal analyzer?}
\author{Ing. Theodore Edgeoff}
\facultyacronym{TI}
\affiliation{University of Antwerp\\
@@ -1188,7 +1193,6 @@
\lipsum[25]
-\backmatter
\appendix
\chapter{Symbols}
@@ -1381,6 +1385,8 @@
Succes!
}
\studentnr{127}
+\setmcsymbol{\bigcirc}
+
\begin{document}
\maketitle
\question{[VLATOP-BISTRO]}
@@ -1400,7 +1406,7 @@
\mc{Eieren}
\mc{Suiker}
-\insertsolutionspagepartial{22}
+\insertsolutionspagepartial{2}
\insertsolutionspage{}
\clearpage
@@ -1416,7 +1422,7 @@
Gault-Millau.
\end{enumerate}
-\insertsolutionspagepartial{25}
+\insertsolutionspagepartial{23}
\foreach \i in {1,2,3} {
\insertsolutionspage{}
}
@@ -1571,7 +1577,7 @@
\insertsolutionspage{}
}
\foreach \i in {1,2} {
- \insertsolutionspage{Kladpapier}
+ \insertsolutionspage{Scrap/Klad}
}
\end{document}
%</ex-example2>
@@ -1722,6 +1728,7 @@
\RequirePackage{graphicx}
\RequirePackage{color}
\RequirePackage{tikz}
+\usetikzlibrary{positioning}
\RequirePackage{eso-pic}
%</ct|mt|pt|le|ex>
%<*ct>
@@ -2113,12 +2120,18 @@
% \end{macro}
%
% \begin{macro}{\subtitle}
+% \changes{v2.1}{2018/06/20}{Added subtitle to phd text}
+% \changes{v2.1}{2018/06/20}{Ensured that subtitle is really
+% optional by adding default space value}
% This macro sets the |\@subtitle| tag that later will be used on
% the title page, in the header/footer and to set the appropriate
% |hyperref| tag.
% \begin{macrocode}
-%<*ct>
-\newcommand{\@subtitle}{}
+%<*mt>
+\newcommand{\@subtitle}{Master's thesis}
+%</mt>
+%<*ct|pt>
+\newcommand{\@subtitle}{~}
\newcommand{\@qrsubtitle}{}
\newcommand{\subtitle}[1]{%
\renewcommand\@subtitle{#1}
@@ -2129,7 +2142,7 @@
\newcommand{\qrsubtitle}[1]{%
\renewcommand\@qrsubtitle{#1}
}
-%</ct>
+%</ct|pt>
% \end{macrocode}
% \end{macro}
%
@@ -2951,9 +2964,10 @@
% \begin{macro}{\extrainfo}
% This macro will set the |\@extrainfo| tag that will be used on
% the back of the exam title page.
+% \changes{v2.1}{2018/06/20}{Changed default to empty}
% \begin{macrocode}
%<*ex>
-\newcommand{\@extrainfo}{TBD}
+\newcommand{\@extrainfo}{}
\newcommand{\extrainfo}[1]{\renewcommand{\@extrainfo}{#1}}
%</ex>
% \end{macrocode}
@@ -3107,7 +3121,7 @@
%
% \subsection{Fancy chapter headers for the phdthesis class}
%
-%
+% \changes{v2.1}{2018/06/20}{Added appropriate \textbackslash{}appendix command}
% \begin{macrocode}
%<*pt>
\def\@makechapterhead#1{%
@@ -3124,11 +3138,10 @@
\rule{\textwidth}{1pt}
\vspace{5\p@}\par\nobreak
}
-
\def\@schapter#1{%
\@makeschapterhead{#1}%
\@afterheading
- }
+}
\def\@makeschapterhead#1{%
\vspace*{1ex}%
\begin{flushright}
@@ -3136,7 +3149,13 @@
\end{flushright}
\rule{\textwidth}{1pt}
\vspace{5\p@}\par
- }
+}
+% overwrite appendix
+\def\appendix{
+ \setcounter{chapter}{0}
+ \renewcommand*{\thechapter}{\Alph{chapter}}
+ \renewcommand\chaptername\appendixname
+}
%</pt>
% \end{macrocode}
%
@@ -3557,7 +3576,8 @@
% \begin{macro}{\maketitle}
% Below, one can find the code for the title page of the
% |uantwerpenphdthesis| class:
-% \changes{v2.0}{2018/03/14}{Implemented title page}
+% \changes{v2.0}{2018/03/14}{Implemented title page}
+% \changes{v2.1}{2018/06/20}{Corrected information page (p4) jury spacing}
% \begin{macrocode}
%<*pt>
\renewcommand\maketitle{%
@@ -3564,31 +3584,7 @@
\pagestyle{empty}
\begin{titlepage}
\if at titlepagetableonly
- Dit is een cursustekst van Universiteit Antwerpen.\\
- Het titelblad dient opgemaakt te worden met de volgende gegevens:
- \begin{center}
- \begin{tabular}{|l|l|}
- \hline
- \bfseries I & Universiteit Antwerpen \\\hline
- \bfseries F & \@faculty \\\hline
- \bfseries P & \parbox[t]{14cm}{\@programmet
- \@programmec\@programmes \@programmeq} \\\hline
- \bfseries C & \parbox[t]{14cm}{
- \texttt{\@coursecodei} \@coursei\\
- \texttt{\@coursecodeii} \@courseii\\
- \texttt{\@coursecodeiii} \@courseiii\\
- \texttt{\@coursecodeiv} \@courseiv} \\\hline
- \bfseries Y & \\\hline
- \bfseries T & \parbox[t]{14cm}{\@title}\\\hline
- \bfseries S & \parbox[t]{14cm}{SUBTITLE}\\\hline
- \bfseries A & \parbox[t]{14cm}{\@author}\\\hline
- \bfseries L & \parbox[t]{14cm}{LECTURERS}\\\hline
- \end{tabular}
- \end{center}
- ~\\
- Waarbij: I = instelleng, F = faculteit, P = programma, C =
- cursusmodule, T = titel, S = subtitel, A = auteur(s), L =
- lesgever(s)\\~\\
+ Dit is een doctoraatsthesis van Universiteit Antwerpen.
\else
\begin{tikzpicture}[remember picture,overlay]
\node at (current page.center) {
@@ -3636,16 +3632,21 @@
\ifdefvoid{\@supervisoriv}{}{\\\@supervisoriv}}}
};
- \node[anchor=north west,text width=\textwidth,align=left,font=\Huge]
+ \node[anchor=north west,text
+ width=\ua at X-6*\ua at Z,align=left,font=\Huge]
+ (title)
at (3*\ua at Z pt,\ua at Y-4*\ua at Z pt)
{ \textsf{\textbf{\@title}} };
- \node[anchor=north west,text width=\textwidth,align=left]
- at (3*\ua at Z pt,\ua at Y - 11.5*\ua at Z pt)
+ \node[anchor=north west,below=2.5ex of title,text width=\ua at X-6*\ua at Z,align=left,font=\large]
+ { \textsf{\textbf{\@subtitle}} };
+
+ \node[anchor=north west,text width=\ua at X-6*\ua at Z,align=left]
+ at (3*\ua at Z pt,\ua at Y - 12.5*\ua at Z pt)
{ \textsf{\pthesisnamei{} \@phddegree{} \pthesisnameii{}} };
\node[anchor=north west, text width=\textwidth,align=left,font=\LARGE]
- at (3*\ua at Z pt, \ua at Y-14.5*\ua at Z pt)
+ at (3*\ua at Z pt, \ua at Y-15.5*\ua at Z pt)
{ \textsf{\textbf{\@author}} };
\end{tikzpicture}
};
@@ -3660,6 +3661,7 @@
\@programmeq\par
\vfill
\Huge\textsf{\@title}\par
+ \large\textsf{\@subtitle}\par
\vfill
\normalsize\pthesisnamei\\
\@phddegree\\
@@ -3681,12 +3683,11 @@
\end{minipage}
\end{center}
\clearpage
- \textbf{\juryname}\\
- \medskip
- \textbf{\jurychairmanname}\\
+ \textbf{\juryname}\hfill\par
+ \textbf{\jurychairmanname}\hfill\break
\@jurychairman{}\ifdefvoid{\@jurychairmanaff}{}{, \@jurychairmanaff}\\
- \smallskip
- \textbf{\supervisorsname}\\
+ \hfill\break
+ \textbf{\supervisorsname}\hfill\break
\ifdefvoid{\@supervisori}{}{\@supervisori
\ifdefvoid{\@supervisoriaff}{}{, \@supervisoriaff}\\}
\ifdefvoid{\@supervisorii}{}{\@supervisorii
@@ -3695,9 +3696,8 @@
\ifdefvoid{\@supervisoriiiaff}{}{, \@supervisoriiiaff}\\}
\ifdefvoid{\@supervisoriv}{}{\@supervisoriv
\ifdefvoid{\@supervisorivaff}{}{, \@supervisorivaff}\\}
-
- \smallskip
- \textbf{\jurymembersname}\\
+ \hfill\break
+ \textbf{\jurymembersname}\hfill\break
\ifdefvoid{\@jurymemberi}{}{\@jurymemberi
\ifdefvoid{\@jurymemberiaff}{}{, \@jurymemberiaff\\}}
\ifdefvoid{\@jurymemberii}{}{\@jurymemberii
@@ -3710,6 +3710,7 @@
\ifdefvoid{\@jurymembervaff}{}{, \@jurymembervaff\\}}
\ifdefvoid{\@jurymembervi}{}{\@jurymembervi
\ifdefvoid{\@jurymemberviaff}{}{, \@jurymemberviaff\\}}
+ \hfill\break
\vfill
\textbf{Contact}\\
\smallskip
@@ -3860,6 +3861,7 @@
%
% \subsection{Title page for the exam class}
%
+% \changes{v2.1}{2018/06/20}{Corrected spacing in title + exampart}
% \begin{macro}{\maketitle}
% The title page of the exam class is generated using the |\maketitle|
% command.
@@ -3911,7 +3913,7 @@
(3.3,21.9) node[anchor=north west] {
\parbox{16cm}{
\fontfamily{phv}\fontsize{18}{22}\fontseries{b}\fontshape{n}\selectfont
- \raggedright \@coursei --- \@exampart
+ \raggedright \@coursei{} --- \@exampart
\fontfamily{phv}\fontsize{12}{18}\fontseries{m}\fontshape{n}\selectfont\\
Groep \@examgroupnumber{} \hfill \@examdate{} }
}
@@ -3978,8 +3980,11 @@
}
\vspace*{15cm}
\clearpage
+ \ifx\@qrtitle\@emptymacro
+ \else
\@extrainfo
\clearpage
+ \fi
}
%</ex>
% \end{macrocode}
@@ -4027,16 +4032,16 @@
% typesets the question in two columns, the left column taking the
% English variant of the question and the right column taking the
% Dutch variant.
-%
+% \changes{v2.1}{2018/06/20}{\@ Increased intercolumn spacing for engdut}
% \begin{macrocode}
%<*ex>
\newcommand{\engdut}[2]{%
- \begin{tabular}{cc}%
+ \begin{tabular}{ccc}%
\selectlanguage{english}%
\begin{minipage}[t]{0.45\textwidth}%
#1
\end{minipage}%
- &
+ &~~~&
\selectlanguage{dutch}%
\begin{minipage}[t]{0.45\textwidth}%
#2
@@ -4048,25 +4053,41 @@
% \end{macrocode}
% \end{macro}
%
+%
+% \changes{v2.1}{2018/06/20}{Allow for setting the multiple choice
+% mark symbol}
+% \begin{macro}{\setmcsymbol}
+% sets the symbol to be used as multiple choice mark (by default a
+% square).
+% \begin{macrocode}
+%<*ex>
+\newcommand\@mcsymbol{\square}
+\newcommand\setmcsymbol[1]{\renewcommand\@mcsymbol{#1}}
+%</ex>
+% \end{macrocode}
+% \end{macro}
+%
+% \changes{v2.1}{2018/06/20}{Corrected erroneous line breaking}
% \begin{macro}{\mc}
% typesets a multiple choice answer candidate (monolingual, i.e. in a
% single column).
-%
% \begin{macrocode}
%<*ex>
-\newcommand{\mc}[1]{%
- \qquad\begin{tabular}{cc}
- $\square$
+\newcommand\mc[1]{%
+ \hfill\break\qquad\begin{tabular}{cc}
+ $\@mcsymbol$
&
- \begin{minipage}[t]{0.8\textwidth}%
+ \begin{minipage}[t]{0.9\textwidth}%
#1
\end{minipage}%
- \end{tabular}\\
+ \end{tabular}
}
%</ex>
% \end{macrocode}
% \end{macro}
%
+% \changes{v2.1}{2018/06/20}{Corrected erroneous line breaking}
+%
% \begin{macro}{\engdutmc}
% typesets a multiple choice answer candidate in two columns, the left
% column taking the English variant of the question and the right
@@ -4075,16 +4096,16 @@
% \begin{macrocode}
%<*ex>
\newcommand{\engdutmc}[2]{%
- \begin{tabular}{cccc}
- $\square$
+ \hfill\break\begin{tabular}{cccc}
+ $\@mcsymbol$
&
\selectlanguage{english}%
- \begin{minipage}[t]{0.4\textwidth}%
+ \begin{minipage}[t]{0.42\textwidth}%
#1
\end{minipage}%
&---&
\selectlanguage{dutch}%
- \begin{minipage}[t]{0.4\textwidth}%
+ \begin{minipage}[t]{0.42\textwidth}%
#2
\end{minipage}%
\end{tabular}
@@ -4224,7 +4245,7 @@
\AtBeginDocument{
\hypersetup{
pdftitle={\@title},
- pdfsubject={Master's Thesis},
+ pdfsubject={\@subtitle},
pdfauthor={\@author}
}
}
Modified: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls 2018-06-20 05:54:15 UTC (rev 48060)
+++ trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls 2018-06-20 21:03:52 UTC (rev 48061)
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpencoursetext}
- [2018/05/16 v2.0 .dtx skeleton file]
+ [2018/06/20 v2.1 .dtx skeleton file]
\def\fileversion{2.0}
\def\filedate{2018/05/16}
\newif\if at copyright
@@ -53,6 +53,7 @@
\RequirePackage{graphicx}
\RequirePackage{color}
\RequirePackage{tikz}
+\usetikzlibrary{positioning}
\RequirePackage{eso-pic}
\if at copyright
\RequirePackage[firstpage=false,contents={Copyright University of Antwerp, All Rights Reserved},color=lightgray,scale=3]{background}
@@ -373,7 +374,7 @@
\newcommand{\qrtitle}[1]{%
\renewcommand\@qrtitle{#1}
}
-\newcommand{\@subtitle}{}
+\newcommand{\@subtitle}{~}
\newcommand{\@qrsubtitle}{}
\newcommand{\subtitle}[1]{%
\renewcommand\@subtitle{#1}
Modified: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls 2018-06-20 05:54:15 UTC (rev 48060)
+++ trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls 2018-06-20 21:03:52 UTC (rev 48061)
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenexam}
- [2018/05/16 v2.0 .dtx skeleton file]
+ [2018/06/20 v2.1 .dtx skeleton file]
\def\fileversion{2.0}
\def\filedate{2018/05/16}
\newif\if at examiner
@@ -45,6 +45,7 @@
\RequirePackage{graphicx}
\RequirePackage{color}
\RequirePackage{tikz}
+\usetikzlibrary{positioning}
\RequirePackage{eso-pic}
\RequirePackage{fancyhdr}
\definecolor{uacorpbord}{cmyk} {0.00,1.00,0.60,0.37}
@@ -425,7 +426,7 @@
\newcommand{\tend}[1]{\renewcommand{\@tend}{#1}}
\newcommand{\@rooms}{TBD}
\newcommand{\rooms}[1]{\renewcommand{\@rooms}{#1}}
-\newcommand{\@extrainfo}{TBD}
+\newcommand{\@extrainfo}{}
\newcommand{\extrainfo}[1]{\renewcommand{\@extrainfo}{#1}}
\newcommand{\@studentnr}{0}
\newcommand{\studentnr}[1]{\renewcommand{\@studentnr}{#1}}
@@ -491,7 +492,7 @@
(3.3,21.9) node[anchor=north west] {
\parbox{16cm}{
\fontfamily{phv}\fontsize{18}{22}\fontseries{b}\fontshape{n}\selectfont
- \raggedright \@coursei --- \@exampart
+ \raggedright \@coursei{} --- \@exampart
\fontfamily{phv}\fontsize{12}{18}\fontseries{m}\fontshape{n}\selectfont\\
Groep \@examgroupnumber{} \hfill \@examdate{} }
}
@@ -558,8 +559,11 @@
}
\vspace*{15cm}
\clearpage
+ \ifx\@qrtitle\@emptymacro
+ \else
\@extrainfo
\clearpage
+ \fi
}
\newcounter{question}
\setcounter{question}{0}
@@ -577,12 +581,12 @@
\end{tabular}\\
}
\newcommand{\engdut}[2]{%
- \begin{tabular}{cc}%
+ \begin{tabular}{ccc}%
\selectlanguage{english}%
\begin{minipage}[t]{0.45\textwidth}%
#1
\end{minipage}%
- &
+ &~~~&
\selectlanguage{dutch}%
\begin{minipage}[t]{0.45\textwidth}%
#2
@@ -590,26 +594,28 @@
\end{tabular}
\selectlanguage{english}%
}
-\newcommand{\mc}[1]{%
- \qquad\begin{tabular}{cc}
- $\square$
+\newcommand\@mcsymbol{\square}
+\newcommand\setmcsymbol[1]{\renewcommand\@mcsymbol{#1}}
+\newcommand\mc[1]{%
+ \hfill\break\qquad\begin{tabular}{cc}
+ $\@mcsymbol$
&
- \begin{minipage}[t]{0.8\textwidth}%
+ \begin{minipage}[t]{0.9\textwidth}%
#1
\end{minipage}%
- \end{tabular}\\
+ \end{tabular}
}
\newcommand{\engdutmc}[2]{%
- \begin{tabular}{cccc}
- $\square$
+ \hfill\break\begin{tabular}{cccc}
+ $\@mcsymbol$
&
\selectlanguage{english}%
- \begin{minipage}[t]{0.4\textwidth}%
+ \begin{minipage}[t]{0.42\textwidth}%
#1
\end{minipage}%
&---&
\selectlanguage{dutch}%
- \begin{minipage}[t]{0.4\textwidth}%
+ \begin{minipage}[t]{0.42\textwidth}%
#2
\end{minipage}%
\end{tabular}
Modified: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls 2018-06-20 05:54:15 UTC (rev 48060)
+++ trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls 2018-06-20 21:03:52 UTC (rev 48061)
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenletter}
- [2018/05/16 v2.0 .dtx skeleton file]
+ [2018/06/20 v2.1 .dtx skeleton file]
\def\fileversion{2.0}
\def\filedate{2018/05/16}
\newif\if at filled
@@ -48,6 +48,7 @@
\RequirePackage{graphicx}
\RequirePackage{color}
\RequirePackage{tikz}
+\usetikzlibrary{positioning}
\RequirePackage{eso-pic}
\RequirePackage{fancyhdr}
\definecolor{uacorpbord}{cmyk} {0.00,1.00,0.60,0.37}
Modified: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls 2018-06-20 05:54:15 UTC (rev 48060)
+++ trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls 2018-06-20 21:03:52 UTC (rev 48061)
@@ -26,7 +26,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenmasterthesis}
- [2018/05/16 v2.0 .dtx skeleton file]
+ [2018/06/20 v2.1 .dtx skeleton file]
\def\fileversion{2.0}
\def\filedate{2018/05/16}
\newif\if at titlepagenoartwork
@@ -49,6 +49,7 @@
\RequirePackage{graphicx}
\RequirePackage{color}
\RequirePackage{tikz}
+\usetikzlibrary{positioning}
\RequirePackage{eso-pic}
\RequirePackage{fancyhdr}
\definecolor{uacorpbord}{cmyk} {0.00,1.00,0.60,0.37}
@@ -352,6 +353,7 @@
\errmessage{Error: wrong faculty acronym; choose one of CPG, FBD, GGW,
IOB, IOIW, ASoE, LW, OW, SW, REC, TEW, TI, WET}}}}}}}}}}}}}}}
}
+\newcommand{\@subtitle}{Master's thesis}
\newcommand\@supervisori{\errmessage{Please define a supervisor of
your thesiswork using the \textbackslash{}supervisori to iv
commands} in the preamble of your document.}
@@ -543,7 +545,7 @@
\AtBeginDocument{
\hypersetup{
pdftitle={\@title},
- pdfsubject={Master's Thesis},
+ pdfsubject={\@subtitle},
pdfauthor={\@author}
}
}
Modified: trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls 2018-06-20 05:54:15 UTC (rev 48060)
+++ trunk/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls 2018-06-20 21:03:52 UTC (rev 48061)
@@ -25,7 +25,7 @@
%% The Current Maintainer of this work is Walter Daems.
%%
\ProvidesClass{uantwerpenphdthesis}
- [2018/05/16 v2.0 .dtx skeleton file]
+ [2018/06/20 v2.1 .dtx skeleton file]
\def\fileversion{2.0}
\def\filedate{2018/05/16}
\newif\if at titlepagenoartwork
@@ -48,6 +48,7 @@
\RequirePackage{graphicx}
\RequirePackage{color}
\RequirePackage{tikz}
+\usetikzlibrary{positioning}
\RequirePackage{eso-pic}
\usepackage{ean13isbn}
\RequirePackage{fancyhdr}
@@ -352,6 +353,17 @@
\errmessage{Error: wrong faculty acronym; choose one of CPG, FBD, GGW,
IOB, IOIW, ASoE, LW, OW, SW, REC, TEW, TI, WET}}}}}}}}}}}}}}}
}
+\newcommand{\@subtitle}{~}
+\newcommand{\@qrsubtitle}{}
+\newcommand{\subtitle}[1]{%
+ \renewcommand\@subtitle{#1}
+ \ifx\@qrsubtitle\@emptymacro
+ \renewcommand\@qrsubtitle{#1}
+ \fi
+}
+\newcommand{\qrsubtitle}[1]{%
+ \renewcommand\@qrsubtitle{#1}
+}
\newcommand\@affiliation{\errmessage{Please, define the affiliation of
the author using the \textbackslash{}affiliation command in the
preamble of your document.}}
@@ -537,11 +549,10 @@
\rule{\textwidth}{1pt}
\vspace{5\p@}\par\nobreak
}
-
\def\@schapter#1{%
\@makeschapterhead{#1}%
\@afterheading
- }
+}
\def\@makeschapterhead#1{%
\vspace*{1ex}%
\begin{flushright}
@@ -549,7 +560,12 @@
\end{flushright}
\rule{\textwidth}{1pt}
\vspace{5\p@}\par
- }
+}
+\def\appendix{
+ \setcounter{chapter}{0}
+ \renewcommand*{\thechapter}{\Alph{chapter}}
+ \renewcommand\chaptername\appendixname
+}
\pgfmathsetmacro{\ua at X}{\paperwidth}
\pgfmathsetmacro{\ua at Y}{\paperheight}
\pgfmathsetmacro{\ua at R}{6*\paperwidth}
@@ -562,31 +578,7 @@
\pagestyle{empty}
\begin{titlepage}
\if at titlepagetableonly
- Dit is een cursustekst van Universiteit Antwerpen.\\
- Het titelblad dient opgemaakt te worden met de volgende gegevens:
- \begin{center}
- \begin{tabular}{|l|l|}
- \hline
- \bfseries I & Universiteit Antwerpen \\\hline
- \bfseries F & \@faculty \\\hline
- \bfseries P & \parbox[t]{14cm}{\@programmet
- \@programmec\@programmes \@programmeq} \\\hline
- \bfseries C & \parbox[t]{14cm}{
- \texttt{\@coursecodei} \@coursei\\
- \texttt{\@coursecodeii} \@courseii\\
- \texttt{\@coursecodeiii} \@courseiii\\
- \texttt{\@coursecodeiv} \@courseiv} \\\hline
- \bfseries Y & \\\hline
- \bfseries T & \parbox[t]{14cm}{\@title}\\\hline
- \bfseries S & \parbox[t]{14cm}{SUBTITLE}\\\hline
- \bfseries A & \parbox[t]{14cm}{\@author}\\\hline
- \bfseries L & \parbox[t]{14cm}{LECTURERS}\\\hline
- \end{tabular}
- \end{center}
- ~\\
- Waarbij: I = instelleng, F = faculteit, P = programma, C =
- cursusmodule, T = titel, S = subtitel, A = auteur(s), L =
- lesgever(s)\\~\\
+ Dit is een doctoraatsthesis van Universiteit Antwerpen.
\else
\begin{tikzpicture}[remember picture,overlay]
\node at (current page.center) {
@@ -634,16 +626,21 @@
\ifdefvoid{\@supervisoriv}{}{\\\@supervisoriv}}}
};
- \node[anchor=north west,text width=\textwidth,align=left,font=\Huge]
+ \node[anchor=north west,text
+ width=\ua at X-6*\ua at Z,align=left,font=\Huge]
+ (title)
at (3*\ua at Z pt,\ua at Y-4*\ua at Z pt)
{ \textsf{\textbf{\@title}} };
- \node[anchor=north west,text width=\textwidth,align=left]
- at (3*\ua at Z pt,\ua at Y - 11.5*\ua at Z pt)
+ \node[anchor=north west,below=2.5ex of title,text width=\ua at X-6*\ua at Z,align=left,font=\large]
+ { \textsf{\textbf{\@subtitle}} };
+
+ \node[anchor=north west,text width=\ua at X-6*\ua at Z,align=left]
+ at (3*\ua at Z pt,\ua at Y - 12.5*\ua at Z pt)
{ \textsf{\pthesisnamei{} \@phddegree{} \pthesisnameii{}} };
\node[anchor=north west, text width=\textwidth,align=left,font=\LARGE]
- at (3*\ua at Z pt, \ua at Y-14.5*\ua at Z pt)
+ at (3*\ua at Z pt, \ua at Y-15.5*\ua at Z pt)
{ \textsf{\textbf{\@author}} };
\end{tikzpicture}
};
@@ -658,6 +655,7 @@
\@programmeq\par
\vfill
\Huge\textsf{\@title}\par
+ \large\textsf{\@subtitle}\par
\vfill
\normalsize\pthesisnamei\\
\@phddegree\\
@@ -679,12 +677,11 @@
\end{minipage}
\end{center}
\clearpage
- \textbf{\juryname}\\
- \medskip
- \textbf{\jurychairmanname}\\
+ \textbf{\juryname}\hfill\par
+ \textbf{\jurychairmanname}\hfill\break
\@jurychairman{}\ifdefvoid{\@jurychairmanaff}{}{, \@jurychairmanaff}\\
- \smallskip
- \textbf{\supervisorsname}\\
+ \hfill\break
+ \textbf{\supervisorsname}\hfill\break
\ifdefvoid{\@supervisori}{}{\@supervisori
\ifdefvoid{\@supervisoriaff}{}{, \@supervisoriaff}\\}
\ifdefvoid{\@supervisorii}{}{\@supervisorii
@@ -693,9 +690,8 @@
\ifdefvoid{\@supervisoriiiaff}{}{, \@supervisoriiiaff}\\}
\ifdefvoid{\@supervisoriv}{}{\@supervisoriv
\ifdefvoid{\@supervisorivaff}{}{, \@supervisorivaff}\\}
-
- \smallskip
- \textbf{\jurymembersname}\\
+ \hfill\break
+ \textbf{\jurymembersname}\hfill\break
\ifdefvoid{\@jurymemberi}{}{\@jurymemberi
\ifdefvoid{\@jurymemberiaff}{}{, \@jurymemberiaff\\}}
\ifdefvoid{\@jurymemberii}{}{\@jurymemberii
@@ -708,6 +704,7 @@
\ifdefvoid{\@jurymembervaff}{}{, \@jurymembervaff\\}}
\ifdefvoid{\@jurymembervi}{}{\@jurymembervi
\ifdefvoid{\@jurymemberviaff}{}{, \@jurymemberviaff\\}}
+ \hfill\break
\vfill
\textbf{Contact}\\
\smallskip
@@ -778,7 +775,7 @@
\AtBeginDocument{
\hypersetup{
pdftitle={\@title},
- pdfsubject={Master's Thesis},
+ pdfsubject={\@subtitle},
pdfauthor={\@author}
}
}
More information about the tex-live-commits
mailing list