1 files changed, 62 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/latex/rutitlepage/rutitlepage.sty b/Master/texmf-dist/tex/latex/rutitlepage/rutitlepage.sty
index 74876af11b1..3d25a62cb62 100644
--- a/Master/texmf-dist/tex/latex/rutitlepage/rutitlepage.sty
+++ b/Master/texmf-dist/tex/latex/rutitlepage/rutitlepage.sty
@@ -19,38 +19,60 @@
 %% and version 1.3 or later is part of all distributions of
 %% LaTeX version 2005/12/01 or later.
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{rutitlepage}[2017/05/30 Mart Lubbers]
+\ProvidesPackage{rutitlepage}[2017/09/07 Mart Lubbers]
 \RequirePackage{geometry,graphicx,ifpdf,keyval,iflang}
-\def\@rutitletitle{\@title}
-\def\@rutitledate{\@date}
 \def\@rutitleauthors{\@author}
-\def\@rutitlepagenr{\thepage}
-\define@key{maketitleru}{authorstext}{\def\@rutitleauthorstext{#1}}
+\def\@rutitleauthorstext{Aut\IfLanguageName{dutch}{eu}{ho}r:}
+\def\@rutitledate{\@date}
+\def\@rutitleinst{Radboud Universit\IfLanguageName{dutch}{eit}{y} Nijmegen}
+\def\@rutitletitle{\@title}
+\def\@rutitlelayout{seventeen}
+\newif\if@rutitlecolour\@rutitlecolourfalse
 \define@key{maketitleru}{authors}{\def\@rutitleauthors{#1}}
+\define@key{maketitleru}{authorstext}{\def\@rutitleauthorstext{#1}}
+\define@key{maketitleru}{colour}[true]{\@rutitlecolourtrue}
 \define@key{maketitleru}{course}{\def\@rutitlecourse{#1}}
 \define@key{maketitleru}{date}{\def\@rutitledate{#1}}
-\define@key{maketitleru}{institute}{\def\@rutitleinst{#1}}
-\define@key{maketitleru}{pagenr}{\def\@rutitlepagenr{#1}}
-\define@key{maketitleru}{righttextBheader}{\def\@rutitlerighttextbheader{#1}}
-\define@key{maketitleru}{righttextB}{\def\@rutitlerighttextb{#1}}
-\define@key{maketitleru}{righttextheader}{\def\@rutitlerighttextheader{#1}}
-\define@key{maketitleru}{righttext}{\def\@rutitlerighttext{#1}}
+\define@key{maketitleru}{institution}{\def\@rutitleinst{#1}}
+\define@key{maketitleru}{layout}{\def\@rutitlelayout{#1}}
+\define@key{maketitleru}{nextpagenr}{\def\@rutitlenextpagenr{#1}}
+\define@key{maketitleru}{others}{\def\@rutitleothers{#1}}
 \define@key{maketitleru}{subtitle}{\def\@rutitlesubtitle{#1}}
 \define@key{maketitleru}{title}{\def\@rutitletitle{#1}}
-\setkeys{maketitleru}{%
-course={},
-institute={Radboud Universit\IfLanguageName{dutch}{eit}{y} Nijmegen},
-authorstext={\IfLanguageName{dutch}{Auteurs: }{Authors:}},
-righttextheader={},
-righttext={}
+\newcommand*{\rutitlepage@printothers}[2]{\textit{#1}\\#2}
+\newcommand*{\rutitlepage@sepothers}{\\[\baselineskip]}
+\newcommand*{\rutitlepage@others}[2]{%
+\rutitlepage@printothers{#1}{#2}%
+\kernel@ifnextchar,{\rutitlepage@sepothers\rutitlepage@otherslist@}\relax}
+\newcommand*{\rutitlepage@otherslist}[1]{%
+\expandafter\rutitlepage@others#1}
+\def\rutitlepage@otherslist@,#1{\rutitlepage@otherslist{{#1}}}
+\newcommand{\rutitle@layout@seventeen}[0]{
+\newgeometry{left=25mm,top=25mm,right=15mm,bottom=10mm,hmarginratio=1:1}
+\begin{titlepage}%
+\null\vfill%
+\parindent0pt
+{\Huge\bfseries\@rutitletitle}%
+\ifdefined\@rutitlesubtitle{\\[2\baselineskip]\large\it\@rutitlesubtitle}\fi\\[4\baselineskip]
+{\Large\sc\@rutitleauthors}\\[\baselineskip]
+{\large\@rutitledate}
+\vfill
+
+\ifdefined\@rutitleothers\rutitlepage@otherslist\@rutitleothers\fi
+\vfill
+
+\hfill
+\ifpdf\includegraphics[width=80mm]{logo-\IfLanguageName{dutch}{nl-}{}\if@rutitlecolour cmyk\else bw\fi.pdf}\\
+\else\includegraphics[width=80mm]{logo-\IfLanguageName{dutch}{nl-}{}\if@rutitlecolour cmyk\else bw\fi.eps}\\
+\fi
+\end{titlepage}
+\restoregeometry%
 }
-\newcommand{\maketitleru}[1][]{
-\setkeys{maketitleru}{#1}
+\newcommand{\rutitle@layout@traditional}[0]{
 \newgeometry{hmarginratio=1:1}
 \begin{titlepage}
-\setcounter{page}{\@rutitlepagenr}
 \begin{center}
-\textsc{\LARGE\@rutitlecourse}\\[1.5cm]
+\ifdefined\@rutitlecourse\textsc{\LARGE\@rutitlecourse}\\[1.5cm]\fi
 \ifpdf\includegraphics[height=150pt]{logo.pdf}\\
 \else\includegraphics[height=150pt]{logo.eps}\\
 \fi
@@ -74,28 +96,32 @@ righttext={}
 \end{minipage}
 \begin{minipage}[t]{0.45\textwidth}
 \begin{flushright}\large
-\textit{\@rutitlerighttextheader}\\
-\@rutitlerighttext%
-\end{flushright}
-\end{minipage}
+\ifdefined\@rutitleothers
+\renewcommand{\rutitlepage@printothers}[2]{\textit{##1}\\##2}
+\renewcommand{\rutitlepage@sepothers}[0]{
 
-\vspace{1cm}
-\ifdefined\@rutitlerighttextb
-\begin{minipage}[t]{0.45\textwidth}
-~
-\end{minipage}
-\begin{minipage}[t]{0.45\textwidth}
-\begin{flushright}\large
-\textit{\@rutitlerighttextbheader}\\
-\@rutitlerighttextb%
+\vspace{8mm}}
+\rutitlepage@otherslist\@rutitleothers
+\fi
 \end{flushright}
 \end{minipage}
-\fi
 \vfill
 {\large\@rutitledate}
 \end{center}
 \end{titlepage}
-\restoregeometry{}
+\restoregeometry%
+}
+\newcommand{\maketitleru}[1][]{
+\setkeys{maketitleru}{#1}
+\ifcsname rutitle@layout@\@rutitlelayout\endcsname
+\expandafter\csname rutitle@layout@\@rutitlelayout\endcsname
+\else
+\PackageError{rutitlepage}
+{Unknown layout `\@rutitlelayout'.}
+{The `layout' key of \maketitleru\space contained an unknown layout.\MessageBreak{}
+ Check the package documentation for the possible layouts.}
+\fi
+\ifdefined\@rutitlenextpagenr\setcounter{page}{\@rutitlenextpagenr}\fi%
 }
 \endinput
 %%