disser update (30may10)

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

1 files changed, 16 insertions, 9 deletions

diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx
index b54bf6cd310..867652075c5 100644
--- a/Master/texmf-dist/tex/latex/disser/doctor.rtx
+++ b/Master/texmf-dist/tex/latex/disser/doctor.rtx
@@ -6,7 +6,7 @@
 %%
 %% doctor.dtx  (with options: `doctor')
 %% 
-%% 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{doctor.rtx}
 
+\newcommand\doctor@the{\default@the}
+\doctor@the
+
+\if@titlepage\renewcommand\maketitle{
 \newlength\firstskip
 \ifDis@libcat
   \setlength\firstskip{1ex}
@@ -26,8 +30,6 @@
 \deflength\fifthskip{1cm}
 \deflength\sixthskip{0cm}
 
-\deflength\@sahshift{8cm}
-
 \def\titlefont{\normalsize}
 \def\topicfont{\Large\bfseries}
 \def\authorfont{\large}
@@ -53,22 +55,27 @@
   \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}
 \ifx\@scon\empty\else
   \vskip\sixthskip\normalfont
-  \begin{tabbing}
-    \hspace{\@sahshift}\={\sconname}\\
-    \>\@sconstatus\\
-    \>\@scon
-  \end{tabbing}
+  \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 `doctor.rtx'.