diff --git a/doc/latex/uosdocs/uosdocs.pdf b/doc/latex/uosdocs/uosdocs.pdf index caaa2e2177192425e44e903cc89eb9c982351810..84db70ac616cf1bf652a6b50ce8b2a479ceb2c60 100644 Binary files a/doc/latex/uosdocs/uosdocs.pdf and b/doc/latex/uosdocs/uosdocs.pdf differ diff --git a/source/latex/uosdocs/uosdocs.dtx b/source/latex/uosdocs/uosdocs.dtx index 7fa4b946778630e1e30da1a67492ec7067e7d515..8397fff3f4b542fa48060791c327abbcd67c7400 100644 --- a/source/latex/uosdocs/uosdocs.dtx +++ b/source/latex/uosdocs/uosdocs.dtx @@ -27,7 +27,7 @@ \ProvidesFile{uosdocs.drv} %</driver> %<*thesis|minithesis|progress|project|report|article|gdp|gdpsummary|driver> - [2018/12/20 v2.0 + [2019/02/27 v2.1 %</thesis|minithesis|progress|project|report|article|gdp|gdpsummary|driver> %<thesis|minithesis|progress|project|report|article|gdp|gdpsummary> LaTeX document class] % \end{macrocode} @@ -574,12 +574,18 @@ % % The various elements of the documents are defined % as control sequences to make it easy to customize this -% style for other parts of the University. +% style for other parts of the University. When the +% command is run the other terms are defined by the args. +% +% The examiner and supervisor commands can be puralised +% so that it can print "Supervisors:". This is with an +% optional argument. [s] which will add and ``s'' to the +% word "Supervisor" % % \begin{macrocode} %% --------------------- Organisational Structure ---------------------- -\newcommand*{\supervisor}[1]{\def\supname{#1}} -\newcommand*{\examiner}[1]{\def\examname{#1}} +\newcommand*{\supervisor}[2][]{\def\supname{#2}\def\supplural{#1}} +\newcommand*{\examiner}[2][]{\def\examname{#2}\def\examplural{#1}} \newcommand*{\degree}[1]{\def\degreename{#1}} \newcommand*{\authors}[1]{\def\authornames{#1}} \newcommand*{\qualifications}[1]{\def\quals{#1}} @@ -743,8 +749,8 @@ %</gdpsummary> %<*minithesis|progress|project|gdp|gdpsummary> \vfill - {\normalsize Supervisor: \supname \par} - {\normalsize Examiner: \examname \par} + {\normalsize Supervisor\supplural: \supname \par} + {\normalsize Examiner\examplural: \examname \par} \vfill \hspace{6mm}\parbox[t][51mm][s]{89mm}{ \center @@ -1069,7 +1075,7 @@ \addcontentsline{toc}{section}{#1}} %</article> % \end{macrocode} -% \end{\macro} +% \end{macro} % \subsubsection{Table of Contents} % % \begin{macro}{\tableofcontents} @@ -1485,7 +1491,9 @@ Data: Author (Year) Title. URI [dataset]} \addresses {\groupname\\\deptname\\\univname} \date {\today} %<*testminithesis|testprogress|testproject|testgdp|testgdpsummary> +% \supervisor[s] {Mr Beavis and Mrs S Supervisor} \supervisor {Mr Beavis} +% \examiner[s] {Dr Butthead and Dr A.N. Other} \examiner {Dr Butthead} %</testminithesis|testprogress|testproject|testgdp|testgdpsummary> %<*testproject> diff --git a/tex/latex/uosdocs/uosarticle.cls b/tex/latex/uosdocs/uosarticle.cls index 7d2f5b6740b62a3228e0a9f4a7b91710b2e2a972..e2d1fb1e3d93b6753759e0df8e9aa15a4eeefa93 100644 --- a/tex/latex/uosdocs/uosarticle.cls +++ b/tex/latex/uosdocs/uosarticle.cls @@ -154,8 +154,8 @@ \let\\\space } %% --------------------- Organisational Structure ---------------------- -\newcommand*{\supervisor}[1]{\def\supname{#1}} -\newcommand*{\examiner}[1]{\def\examname{#1}} +\newcommand*{\supervisor}[2][]{\def\supname{#2}\def\supplural{#1}} +\newcommand*{\examiner}[2][]{\def\examname{#2}\examplural{#1}} \newcommand*{\degree}[1]{\def\degreename{#1}} \newcommand*{\authors}[1]{\def\authornames{#1}} \newcommand*{\qualifications}[1]{\def\quals{#1}} diff --git a/tex/latex/uosdocs/uosgdp.cls b/tex/latex/uosdocs/uosgdp.cls index d65945c1171164dfec553044edcb6af5e4b5b247..ac6da171ee1cd309038d6879f70dd48a4256878f 100644 --- a/tex/latex/uosdocs/uosgdp.cls +++ b/tex/latex/uosdocs/uosgdp.cls @@ -154,8 +154,8 @@ \let\\\space } %% --------------------- Organisational Structure ---------------------- -\newcommand*{\supervisor}[1]{\def\supname{#1}} -\newcommand*{\examiner}[1]{\def\examname{#1}} +\newcommand*{\supervisor}[2][]{\def\supname{#2}\def\supplural{#1}} +\newcommand*{\examiner}[2][]{\def\examname{#2}\examplural{#1}} \newcommand*{\degree}[1]{\def\degreename{#1}} \newcommand*{\authors}[1]{\def\authornames{#1}} \newcommand*{\qualifications}[1]{\def\quals{#1}} @@ -222,8 +222,8 @@ {\large A group design project report submitted for} {\large the award of \par \degreename \par} \vfill - {\normalsize Supervisor: \supname \par} - {\normalsize Examiner: \examname \par} + {\normalsize Supervisor\supplural: \supname \par} + {\normalsize Examiner\examplural: \examname \par} \vfill \hspace{6mm}\parbox[t][51mm][s]{89mm}{ \center diff --git a/tex/latex/uosdocs/uosgdpsummary.cls b/tex/latex/uosdocs/uosgdpsummary.cls index 83e2a41abeaa532f08cedb96d5eca57213e46cb6..7f1bc486bc3a5b5091031670f6aa608d8b587a8c 100644 --- a/tex/latex/uosdocs/uosgdpsummary.cls +++ b/tex/latex/uosdocs/uosgdpsummary.cls @@ -152,8 +152,8 @@ \let\\\space } %% --------------------- Organisational Structure ---------------------- -\newcommand*{\supervisor}[1]{\def\supname{#1}} -\newcommand*{\examiner}[1]{\def\examname{#1}} +\newcommand*{\supervisor}[2][]{\def\supname{#2}\def\supplural{#1}} +\newcommand*{\examiner}[2][]{\def\examname{#2}\examplural{#1}} \newcommand*{\degree}[1]{\def\degreename{#1}} \newcommand*{\authors}[1]{\def\authornames{#1}} \newcommand*{\qualifications}[1]{\def\quals{#1}} @@ -220,8 +220,8 @@ {\large A group design project summary report submitted} {\large for the award of \par \degreename \par} \vfill - {\normalsize Supervisor: \supname \par} - {\normalsize Examiner: \examname \par} + {\normalsize Supervisor\supplural: \supname \par} + {\normalsize Examiner\examplural: \examname \par} \vfill \hspace{6mm}\parbox[t][51mm][s]{89mm}{ \center diff --git a/tex/latex/uosdocs/uosminithesis.cls b/tex/latex/uosdocs/uosminithesis.cls index 258247669d8e184a9273e596b83d8dd8696b2306..1990b08bacdb2352f47639c8be2ce781a3b59c41 100644 --- a/tex/latex/uosdocs/uosminithesis.cls +++ b/tex/latex/uosdocs/uosminithesis.cls @@ -154,8 +154,8 @@ \let\\\space } %% --------------------- Organisational Structure ---------------------- -\newcommand*{\supervisor}[1]{\def\supname{#1}} -\newcommand*{\examiner}[1]{\def\examname{#1}} +\newcommand*{\supervisor}[2][]{\def\supname{#2}\def\supplural{#1}} +\newcommand*{\examiner}[2][]{\def\examname{#2}\examplural{#1}} \newcommand*{\degree}[1]{\def\degreename{#1}} \newcommand*{\authors}[1]{\def\authornames{#1}} \newcommand*{\qualifications}[1]{\def\quals{#1}} @@ -223,8 +223,8 @@ {\large A mini-thesis submitted for transfer from} {\large MPhil to PhD \par} \vfill - {\normalsize Supervisor: \supname \par} - {\normalsize Examiner: \examname \par} + {\normalsize Supervisor\supplural: \supname \par} + {\normalsize Examiner\examplural: \examname \par} \vfill \hspace{6mm}\parbox[t][51mm][s]{89mm}{ \center diff --git a/tex/latex/uosdocs/uosprogress.cls b/tex/latex/uosdocs/uosprogress.cls index ecbe0c24f759bf3976e00a3bc4231073eee032e2..c23ccc83f36ce2ca1fbaabb9f1c1d17f9e7cedbd 100644 --- a/tex/latex/uosdocs/uosprogress.cls +++ b/tex/latex/uosdocs/uosprogress.cls @@ -154,8 +154,8 @@ \let\\\space } %% --------------------- Organisational Structure ---------------------- -\newcommand*{\supervisor}[1]{\def\supname{#1}} -\newcommand*{\examiner}[1]{\def\examname{#1}} +\newcommand*{\supervisor}[2][]{\def\supname{#2}\def\supplural{#1}} +\newcommand*{\examiner}[2][]{\def\examname{#2}\examplural{#1}} \newcommand*{\degree}[1]{\def\degreename{#1}} \newcommand*{\authors}[1]{\def\authornames{#1}} \newcommand*{\qualifications}[1]{\def\quals{#1}} @@ -223,8 +223,8 @@ {\large A progress report submitted for continuation} {\large towards a PhD \par} \vfill - {\normalsize Supervisor: \supname \par} - {\normalsize Examiner: \examname \par} + {\normalsize Supervisor\supplural: \supname \par} + {\normalsize Examiner\examplural: \examname \par} \vfill \hspace{6mm}\parbox[t][51mm][s]{89mm}{ \center diff --git a/tex/latex/uosdocs/uosproject.cls b/tex/latex/uosdocs/uosproject.cls index 989d42fe12e0d9f9eb9143ca0b71346c473f8cca..d479ffc852252b1622d3aed5d4353f6b16c742af 100644 --- a/tex/latex/uosdocs/uosproject.cls +++ b/tex/latex/uosdocs/uosproject.cls @@ -154,8 +154,8 @@ \let\\\space } %% --------------------- Organisational Structure ---------------------- -\newcommand*{\supervisor}[1]{\def\supname{#1}} -\newcommand*{\examiner}[1]{\def\examname{#1}} +\newcommand*{\supervisor}[2][]{\def\supname{#2}\def\supplural{#1}} +\newcommand*{\examiner}[2][]{\def\examname{#2}\examplural{#1}} \newcommand*{\degree}[1]{\def\degreename{#1}} \newcommand*{\authors}[1]{\def\authornames{#1}} \newcommand*{\qualifications}[1]{\def\quals{#1}} @@ -223,8 +223,8 @@ {\large A project report submitted for the} {\large award of \par \degreename \par} \vfill - {\normalsize Supervisor: \supname \par} - {\normalsize Examiner: \examname \par} + {\normalsize Supervisor\supplural: \supname \par} + {\normalsize Examiner\examplural: \examname \par} \vfill \hspace{6mm}\parbox[t][51mm][s]{89mm}{ \center diff --git a/tex/latex/uosdocs/uosreport.cls b/tex/latex/uosdocs/uosreport.cls index ba23b9d1e4d45fc3a0b8aa76fd13fb43db1e70f6..0b10ba8654b9f510ac85955b669172dfb5ca13da 100644 --- a/tex/latex/uosdocs/uosreport.cls +++ b/tex/latex/uosdocs/uosreport.cls @@ -154,8 +154,8 @@ \let\\\space } %% --------------------- Organisational Structure ---------------------- -\newcommand*{\supervisor}[1]{\def\supname{#1}} -\newcommand*{\examiner}[1]{\def\examname{#1}} +\newcommand*{\supervisor}[2][]{\def\supname{#2}\def\supplural{#1}} +\newcommand*{\examiner}[2][]{\def\examname{#2}\examplural{#1}} \newcommand*{\degree}[1]{\def\degreename{#1}} \newcommand*{\authors}[1]{\def\authornames{#1}} \newcommand*{\qualifications}[1]{\def\quals{#1}} diff --git a/tex/latex/uosdocs/uosthesis.cls b/tex/latex/uosdocs/uosthesis.cls index 92bc5495102269e7b1490b8fb19f4ac374e133c5..adb2b084676b5139d6431bee93dee68ebf56ed66 100644 --- a/tex/latex/uosdocs/uosthesis.cls +++ b/tex/latex/uosdocs/uosthesis.cls @@ -158,8 +158,8 @@ \let\\\space } %% --------------------- Organisational Structure ---------------------- -\newcommand*{\supervisor}[1]{\def\supname{#1}} -\newcommand*{\examiner}[1]{\def\examname{#1}} +\newcommand*{\supervisor}[2][]{\def\supname{#2}\def\supplural{#1}} +\newcommand*{\examiner}[2][]{\def\examname{#2}\examplural{#1}} \newcommand*{\degree}[1]{\def\degreename{#1}} \newcommand*{\authors}[1]{\def\authornames{#1}} \newcommand*{\qualifications}[1]{\def\quals{#1}}