disser update (30may10)

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

8 files changed, 155 insertions, 110 deletions

diff --git a/Master/texmf-dist/tex/latex/disser/autoref.rtx b/Master/texmf-dist/tex/latex/disser/autoref.rtx
index 97dbe501e3c..b8a47714c54 100644
--- a/Master/texmf-dist/tex/latex/disser/autoref.rtx
+++ b/Master/texmf-dist/tex/latex/disser/autoref.rtx
@@ -6,7 +6,7 @@
 %%
 %% autoref.dtx  (with options: `autoref')
 %% 
-%% 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{autoref.rtx}
 
+\newcommand\autoref@the{\default@the}
+\autoref@the
+
+\newcommand\maketitle{
 \deflength\firstskip{1cm}
 \deflength\secondskip{2cm}
 \deflength\thirdskip{1cm}
@@ -52,6 +56,8 @@
   \vfill
   {\@city\cdsep\@date}
 \end{center}
+\normalfont\clearpage
+}
 \endinput
 %%
 %% End of file `autoref.rtx'.
diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx
index 89d8d3f22f5..7c73e819c65 100644
--- a/Master/texmf-dist/tex/latex/disser/bachelor.rtx
+++ b/Master/texmf-dist/tex/latex/disser/bachelor.rtx
@@ -6,7 +6,7 @@
 %%
 %% bachelor.dtx  (with options: `bachelor')
 %% 
-%% Copyright (c) 2004-2009 Stanislav Kruchinin.
+%% Copyright (c) 2004-2010 Stanislav Kruchinin.
 %% All rights reserved.
 %% 
 %% This file is part of the disser package.
@@ -14,11 +14,18 @@
 
 \ProvidesFile{bachelor.rtx}
 
+\newcommand\bachelor@the{\default@the}
+\bachelor@the
+
+\if@titlepage\renewcommand\maketitle{
 \deflength\firstskip{1.5cm}
 \deflength\secondskip{1.5cm}
 \deflength\thirdskip{1ex}
 \deflength\fourthskip{1ex}
 \deflength\fifthskip{2cm}
+\deflength\sixthskip{1.5ex}
+
+\setlength\fieldhshift{8.5cm}
 
 \def\titlefont{\Large\bfseries}
 \def\topiclabelfont{\large}
@@ -48,15 +55,16 @@
 
 \vskip\fifthskip\normalfont
 \begin{tabbing}
-  \studentlabel\ \groupname\ \@group\hspace{2cm}\=
-  \makebox[8.5cm][l]{\hrulefill\ \@author}
-\\[9pt]
-  \field{sa}
+  \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip]
+  \ifx\@sa\empty\else\diplomafield{sa}\\[\sixthskip]\fi
+  \ifx\@sasnd\empty\else\diplomafield{sasnd}\\[\sixthskip]\fi
 \end{tabbing}
 \vfill
 \begin{center}
   {\@city\cdsep\@date}
 \end{center}
+\normalfont\clearpage
+}\fi
 \endinput
 %%
 %% End of file `bachelor.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'.
diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls
index 64fb2370b9f..120972cdcf5 100644
--- a/Master/texmf-dist/tex/latex/disser/disser.cls
+++ b/Master/texmf-dist/tex/latex/disser/disser.cls
@@ -18,7 +18,7 @@
 %% toc.dtx  (with options: `toc')
 %% custom.dtx  (with options: `custom')
 %% 
-%% Copyright (c) 2004-2009 Stanislav Kruchinin.
+%% Copyright (c) 2004-2010 Stanislav Kruchinin.
 %% All rights reserved.
 %% 
 %% This file is part of the disser package.
@@ -27,7 +27,7 @@
 %%
 %% disser -- LaTeX document class for dissertations.
 %%
-%% Copyright (c) 2004-2009 Stanislav Kruchinin
+%% Copyright (c) 2004-2010 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}[2009/03/23 1.1.5 Document class for dissertations]
+\ProvidesClass{disser}[2010/05/22 1.1.6 Document class for dissertations]
 
 \RequirePackage{kvoptions}
 
@@ -177,29 +177,23 @@
 
 \DeclareBoolOption[true]{fixint}
 \DeclareBoolOption[false]{colorlinks}
-\DeclareStringOption{titlepagefile}
+\DeclareStringOption{substylefile}
 
 \ExecuteOptions{a4paper,14pt,oneside,titlepage,onecolumn,final,openany,candidate}
 \ProcessKeyvalOptions{Dis}
 \ProcessOptions
 
-\ifx\Dis@titlepagefile\@empty
-  \ifDis@bachelor \renewcommand*{\Dis@titlepagefile}{bachelor.rtx}\fi
-  \ifDis@master   \renewcommand*{\Dis@titlepagefile}{master.rtx}\fi
-  \ifDis@candidate\renewcommand*{\Dis@titlepagefile}{candidate.rtx}\fi
-  \ifDis@doctor   \renewcommand*{\Dis@titlepagefile}{doctor.rtx}\fi
-  \ifDis@autoref  \renewcommand*{\Dis@titlepagefile}{autoref.rtx}\fi
+\ifx\Dis@substylefile\@empty
+  \ifDis@bachelor \renewcommand*{\Dis@substylefile}{bachelor.rtx}\fi
+  \ifDis@master   \renewcommand*{\Dis@substylefile}{master.rtx}\fi
+  \ifDis@candidate\renewcommand*{\Dis@substylefile}{candidate.rtx}\fi
+  \ifDis@doctor   \renewcommand*{\Dis@substylefile}{doctor.rtx}\fi
+  \ifDis@autoref  \renewcommand*{\Dis@substylefile}{autoref.rtx}\fi
 \fi
 
-\DeclareRobustCommand\MakeTextUppercase{%
-  \@uclcnotmath{\def\i{I}\def\j{J}}{##1##2}\uppercase}
+\AtEndOfClass{\input{\Dis@substylefile}}
 
-\protected@edef\MakeTextUppercase#1{\MakeTextUppercase{#1}}
-
-\DeclareRobustCommand\MakeTextLowercase{%
-  \@uclcnotmath{}{##2##1}\lowercase}
-
-\protected@edef\MakeTextLowercase#1{\MakeTextLowercase{#1}}
+\RequirePackage[overload]{textcase}
 
 \def\EC@family#1#2#3#4#5{%
   \DeclareFontShape{#1}{#2}{#3}{#4}%
@@ -301,6 +295,7 @@
 
 \lccode`\-=`\-
 \defaulthyphenchar=127
+\newcommand\today{}
 
 
 %%% From File: counters.dtx
@@ -340,7 +335,7 @@
 \newcommand\toctheparagraph{\theparagraph}
 \newcommand\tocthesubparagraph{\thesubparagraph}
 
-\newcommand\bachelor@the{%
+\newcommand\default@the{%
   \@addtoreset{footnote}{chapter}
   \@addtoreset{equation}{chapter}
 
@@ -354,16 +349,6 @@
     \ifnum \c@chapter>\z@\thechapter.\fi%
     \@arabic\c@figure}
 }
-\newcommand\master@the   \bachelor@the
-\newcommand\candidate@the\bachelor@the
-\newcommand\doctor@the   \candidate@the
-\newcommand\autoref@the  \candidate@the
-
-\ifDis@bachelor \bachelor@the  \fi
-\ifDis@master   \master@the    \fi
-\ifDis@candidate\candidate@the \fi
-\ifDis@doctor   \doctor@the    \fi
-\ifDis@autoref  \autoref@the   \fi
 
 %%% From File: part.dtx
 
@@ -505,9 +490,9 @@
 \def\@chapter[#1]#2{
   \ifnum \c@secnumdepth >\m@ne
     \refstepcounter{chapter}%
-    {\def\\{ }\addcontentsline{toc}{chapter}{\@tocseccntformat{chapter} #1}}%
+    {\addcontentsline{toc}{chapter}{\@tocseccntformat{chapter} #1}}%
   \else
-    {\def\\{ }\addcontentsline{toc}{chapter}{#1}}%
+    {\addcontentsline{toc}{chapter}{#1}}%
   \fi
   \chaptermark{#1}%
   \addtocontents{lof}{\protect\addvspace{10\p@}}%
@@ -1208,8 +1193,6 @@
 \fi
 
 
-\newcommand\today{}
-
 \input{titledefs.rtx}
 
 \if@titlepage
@@ -1218,14 +1201,9 @@
   \newcommand\topicfont{\large\bfseries}
   \newcommand\instfont{\normalfont}
   \newcommand\cdsep{~-- }
-
-  \newcommand\maketitle{
-    \makeatletter
-    \input{\Dis@titlepagefile}
-    \normalfont\clearpage
-  } % \newcommand\maketitle
+  \newcommand\maketitle{}
   \setcounter{footnote}{0}
-\else %\if@titlepage
+\else
   \newcommand\maketitle{%
     \global\let\thanks\relax
     \global\let\maketitle\relax
@@ -1426,7 +1404,6 @@
   \let\citeN\cite
   \let\shortcite\cite
   \let\citeasnoun\cite
-  \ifDis@autoref\setlength\bibsep{0pt}\fi
 }{%
   \def\@noitemerr{\PackageWarning{natbib}{Empty `thebibliography' environment}}
   \endlist\vskip-\lastskip%
@@ -1473,7 +1450,7 @@
   \fi
 \fi
 
-\providecommand\metaphantom[1]{%
+\providecommand\hrefphantom[1]{%
   \ifDis@href
     \Hy@GlobalStepCount\Hy@linkcounter
     \xdef\@currentHref{#1*.\the\Hy@linkcounter}%
@@ -1489,23 +1466,23 @@
   \fi
   \thispagestyle{\@chapterpagestyle}%
   \global\@topnum\z@
-  \metaphantom{chapter}
-  {\def\\{ }\addcontentsline{toc}{chapter}{#1}}%
+  \hrefphantom{chapter}
+  \addcontentsline{toc}{chapter}{#1}%
   \@afterindentfalse
   \@schapter{#1}
 }
 \newcommand\nsection[1]{%
-  \metaphantom{section}%
+  \hrefphantom{section}%
   \addcontentsline{toc}{section}{#1}
   \section*{#1}
 }
 \newcommand\nsubsection[1]{%
-  \metaphantom{subsection}%
+  \hrefphantom{subsection}%
   \addcontentsline{toc}{subsection}{#1}
   \subsection*{#1}
 }
 \newcommand\nsubsubsection[1]{%
-  \metaphantom{subsubsection}%
+  \hrefphantom{subsubsection}%
   \addcontentsline{toc}{subsubsection}{#1}
   \subsubsection*{#1}
 }
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'.
diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls
index 635029c2055..4d2506570a3 100644
--- a/Master/texmf-dist/tex/latex/disser/gost732.cls
+++ b/Master/texmf-dist/tex/latex/disser/gost732.cls
@@ -6,7 +6,7 @@
 %%
 %% gost732.dtx  (with options: `gost732')
 %% 
-%% Copyright (c) 2004-2009 Stanislav Kruchinin.
+%% Copyright (c) 2004-2010 Stanislav Kruchinin.
 %% All rights reserved.
 %% 
 %% This file is part of the disser package.
@@ -15,7 +15,7 @@
 %%
 %% gost732 -- GOST 7.32-2001 implementation.
 %%
-%% Copyright (c) 2004-2009 Stanislav Kruchinin
+%% Copyright (c) 2004-2010 Stanislav Kruchinin
 %%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -32,7 +32,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{gost732}[2009/03/23 1.1.5 GOST 7.32-2001 implementation]
+\ProvidesClass{gost732}[2010/05/22 1.1.6 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 7e2ff5d74dd..78fdc88ec24 100644
--- a/Master/texmf-dist/tex/latex/disser/master.rtx
+++ b/Master/texmf-dist/tex/latex/disser/master.rtx
@@ -6,7 +6,7 @@
 %%
 %% master.dtx  (with options: `master')
 %% 
-%% Copyright (c) 2004-2009 Stanislav Kruchinin.
+%% Copyright (c) 2004-2010 Stanislav Kruchinin.
 %% All rights reserved.
 %% 
 %% This file is part of the disser package.
@@ -14,11 +14,18 @@
 
 \ProvidesFile{master.rtx}
 
+\newcommand\master@the{\default@the}
+\master@the
+
+\if@titlepage\renewcommand\maketitle{
 \deflength\firstskip{1ex}
 \deflength\secondskip{1ex}
 \deflength\thirdskip{1ex}
 \deflength\fourthskip{-1cm}
 \deflength\fifthskip{0ex}
+\deflength\sixthskip{1.5ex}
+
+\setlength\fieldhshift{8.5cm}
 
 \def\titlefont{\Large\bfseries}
 \def\topiclabelfont{\large}
@@ -48,19 +55,20 @@
 \end{tabbing}
 \vskip\fifthskip\normalfont
 \begin{tabbing}
-  \studentlabel\ \groupname\ \@group\hspace{2cm}\=
-  \makebox[8.5cm][l]{\hrulefill\ \@author}
-\\[9pt]
-  \field{sa}
-\\[9pt]
-  \field{rev}
-\\[9pt]
-  \ifdefined\@con\field{con}\fi
+  \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip]
+  \ifx\@sa\empty\else\diplomafield{sa}\\[\sixthskip]\fi
+  \ifx\@sasnd\empty\else\diplomafield{sasnd}\\[\sixthskip]\fi
+  \ifx\@rev\empty\else\diplomafield{rev}\\[\sixthskip]\fi
+  \ifx\@revsnd\empty\else\diplomafield{revsnd}\\[\sixthskip]\fi
+  \ifx\@con\empty\else\diplomafield{con}\\[9pt]\fi
+  \ifx\@consnd\empty\else\diplomafield{consnd}\fi
 \end{tabbing}
 \vfill
 \begin{center}
   {\@city\cdsep\@date}
 \end{center}
+\normalfont\clearpage
+}\fi
 \endinput
 %%
 %% End of file `master.rtx'.
diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
index 7b92d2e143a..61e5958c4ec 100644
--- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx
+++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
@@ -6,7 +6,7 @@
 %%
 %% titledefs.dtx  (with options: `titledefs')
 %% 
-%% Copyright (c) 2004-2009 Stanislav Kruchinin.
+%% Copyright (c) 2004-2010 Stanislav Kruchinin.
 %% All rights reserved.
 %% 
 %% This file is part of the disser package.
@@ -19,41 +19,44 @@
 \cyrl\cyri\cyrs\cyrt}
 \def\keywordsname{\cyr\CYRK\cyrk\cyryu\cyrch\cyre\cyrv\cyrery\cyre\ %
 \cyrs\cyrl\cyro\cyrv\cyra}
-\def\keywordssep{:}
-\def\keywordslabel{\keywordsname\keywordssep}
+\def\keywordslabel{\keywordsname:}
 \def\workname{\cyr\CYRD\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}
 \def\approved{\workname\ \cyrd\cyro\cyrp\cyru\cyrshch\cyre\cyrn\cyra\ %
 \cyrk\ \cyrz\cyra\cyrshch\cyri\cyrt\cyre}
 \def\appos{\cyr\cyrz\cyra\cyrv.\ \cyrk\cyra\cyrf\cyre\cyrd\cyrr\cyro\cyrishrt}
 \def\groupname{\cyr\cyrg\cyrr.}
 \def\topicname{\cyr\CYRT\cyre\cyrm\cyra}
-\def\topicsep{:\ }
-\def\topiclabel{\topicname\topicsep}
+\def\topiclabel{\topicname:\ }
 \def\coursename{\cyr\CYRN\cyra\cyrp\cyrr\cyra\cyrv\cyrl\cyre\cyrn\cyri\cyre}
-\def\coursesep{:}
-\def\courselabel{\coursename\coursesep}
+\def\courselabel{\coursename:}
 \def\specname{%
 \cyr\CYRS\cyrp\cyre\cyrc\cyri\cyra\cyrl\cyrsftsn\cyrn\cyro\cyrs\cyrt\cyrsftsn}
-\def\specsep{:}
-\def\speclabel{\specname\specsep}
+\def\speclabel{\specname:}
 \def\masterprogname{%
 \cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ %
 \cyrp\cyrr\cyro\cyrg\cyrr\cyra\cyrm\cyrm\cyra}
-\def\masterprogsep{:}
-\def\masterproglabel{\masterprogname\masterprogsep}
+\def\masterproglabel{\masterprogname:}
 \def\studentname{\cyr\CYRV\cyrery\cyrp\cyro\cyrl\cyrn\cyri\cyrl\ %
 \cyrs\cyrt\cyru\cyrd\cyre\cyrn\cyrt}
-\def\studentlabel{\studentname}
+\def\studentlabel{\studentname\ \groupname\ \@group\hspace{2cm}}
 \def\saname{\cyr\CYRN\cyra\cyru\cyrch\cyrn\cyrery\cyrishrt\ %
 \cyrr\cyru\cyrk\cyro\cyrv\cyro\cyrd\cyri\cyrt\cyre\cyrl\cyrsftsn}
+\def\sasndname{\saname}
 \def\salabel{\saname}
+\def\sasndlabel{\saname}
 \def\sconname{\cyr\CYRN\cyra\cyru\cyrch\cyrn\cyrery\cyrishrt\ %
 \cyrk\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt}
+\def\sconsndname{\sconname}
 \def\sconlabel{\sconname}
+\def\sconsndlabel{\sconsndname}
 \def\revname{\cyr\CYRR\cyre\cyrc\cyre\cyrn\cyrz\cyre\cyrn\cyrt}
+\def\revsndname{\revname}
 \def\revlabel{\revname}
+\def\revsndlabel{\revsndname}
 \def\conname{\cyr\CYRK\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt}
+\def\consndname{\conname}
 \def\conlabel{\conname\ \cyrp\cyro\ \@conspec}
+\def\consndlabel{\consndname\ \cyrp\cyro\ \@consndspec}
 \def\asmanuscript{\cyr\CYRN\cyra\ \cyrp\cyrr\cyra\cyrv\cyra\cyrh\ %
 \cyrr\cyru\cyrk\cyro\cyrp\cyri\cyrs\cyri}
 \def\libcatname{\cyr\CYRU\CYRD\CYRK}
@@ -61,7 +64,11 @@
 \cyr\CYRK\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt\cyrery:}
 \def\institution#1{\gdef\@institution{#1}}\institution{}
 \def\spec#1{\gdef\@spec{#1}}\spec{}
+\def\specsnd#1{\gdef\@specsnd{#1}}\specsnd{}
+
 \def\specnum#1{\gdef\@specnum{#1}}\specnum{}
+\def\specsndnum#1{\gdef\@specsndnum{#1}}\specsndnum{}
+
 \def\course#1{\gdef\@course{#1}}\course{}
 \def\coursenum#1{\gdef\@coursenum{#1}}\coursenum{}
 \def\keywords#1{\gdef\@keywords{#1}}\keywords{}
@@ -82,16 +89,29 @@
 \let\commonsect=\textbf
 \def\postcommonsect{\ }
 \def\sa#1{\gdef\@sa{#1}}\sa{}
+\def\sasnd#1{\gdef\@sasnd{#1}}\sasnd{}
+
 \def\sastatus#1{\gdef\@sastatus{#1}}\sastatus{}
+\def\sasndstatus#1{\gdef\@sasndstatus{#1}}\sasndstatus{}
+
 \def\scon#1{\gdef\@scon{#1}}\scon{}
+\def\sconsnd#1{\gdef\@sconsnd{#1}}\sconsnd{}
 \def\sconstatus#1{\gdef\@sconstatus{#1}}\sconstatus{}
+\def\sconsndstatus#1{\gdef\@sconsndstatus{#1}}\sconsndstatus{}
+
 \def\rev#1{\gdef\@rev{#1}}\rev{}
+\def\revsnd#1{\gdef\@revsnd{#1}}\revsnd{}
 \def\revstatus#1{\gdef\@revstatus{#1}}\revstatus{}
-\def\conspec#1{\gdef\@conspec{#1}}
-\def\con#1{\gdef\@con{#1}}
-\def\constatus#1{\gdef\@constatus{#1}}
+\def\revsndstatus#1{\gdef\@revsndstatus{#1}}\revsndstatus{}
+
+\def\con#1{\gdef\@con{#1}}\con{}
+\def\consnd#1{\gdef\@consnd{#1}}\consnd{}
+\def\conspec#1{\gdef\@conspec{#1}}\conspec{}
+\def\consndspec#1{\gdef\@consndspec{#1}}\consndspec{}
+\def\constatus#1{\gdef\@constatus{#1}}\constatus{}
+\def\consndstatus#1{\gdef\@consndstatus{#1}}\consndstatus{}
 
-\AtBeginDocument{
+\AtBeginDocument{%
   \addto\captionsrussian{%
     \def\contentsname{\cyr\CYRS\cyro\cyrd\cyre\cyrr\cyrzh\cyra\cyrn\cyri\cyre}
   }
@@ -114,11 +134,21 @@
 \cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery}
 \providecommand*\review{\nchapter{\reviewname}}
 
-\providecommand\field[1]{%
+\deflength\fieldhshift{8cm}
+
+\providecommand\diplomafield[1]{%
   \csname #1label\endcsname,\\%
   \csname @#1status\endcsname\>
-  \makebox[8.5cm][l]{\hrulefill\ \csname @#1\endcsname}
+  \makebox[\fieldhshift][l]{\hrulefill\ \csname @#1\endcsname}
 }
+\providecommand\disserfield[1]{%
+  \begin{tabbing}
+    \hspace{\fieldhshift}\={\csname #1label\endcsname}\\
+    \>\csname @#1status\endcsname\\
+    \>\csname @#1\endcsname
+  \end{tabbing}
+}
+
 \providecommand\@approved{
   \begin{tabbing}
     \hspace{8cm}\={\approved}\\
@@ -134,7 +164,8 @@
 
 \providecommand\mkcommonsect[3]{%
   \@namedef{#1head}{#2}
-  \@namedef{#1section}{\commonsect{\expandafter\csname #1head\endcsname}\postcommonsect}
+  \@namedef{#1section}{\commonsect{\expandafter\csname #1head\endcsname}%
+    \postcommonsect}
   \@namedef{#1text}{#3}
 }
 \let\mkintrosect=\mkcommonsect