disser (19aug15)

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

3 files changed, 18 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx
index 9a6cffe1468..bb70e2d8cef 100644
--- a/Master/texmf-dist/tex/latex/disser/candidate.rtx
+++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx
@@ -46,6 +46,8 @@
 \ifundeflength\fourthskip{1cm}
 \ifundeflength\fifthskip{1cm}
 \ifundeflength\sixthskip{0cm}
+\ifundeflength\specskip{-6pt}
+\ifundeflength\saskip{0pt}
 
 \def\titlefont{\normalsize}
 \def\topicfont{\Large\bfseries}
@@ -71,9 +73,10 @@
   \vskip\thirdskip
   {\topicfont\@topic\par}
   \vskip\fourthskip
-  {\specfont\@specnum~--\ \@spec}\\[-6pt]
+  {\specfont\@specnum~--\ \@spec}
   \ifx\@specsndnum\empty\else
-    {\specfont\@specsndnum~--\ \@specsnd}
+    \vskip\specskip
+{\specfont\@specsndnum~--\ \@specsnd}
   \fi
   \vskip\fifthskip
   {\titlefont\@title}
@@ -82,14 +85,14 @@
   \vskip\sixthskip\disserfield{sa}
 \fi
 \ifx\@sasnd\empty\else
-  \vskip\sixthskip\disserfield{sasnd}
+  \vskip\saskip\disserfield{sasnd}
 \fi
 \ifx\@scon\empty\else
-  \vskip\sixthskip
+  \vskip\saskip
   \disserfield{scon}
 \fi
 \ifx\@sconsnd\empty\else
-  \vskip\sixthskip
+  \vskip\saskip
   \disserfield{sconsnd}
 \fi
 \vfill
diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls
index 33b9aab64a3..e7aa503146c 100644
--- a/Master/texmf-dist/tex/latex/disser/disser.cls
+++ b/Master/texmf-dist/tex/latex/disser/disser.cls
@@ -27,7 +27,7 @@
 %%
 %% disser -- LaTeX document class for dissertations.
 %%
-%% Copyright (c) 2004-2014 Stanislav Kruchinin
+%% Copyright (c) Stanislav Kruchinin
 %%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2015/01/03 1.3.1 %
+\ProvidesClass{disser}[2015/07/25 1.3.2 %
   Document class for dissertations]
 
 \RequirePackage{kvoptions}
@@ -295,10 +295,10 @@
 \setlength\lineskip{1\p@}
 \setlength\normallineskip{1\p@}
 
-\newcommand\singlespacing {\renewcommand\baselinestretch{1}\normalsize}
-\newcommand\onehalfspacing{\renewcommand\baselinestretch{1.5}\normalsize}
-\newcommand\doublespacing {\renewcommand\baselinestretch{2}\normalsize}
-\onehalfspacing
+\newcommand\disser@singlespacing {\renewcommand\baselinestretch{1}\normalsize}
+\newcommand\disser@onehalfspacing{\renewcommand\baselinestretch{1.5}\normalsize}
+\newcommand\disser@doublespacing {\renewcommand\baselinestretch{2}\normalsize}
+\disser@onehalfspacing
 
 \setlength\parindent{5ex}
 
@@ -1225,6 +1225,7 @@
   \newcommand\topicfont{\large\bfseries}
   \newcommand\instfont{\normalfont}
   \newcommand\cdsep{~-- }
+
   \newcommand\maketitle{}
   \setcounter{footnote}{0}
 \else
diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx
index 8a3caeca64d..6465a3d7596 100644
--- a/Master/texmf-dist/tex/latex/disser/doctor.rtx
+++ b/Master/texmf-dist/tex/latex/disser/doctor.rtx
@@ -42,6 +42,7 @@
 \ifundeflength\fourthskip{1cm}
 \ifundeflength\fifthskip{1cm}
 \ifundeflength\sixthskip{0cm}
+\ifundeflength\specskip{-6pt}
 
 \def\titlefont{\normalsize}
 \def\topicfont{\Large\bfseries}
@@ -67,8 +68,9 @@
   \vskip\thirdskip
   {\topicfont\@topic\par}
   \vskip\fourthskip
-  {\specfont\@specnum~--\ \@spec}\\[-6pt]
+  {\specfont\@specnum~--\ \@spec}
   \ifx\@specsndnum\empty\else
+    \vskip\specskip
     {\specfont\@specsndnum~--\ \@specsnd}
   \fi
   \vskip\fifthskip