disser (23nov12)

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

9 files changed, 27 insertions, 25 deletions

diff --git a/Master/texmf-dist/tex/latex/disser/autoref.rtx b/Master/texmf-dist/tex/latex/disser/autoref.rtx
index 65ebf58accd..5a88970eedc 100644
--- a/Master/texmf-dist/tex/latex/disser/autoref.rtx
+++ b/Master/texmf-dist/tex/latex/disser/autoref.rtx
@@ -30,7 +30,7 @@
 \def\specfont{\normalsize}
 
 \thispagestyle{empty}
-\enlargethispage{2cm}
+\enlargethispage{1cm}
 \vspace*{-2cm}
 \begin{center}
 \instfont\@institution\par
diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx
index c60628dd4a5..9b6eead2b76 100644
--- a/Master/texmf-dist/tex/latex/disser/bachelor.rtx
+++ b/Master/texmf-dist/tex/latex/disser/bachelor.rtx
@@ -52,7 +52,7 @@
 \def\workname{\CYRR\cyra\cyrb\cyro\cyrt\cyra}
 
 \thispagestyle{empty}
-\enlargethispage{2cm}
+\enlargethispage{1cm}
 \vspace*{-2cm}
 \begin{center}%
   {\instfont\@institution}
diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx
index 8a0a6dde30b..b0b85c1f0bf 100644
--- a/Master/texmf-dist/tex/latex/disser/candidate.rtx
+++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx
@@ -53,13 +53,11 @@
 \def\specfont{\normalsize}
 
 \thispagestyle{empty}
-\enlargethispage{2cm}
+\enlargethispage{1cm}
 \vspace*{-2cm}
-
 \begin{center}
   \instfont\@institution\par
 \end{center}
-
 \vskip\firstskip
 \begin{flushright}
   \ifDis@classified\classify\fi
@@ -87,10 +85,12 @@
   \vskip\sixthskip\disserfield{sasnd}
 \fi
 \ifx\@scon\empty\else
-  \vskip\sixthskip\disserfield{scon}
+  \vskip\sixthskip
+  \disserfield{scon}
 \fi
 \ifx\@sconsnd\empty\else
-  \vskip\sixthskip\disserfield{sconsnd}
+  \vskip\sixthskip
+  \disserfield{sconsnd}
 \fi
 \vfill
 \begin{center}
diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls
index fd4314afa55..e46edad9b4e 100644
--- a/Master/texmf-dist/tex/latex/disser/disser.cls
+++ b/Master/texmf-dist/tex/latex/disser/disser.cls
@@ -44,7 +44,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2011/11/29 1.1.9 Document class for dissertations]
+\ProvidesClass{disser}[2012/11/29 1.2.0 Document class for dissertations]
 
 \RequirePackage{kvoptions}
 
@@ -298,7 +298,7 @@
 \newcommand\doublespacing {\renewcommand\baselinestretch{2}\normalsize}
 \onehalfspacing
 
-\setlength\parindent{1cm}
+\setlength\parindent{5ex}
 
 \setlength\parskip{0\p@ \@plus \p@}
 
@@ -1200,11 +1200,11 @@
 
 \let\ps@plain=\ps@footcenter
 
-\pagestyle{plain}
+\pagestyle{headcenter}
 
 \def\chapterpagestyle#1{\gdef\@chapterpagestyle{#1}}
 
-\chapterpagestyle{plain}
+\chapterpagestyle{headcenter}
 \pagenumbering{arabic}
 \if@twoside\else\raggedbottom\fi
 \if@twocolumn
diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx
index 2aafc746afd..09c90d59ba4 100644
--- a/Master/texmf-dist/tex/latex/disser/doctor.rtx
+++ b/Master/texmf-dist/tex/latex/disser/doctor.rtx
@@ -49,13 +49,12 @@
 \def\specfont{\normalsize}
 
 \thispagestyle{empty}
-\enlargethispage{2cm}
+\enlargethispage{1cm}
 \vspace*{-2cm}
-
 \begin{center}
   \instfont\@institution\par
 \end{center}
-\vskip\firstskip\normalfont
+\vskip\firstskip
 \begin{flushright}
   \ifDis@classified\classify\fi
   \asmanuscript\\
