From 3654b5dd7fc3200a1b72bac39de9680bc74e3031 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 30 May 2010 23:00:30 +0000 Subject: disser update (30may10) git-svn-id: svn://tug.org/texlive/trunk@18627 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/disser/candidate.rtx | 42 ++++++++++++++---------- 1 file changed, 25 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/latex/disser/candidate.rtx') diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx index b77557a5881..136fd656f41 100644 --- a/Master/texmf-dist/tex/latex/disser/candidate.rtx +++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx @@ -6,7 +6,7 @@ %% %% candidate.dtx (with options: `candidate') %% -%% Copyright (c) 2004-2009 Stanislav Kruchinin. +%% Copyright (c) 2004-2010 Stanislav Kruchinin. %% All rights reserved. %% %% This file is part of the disser package. @@ -14,6 +14,10 @@ \ProvidesFile{candidate.rtx} +\newcommand\candidate@the{\default@the} +\candidate@the + +\if@titlepage\renewcommand\maketitle{ \newlength\firstskip \ifDis@libcat \setlength\firstskip{2ex} @@ -25,9 +29,6 @@ \deflength\fourthskip{1cm} \deflength\fifthskip{1cm} \deflength\sixthskip{0cm} -\deflength\seventhskip{0cm} - -\deflength\@sahshift{8cm} \def\titlefont{\normalsize} \def\topicfont{\Large\bfseries} @@ -55,28 +56,35 @@ \vskip\thirdskip\normalfont {\topicfont\@topic\par} \vskip\fourthskip\normalfont - {\specfont\@specnum~--\ \@spec} + {\specfont\@specnum~--\ \@spec}\\[-6pt] + \ifx\@specsndnum\empty\else + {\specfont\@specsndnum~--\ \@specsnd} + \fi \vskip\fifthskip\normalfont {\titlefont\@title} \end{center} -\vskip\sixthskip\normalfont -\begin{tabbing} - \hspace{\@sahshift}\={\saname}\\ - \>\@sastatus\\ - \>\@sa -\end{tabbing} +\ifx\@sa\empty\else + \vskip\sixthskip\normalfont + \disserfield{sa} +\fi +\ifx\@sasnd\empty\else + \vskip\sixthskip\normalfont + \disserfield{sasnd} +\fi \ifx\@scon\empty\else - \vskip\seventhskip\normalfont - \begin{tabbing} - \hspace{\@sahshift}\={\sconname}\\ - \>\@sconstatus\\ - \>\@scon - \end{tabbing} + \vskip\sixthskip\normalfont + \disserfield{scon} +\fi +\ifx\@sconsnd\empty\else + \vskip\sixthskip\normalfont + \disserfield{sconsnd} \fi \vfill \begin{center} {\@city\cdsep\@date} \end{center} +\normalfont\clearpage +}\fi \endinput %% %% End of file `candidate.rtx'. -- cgit v1.2.3