@@ -63,24 +62,24 @@
   \ifDis@libcat\libcatname\ \@libcatnum\fi
 \end{flushright}
 \begin{center}
-  \vskip\secondskip\normalfont
+  \vskip\secondskip
   {\authorfont\@author}
-  \vskip\thirdskip\normalfont
+  \vskip\thirdskip
   {\topicfont\@topic\par}
-  \vskip\fourthskip\normalfont
+  \vskip\fourthskip
   {\specfont\@specnum~--\ \@spec}\\[-6pt]
   \ifx\@specsndnum\empty\else
     {\specfont\@specsndnum~--\ \@specsnd}
   \fi
-  \vskip\fifthskip\normalfont
+  \vskip\fifthskip
   {\titlefont\@title}
 \end{center}
 \ifx\@scon\empty\else
-  \vskip\sixthskip\normalfont
+  \vskip\sixthskip
   \disserfield{scon}
 \fi
 \ifx\@sconsnd\empty\else
-  \vskip\sixthskip\normalfont
+  \vskip\sixthskip
   \disserfield{sconsnd}
 \fi
 \vfill
diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls
index f8054ea7afb..8a9960f04e4 100644
--- a/Master/texmf-dist/tex/latex/disser/gost732.cls
+++ b/Master/texmf-dist/tex/latex/disser/gost732.cls
@@ -12,7 +12,7 @@
 %% This file is part of the disser package.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{gost732}[2011/11/29 1.1.9 GOST 7.32-2001 implementation]
+\ProvidesClass{gost732}[2012/11/21 1.2.0 GOST 7.32-2001 implementation]
 
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}}
 \ProcessOptions\relax
diff --git a/Master/texmf-dist/tex/latex/disser/master.rtx b/Master/texmf-dist/tex/latex/disser/master.rtx
index 043208fcf02..c78f985c04d 100644
--- a/Master/texmf-dist/tex/latex/disser/master.rtx
+++ b/Master/texmf-dist/tex/latex/disser/master.rtx
@@ -51,7 +51,7 @@
 \def\topicfont{\large\bfseries}
 
 \thispagestyle{empty}
-\enlargethispage{2cm}
+\enlargethispage{1cm}
 \vspace*{-2cm}
 \begin{center}
 \instfont\@institution\par
diff --git a/Master/texmf-dist/tex/latex/disser/specialist.rtx b/Master/texmf-dist/tex/latex/disser/specialist.rtx
index 6006dbde8de..c3bbfbe51e9 100644
--- a/Master/texmf-dist/tex/latex/disser/specialist.rtx
+++ b/Master/texmf-dist/tex/latex/disser/specialist.rtx
@@ -59,7 +59,7 @@
 \def\workname{\CYRR\cyra\cyrb\cyro\cyrt\cyra}
 
 \thispagestyle{empty}
-\enlargethispage{2cm}
+\enlargethispage{1cm}
 \vspace*{-2cm}
 \begin{center}
   {\instfont\@institution}
diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
index fe47de01536..0cecf30416e 100644
--- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx
+++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
@@ -126,14 +126,17 @@
 \providecommand*\conclusion{\nchapter{\conclusionname}}
 \providecommand*\defsname{%
 {\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ %
-\cyri\cyrs\cyrp\cyro\cyrl\cyrsftsn\cyrz\cyru\cyre\cyrm\cyrery\cyrh\ %
+\cyrs\cyro\cyrk\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrishrt\ \cyri\ %
+\cyru\cyrs\cyrl\cyro\cyrv\cyrn\cyrery\cyrh\ %
 \cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri\cyrishrt}
 }
 \providecommand*\defs{\nchapter{\defsname}}
-
 \providecommand*\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ %
 \cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery}
 \providecommand*\review{\nchapter{\reviewname}}
+\providecommand*\dictname{\cyr\CYRS\cyrl\cyro\cyrv\cyra\cyrr\cyrsftsn\ %
+\cyrt\cyre\cyrr\cyrm\cyri\cyrn\cyro\cyrv}
+\providecommand*\dict{\nchapter{\dictname}}
 
 \deflength\fieldhshift{8cm}