disser update (30nov07)

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

8 files changed, 343 insertions, 205 deletions

diff --git a/Master/texmf-dist/tex/latex/disser/autoref.rtx b/Master/texmf-dist/tex/latex/disser/autoref.rtx
index dc7e5c68e17..c117c5847ba 100644
--- a/Master/texmf-dist/tex/latex/disser/autoref.rtx
+++ b/Master/texmf-dist/tex/latex/disser/autoref.rtx
@@ -12,6 +12,8 @@
 %% This file is part of the disser package.
 %% 
 
+\ProvidesFile{autoref.rtx}
+
 \def\firstskip{\vskip1cm}
 \def\secondskip{\vskip2cm}
 \def\thirdskip{\vskip1cm}
diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx
index ff50b40e335..a4e4dd0298b 100644
--- a/Master/texmf-dist/tex/latex/disser/bachelor.rtx
+++ b/Master/texmf-dist/tex/latex/disser/bachelor.rtx
@@ -12,6 +12,8 @@
 %% This file is part of the disser package.
 %% 
 
+\ProvidesFile{bachelor.rtx}
+
 
 \def\firstskip{\vskip1.5cm}
 \def\secondskip{\vskip1.5cm}
diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx
index ae0173d2523..e0ca65c11dc 100644
--- a/Master/texmf-dist/tex/latex/disser/candidate.rtx
+++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx
@@ -12,6 +12,8 @@
 %% This file is part of the disser package.
 %% 
 
+\ProvidesFile{candidate.rtx}
+
 \def\firstskip{\vskip1cm}
 \def\secondskip{\vskip2cm}
 \def\thirdskip{\vskip1cm}
diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls
index 13d25579cf1..91b87298aa1 100644
--- a/Master/texmf-dist/tex/latex/disser/disser.cls
+++ b/Master/texmf-dist/tex/latex/disser/disser.cls
@@ -44,33 +44,45 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2007/06/15 Document class for dissertations.]
-\ProvidesPackage{disser}
-
+\ProvidesClass{disser}[2007/11/29 Document class for dissertations.]
 
 \def\substyle@ext{.rtx}
 \newif\if@restonecol
-\newif\if@titlepage\@titlepagetrue
-\newif\if@bachelor\@bachelorfalse
-\newif\if@master\@masterfalse
-\newif\if@candidate\@candidatefalse
-\newif\if@doctor\@doctorfalse
-\newif\if@autoref\@autoreffalse
+\newif\if@titlepage
 \newif\if@openright
-\newif\ifhref\hreffalse
-\newif\ifpdf
-  \ifx\pdfoutput\undefined
-  \else
-    \ifx\pdfoutput\relax
-    \else
-      \ifcase\pdfoutput
-      \else
-        \pdftrue
-      \fi
-    \fi
-  \fi
+\RequirePackage{ifpdf}
+
+\newif\ifDis@bachelor
+\newif\ifDis@master
+\newif\ifDis@candidate
+\newif\ifDis@doctor
+\newif\ifDis@autoref
+
+\newif\ifDis@href
+\newif\ifDis@subf
+\newif\ifDis@times
+
+\@titlepagetrue
+\Dis@bachelorfalse
+\Dis@masterfalse
+\Dis@candidatetrue
+\Dis@doctorfalse
+\Dis@autoreffalse
+\Dis@timesfalse
+\Dis@subffalse
+\Dis@hreffalse
+
+\RequirePackage{kvoptions}[2006/08/17]
 
-\newif\ifsubf\subffalse
+\DeclareOption{href}{\Dis@hreftrue}
+
+\DeclareOption{subf}{\Dis@subftrue}
+
+\SetupKeyvalOptions{
+  family=Dis,
+  prefix=Dis@
+}
+\DeclareBoolOption[true]{fixint}
 
 
 \DeclareOption{a4paper}{%
@@ -119,13 +131,7 @@
 \DeclareOption{leqno}{\input{leqno.clo}}
 
 \DeclareOption{fleqn}{\input{fleqn.clo}}
-\DeclareOption{times}{
-  \AtEndOfPackage{%
-    \usepackage{pscyr}
-    \usepackage{txfonts}
-    \renewcommand{\rmdefault}{ftm}
-  }
-}
+\DeclareOption{times}{\Dis@timestrue}
 \DeclareOption{openbib}{%
   \AtEndOfPackage{%
     \renewcommand\@openbib@code{%
@@ -137,25 +143,43 @@
     \renewcommand\newblock{\par}
   }%
 }
-\DeclareOption{href}{\hreftrue}
-
-\DeclareOption{subf}{\subftrue}
 
 \DeclareOption{bachelor}{%
-  \@bachelortrue\@masterfalse\@candidatefalse\@doctorfalse\@autoreffalse
+  \Dis@bachelortrue
+  \Dis@masterfalse
+  \Dis@candidatefalse
+  \Dis@doctorfalse
+  \Dis@autoreffalse
 }
 \DeclareOption{master}{%
-  \@bachelorfalse\@mastertrue\@candidatefalse\@doctorfalse\@autoreffalse
+  \Dis@bachelorfalse
+  \Dis@mastertrue
+  \Dis@candidatefalse
+  \Dis@doctorfalse
+  \Dis@autoreffalse
 }
 \DeclareOption{candidate}{%
-  \@bachelorfalse\@masterfalse\@candidatetrue\@doctorfalse\@autoreffalse
+  \Dis@bachelorfalse
+  \Dis@masterfalse
+  \Dis@candidatetrue
+  \Dis@doctorfalse
+  \Dis@autoreffalse
 }
 \DeclareOption{doctor}{%
-  \@bachelorfalse\@masterfalse\@candidatefalse\@doctortrue\@autoreffalse
+  \Dis@bachelorfalse
+  \Dis@masterfalse
+  \Dis@candidatefalse
+  \Dis@doctortrue
+  \Dis@autoreffalse
 }
 \DeclareOption{autoref}{%
-  \@bachelorfalse\@masterfalse\@candidatefalse\@doctorfalse\@autoreftrue
+  \Dis@bachelorfalse
+  \Dis@masterfalse
+  \Dis@candidatefalse
+  \Dis@doctorfalse
+  \Dis@autoreftrue
 }
+
 \DeclareRobustCommand\MakeTextUppercase{%
   \@uclcnotmath{\def\i{I}\def\j{J}}{##1##2}\uppercase}
 
@@ -168,6 +192,8 @@
 
 \ExecuteOptions{a4paper,14pt,oneside,titlepage,onecolumn,final,openany}
 \ProcessOptions
+\ProcessKeyvalOptions{Dis}
+
 \def\EC@family#1#2#3#4#5{%
   \DeclareFontShape{#1}{#2}{#3}{#4}%
   {<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74>%
@@ -238,23 +264,18 @@
 
 \setlength\lineskip{1\p@}
 \setlength\normallineskip{1\p@}
-\newcommand\singlespacing {\renewcommand\baselinestretch{1}}
-\newcommand\onehalfspacing{\renewcommand\baselinestretch{1.5}}
-\newcommand\doublespacing {\renewcommand\baselinestretch{2}}
-\onehalfspacing\normalsize
+\newcommand\singlespacing {\renewcommand\baselinestretch{1}\normalsize}
+\newcommand\onehalfspacing{\renewcommand\baselinestretch{1.5}\normalsize}
+\newcommand\doublespacing {\renewcommand\baselinestretch{2}\normalsize}
+\onehalfspacing
 \setlength\parskip{0\p@ \@plus \p@}
-\setcounter{topnumber}{2}
-\setcounter{bottomnumber}{1}
-\setcounter{totalnumber}{3}
-\setcounter{dbltopnumber}{2}
-\renewcommand\topfraction{.7}
-\renewcommand\bottomfraction{.3}
-\renewcommand\textfraction{.2}
-\renewcommand\floatpagefraction{.5}
-\renewcommand\dbltopfraction{.7}
-\renewcommand\dblfloatpagefraction{.5}
+
 \setcounter{tocdepth}{1}
 \setcounter{secnumdepth}{2}
+
+\setlength\columnsep{10\p@}
+\setlength\columnseprule{0\p@}
+
 \def\@seccntformat#1{%
   \csname prethe#1\endcsname%
   \csname the#1\endcsname%
@@ -270,6 +291,8 @@
 \@medpenalty  151
 \@highpenalty 301
 
+%%% From File: counters.dtx
+
 \newcounter{part}
 \newcounter{chapter}
 \newcounter{section}[chapter]
@@ -318,11 +341,13 @@
 \newcommand\doctor@the   \candidate@the
 \newcommand\autoref@the  \candidate@the
 
-\if@bachelor  \bachelor@the  \fi
-\if@master    \master@the    \fi
-\if@candidate \candidate@the \fi
-\if@doctor    \doctor@the    \fi
-\if@autoref   \autoref@the   \fi
+\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
 
 \providecommand\tocprethepart{\partname~}
 \providecommand\tocpostthepart{.\@postskip}
@@ -341,7 +366,8 @@
 \providecommand\prepart{}
 \providecommand\postpart{\par}
 
-\def\partpagestyle#1{\gdef\@partpagestyle{#1}}\partpagestyle{empty}
+\def\partpagestyle#1{\gdef\@partpagestyle{#1}}
+\partpagestyle{empty}
 \newcommand\part{
   \if@openright
     \cleardoublepage
@@ -391,6 +417,7 @@
   \fi
   \if@tempswa\twocolumn\fi
 }
+
 \newcommand*\l@part[2]
 {%
   \ifnum \c@tocdepth >-2\relax
@@ -411,7 +438,8 @@
 }
 
 
-\newcommand*\chaptermark[1]{}
+%%% From File: chapter.dtx
+
 \providecommand\tocprethechapter{\protect\chaptername~}
 \providecommand\tocpostthechapter{.\@postskip}
 \providecommand\tocchapterfill{\tocfill{.}}
@@ -432,24 +460,7 @@
 
 \def\chapterpagestyle#1{\gdef\@chapterpagestyle{#1}}\chapterpagestyle{plain}
 
-\providecommand\tocpretheappendix{\protect\appendixname~}
-\providecommand\tocposttheappendix{.\@postskip}
-\providecommand\tocappendixfill{\tocfill{.}}
-
-\providecommand\tocappendixfont{\bfseries}
-\providecommand\tocappendixfillfont{\normalfont}
-\providecommand\tocappendixnumfont{\normalfont}
-
-\providecommand\theappendixalign{\centering}
-\providecommand\theappendixfont{\Large}
-\providecommand\pretheappendix{\protect\appendixname~}
-\providecommand\posttheappendix{\par\nobreak\vskip 5\p@}
-
-\providecommand\appendixalign{\centering}
-\providecommand\appendixfont{\Large\bfseries}
-\providecommand\preappendix{}
-\providecommand\postappendix{\par\nobreak\vskip 20\p@}
-
+\newcommand*\chaptermark[1]{}
 \newcommand\chapter{%
   \if@openright
     \cleardoublepage
@@ -526,6 +537,23 @@
   \fi
 }
 
+\providecommand\tocpretheappendix{\protect\appendixname~}
+\providecommand\tocposttheappendix{.\@postskip}
+\providecommand\tocappendixfill{\tocfill{.}}
+
+\providecommand\tocappendixfont{\bfseries}
+\providecommand\tocappendixfillfont{\normalfont}
+\providecommand\tocappendixnumfont{\normalfont}
+
+\providecommand\theappendixalign{\centering}
+\providecommand\theappendixfont{\Large}
+\providecommand\pretheappendix{\protect\appendixname~}
+\providecommand\posttheappendix{\par\nobreak\vskip 5\p@}
+
+\providecommand\appendixalign{\centering}
+\providecommand\appendixfont{\Large\bfseries}
+\providecommand\preappendix{}
+\providecommand\postappendix{\par\nobreak\vskip 20\p@}
 \newcommand\appendix{
   \setcounter{chapter}{0}
   \setcounter{section}{0}
@@ -592,30 +620,8 @@
   \gdef\thechapter{\oldthechapter}
 }
 
-\newcommand\nchapter[1]{%
-  \chapter*{%
-    \phantomchapter\addcontentsline{toc}{chapter}{#1}%
-    #1%
-    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}
-  }
-}
-
-\def\newcontentsname{\cyr\CYRS\cyro\cyrd\cyre\cyrr\cyrzh\cyra\cyrn\cyri\cyre}
 
-\def\introname{{\cyr\CYRV\cyrv\cyre\cyrd\cyre\cyrn\cyri\cyre}}
-\newcommand\intro{\nchapter{\introname}}
-\def\conclusionname{%
-{\cyr\CYRZ\cyra\cyrk\cyrl\cyryu\cyrch\cyre\cyrn\cyri\cyre}
-}
-\newcommand\conclusion{\nchapter{\conclusionname}}
-\def\defsname{%
-{\cyr\CYRI\cyrs\cyrp\cyro\cyrl\cyrsftsn\cyrz\cyru\cyre\cyrm\cyrery\cyre\ %
-\cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri\cyrya}
-}
-\newcommand\defs{\nchapter{\defsname}}
-\def\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ %
-\cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery}
-\newcommand\review{\nchapter{\reviewname}}
+%%% From File: sections.dtx
 
 \providecommand\tocprethesection{}
 \providecommand\tocpostthesection{.\@postskip}
@@ -633,8 +639,8 @@
 \providecommand\postthesection{.~}
 
 \providecommand\sectionindent{\z@}
-\providecommand\presection{-3.5ex \@plus -1ex \@minus -.2ex}
-\providecommand\postsection{2.3ex \@plus.2ex}
+\providecommand\beforesection{-3.5ex \@plus -1ex \@minus -.2ex}
+\providecommand\aftersection{2.3ex \@plus.2ex}
 \providecommand\sectionalign{\raggedright}
 
 \providecommand\tocprethesubsection{}
@@ -654,8 +660,8 @@
 \providecommand\postthesubsection{.~}
 
 \providecommand\subsectionindent{\z@}
-\providecommand\presubsection{-3.25ex\@plus -1ex \@minus -.2ex}
-\providecommand\postsubsection{1.5ex \@plus .2ex}
+\providecommand\beforesubsection{-3.25ex\@plus -1ex \@minus -.2ex}
+\providecommand\aftersubsection{1.5ex \@plus .2ex}
 \providecommand\subsectionalign{\raggedright}
 
 \providecommand\tocprethesubsubsection{}
@@ -675,8 +681,8 @@
 \providecommand\postthesubsubsection{.~}
 
 \providecommand\subsubsectionindent{\z@}
-\providecommand\presubsubsection{-3.25ex\@plus -1ex \@minus -.2ex}
-\providecommand\postsubsubsection{1.5ex \@plus .2ex}
+\providecommand\beforesubsubsection{-3.25ex\@plus -1ex \@minus -.2ex}
+\providecommand\aftersubsubsection{1.5ex \@plus .2ex}
 \providecommand\subsubsectionalign{\raggedright}
 
 \providecommand\tocpretheparagraph{}
@@ -696,8 +702,8 @@
 \providecommand\posttheparagraph{.~}
 
 \providecommand\paragraphindent{\z@}
-\providecommand\preparagraph{3.25ex \@plus1ex \@minus.2ex}
-\providecommand\postparagraph{-1em}
+\providecommand\beforeparagraph{3.25ex \@plus1ex \@minus.2ex}
+\providecommand\afterparagraph{-1em}
 \providecommand\paragraphalign{\raggedright}
 
 \providecommand\tocprethesubparagraph{}
@@ -717,8 +723,8 @@
 \providecommand\postthesubparagraph{.~}
 
 \providecommand\subparagraphindent{\parindent}
-\providecommand\presubparagraph{3.25ex \@plus1ex \@minus .2ex}
-\providecommand\postsubparagraph{-1em}
+\providecommand\beforesubparagraph{3.25ex \@plus1ex \@minus .2ex}
+\providecommand\aftersubparagraph{-1em}
 \providecommand\subparagraphalign{\raggedright}
 
 \def\@sect#1#2#3#4#5#6[#7]#8{%
@@ -754,7 +760,6 @@
   \fi
   \@xsect{#5}
 }
-
 \def\@tocline#1#2#3#4#5#6{%
   \ifnum #2>\c@tocdepth \else
     \vskip \z@ \@plus.2\p@
@@ -773,37 +778,27 @@
   \fi
 }
 
-\newcommand*\l@section      {\@tocline{section}      {1}
-  {\tocsectionindent}{\tocsectionnameindent}}
-\newcommand*\l@subsection   {\@tocline{subsection}   {2}
-  {\tocsubsectionindent}{\tocsubsectionnameindent}}
-\newcommand*\l@subsubsection{\@tocline{subsubsection}{3}
-  {\tocsubsubsectionindent}{\tocsubsubsectionnameindent}}
-\newcommand*\l@paragraph    {\@tocline{paragraph}    {4}
-  {\tocparagraphindent}{\tocparagraphnameindent}}
-\newcommand*\l@subparagraph {\@tocline{subparagraph} {5}
-  {\tocsubparagraphindent}{\tocsubparagraphnameindent}}
-
-\newcommand\section{%
-  \@startsection{section}{1}{\sectionindent}%
-  {\presection}{\postsection}{\sectionfont\sectionalign}}
-\newcommand\subsection{%
-  \@startsection{subsection}{2}{\subsectionindent}%
-  {\presubsection}{\postsubsection}{\subsectionfont\subsectionalign}}
-\newcommand\subsubsection{%
-  \@startsection{subsubsection}{3}{\subsubsectionindent}%
-  {\presubsubsection}{\postsubsubsection}{\subsubsectionfont\subsubsectionalign}}
-\newcommand\paragraph{%
-  \@startsection{paragraph}{4}{\paragraphindent}%
-  {\preparagraph}{\postparagraph}{\paragraphfont\paragraphalign}}
-\newcommand\subparagraph{%
-  \@startsection{subparagraph}{5}{\parindent}%
-  {\presubparagraph}{\postsubparagraph}{\subparagraphfont\subparagraphalign}}
-
-\newcommand\nsection[1]{%
-  \section*{\phantomsection\addcontentsline{toc}{section}{#1}#1}
+\newcommand\defsection[2]{%
+  \@namedef{l@#1}{%
+    \@tocline{#1}{#2}{\csname toc#1indent\endcsname}
+    {\csname toc#1nameindent\endcsname}
+  }
+  \@namedef{#1}{%
+    \@startsection{#1}{#2}{\csname #1indent\endcsname}
+      {\csname before#1\endcsname}{\csname after#1\endcsname}
+      {\csname #1font\endcsname\csname #1align\endcsname}
+  }
 }
 
+\defsection{section}{1}
+\defsection{subsection}{2}
+\defsection{subsubsection}{3}
+\defsection{paragraph}{4}
+\defsection{subparagraph}{5}
+
+
+%%% From File: lists.dtx
+
 \if@twocolumn
   \setlength\leftmargini {2em}
 \else
@@ -843,6 +838,18 @@
 \newcommand\labelitemiii{\textasteriskcentered}
 \newcommand\labelitemiv {\textperiodcentered}
 
+%%% From File: floats.dtx
+
+\setcounter{topnumber}{2}
+\setcounter{bottomnumber}{1}
+\setcounter{totalnumber}{3}
+\setcounter{dbltopnumber}{2}
+\renewcommand\topfraction{.7}
+\renewcommand\bottomfraction{.3}
+\renewcommand\textfraction{.2}
+\renewcommand\floatpagefraction{.5}
+\renewcommand\dbltopfraction{.7}
+\renewcommand\dblfloatpagefraction{.5}
 \newlength\abovecaptionskip
 \setlength\abovecaptionskip{10\p@}
 \newlength\belowcaptionskip
@@ -879,14 +886,15 @@
 \skip\@mpfootins = \skip\footins
 \setlength\fboxsep{3\p@}
 \setlength\fboxrule{.4\p@}
-\newenvironment{table}{\@float{table}}{\end@float}
-\newenvironment{table*}{\@dblfloat{table}}{\end@dblfloat}
 
 \def\fps@table{tbp}
 \def\ftype@table{2}
 \def\ext@table{lot}
 \def\fnum@table{\tablename~\thetable}
 
+
+%%% From File: footnote.dtx
+
 \renewcommand\footnoterule{%
   \kern-3\p@\hrule\@width.4\columnwidth\kern2.6\p@
 }
@@ -896,6 +904,8 @@
   \hb@xt@1.8em{\hss\@makefnmark}#1
 }
 
+%%% From File: env.dtx
+
 \newenvironment{description}
   {\list{}{\labelwidth\z@ \itemindent-\leftmargin
     \let\makelabel\descriptionlabel}}
@@ -951,7 +961,32 @@
 }
 \newenvironment{figure}{\@float{figure}}{\end@float}
 \newenvironment{figure*}{\@dblfloat{figure}}{\end@dblfloat}
+\newenvironment{table}{\@float{table}}{\end@float}
+\newenvironment{table*}{\@dblfloat{table}}{\end@dblfloat}
+\providecommand\theoremstyle{\itshape}
+\providecommand\thetheoremstyle{\bfseries}
+\providecommand\opargtheoremstyle{\rm}
+\providecommand\preopargtheorem{(}
+\providecommand\postopargtheorem{)}
+\providecommand\postthetheorem{.}
+
+\def\@begintheorem#1#2{\trivlist
+  \item[\hskip \labelsep{\thetheoremstyle #1\ %
+  #2\unskip\postthetheorem}]\theoremstyle}
+\def\@opargbegintheorem#1#2#3{\trivlist
+  \item[\hskip \labelsep{\thetheoremstyle #1\ #2\ %
+  {\opargtheoremstyle\preopargtheorem #3\postopargtheorem}}]\theoremstyle}
+\def\@endtheorem{\endtrivlist}
+
 
+%%% From File: page.dtx
+
+\newcommand\evenheadfont{\slshape}
+\newcommand\evenfootfont{}
+\newcommand\oddheadfont{\slshape}
+\newcommand\oddfootfont{}
+\providecommand\chaptermarkfont{\slshape}
+\providecommand\sectionmarkfont{\MakeUppercase}
 \if@twoside
   \def\ps@headings{%
     \let\@evenfoot\@empty
@@ -974,7 +1009,7 @@
       ##1}%
       }%
     }%
-  }%
+  } % \def\ps@headings
 \else % \if@twoside
   \def\ps@headings{%
     \let\@oddfoot\@empty
@@ -1009,19 +1044,11 @@
   \let\chaptermark\@gobble
   \let\sectionmark\@gobble
 }
-\setlength\columnsep{10\p@}
-\setlength\columnseprule{0\p@}
 \pagestyle{plain}
 \pagenumbering{arabic}
 \if@twoside\else\raggedbottom\fi
 \if@twocolumn\twocolumn\sloppy\flushbottom
 \else\onecolumn\fi
-\newcommand\evenheadfont{\slshape}
-\newcommand\evenfootfont{}
-\newcommand\oddheadfont{\slshape}
-\newcommand\oddfootfont{}
-\newcommand\chaptermarkfont{\slshape}
-\newcommand\sectionmarkfont{\MakeUppercase}
 
 
 \newcommand\today{}
@@ -1031,33 +1058,29 @@
   \newcommand\topiclabelfont{\large}
   \newcommand\topicfont{\large\bfseries}
   \newcommand\instfont{\normalfont}
+  \newcommand\cdsep{~-- }
 
   \input{titledefs\substyle@ext}
   \newcommand\maketitle{
-    \begin{titlepage}
-      \setcounter{page}{-1}
       \thispagestyle{empty}
-      \vspace*{-1cm}
-      \centering\instfont\@institution\par
+      \vspace*{-2cm}
+      \begin{center}
+      \instfont\@institution\par
       \makeatletter
-      \if@bachelor \input{bachelor\substyle@ext}\fi
-      \if@master   \input{master\substyle@ext}\fi
-      \if@candidate\input{candidate\substyle@ext}\fi
-      \if@doctor   \input{doctor\substyle@ext}\fi
-      \if@autoref  \input{autoref\substyle@ext}\fi
+      \ifDis@bachelor \input{bachelor\substyle@ext}\fi
+      \ifDis@master   \input{master\substyle@ext}\fi
+      \ifDis@candidate\input{candidate\substyle@ext}\fi
+      \ifDis@doctor   \input{doctor\substyle@ext}\fi
+      \ifDis@autoref  \input{autoref\substyle@ext}\fi
       \enlargethispage{2cm}
       \vfill
-      \begin{center}
-        {\@city\\\@date}
+        {\@city\cdsep\@date}
       \end{center}
-      {\null\endtitlepage}
-    \end{titlepage}
     \normalsize
+    \clearpage
+    \thispagestyle{empty}
   } % \newcommand\maketitle
   \setcounter{footnote}{0}
-  \clearpage
-  \thispagestyle{empty}
-  \footskip=1cm
 \else %\if@titlepage
   \newcommand\maketitle{%
     \par
@@ -1099,6 +1122,7 @@
     \null
     \vskip 2em%
     \begin{center}%
+      \let\footnotesize\small
       \let\footnote\thanks
       {\titlefont\@title\par}%
       \vskip 1.5em%
@@ -1113,6 +1137,8 @@
   }
 \fi % \if@titlepage
 
+%%% From File: toc.dtx
+
 \def\@postskip{\hskip1em}
 \newcommand\@pnumwidth{1.55em}
 \newcommand\@tocrmarg{2.55em}
@@ -1127,7 +1153,6 @@
 \let\@openbib@code\@empty
 
 \newcommand\tableofcontents{%
-  \renewcommand\contentsname\newcontentsname
   \if@twocolumn
     \@restonecoltrue\onecolumn
   \else
@@ -1136,7 +1161,6 @@
   \chapter*{\contentsname%
     \@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}
   }%
-  \thispagestyle{empty}
   \@starttoc{toc}%
   \if@restonecol\twocolumn\fi
   \clearpage
@@ -1185,22 +1209,72 @@
 \newcommand\subitem{\@idxitem \hspace*{20\p@}}
 \newcommand\subsubitem{\@idxitem \hspace*{30\p@}}
 
+%%% From File: custom.dtx
+
 \let\@afterindentfalse\@afterindenttrue
 \@afterindenttrue
 \usepackage[intlimits]{amsmath}
 \usepackage{amssymb,amsfonts}
-\DeclareSymbolFont{EulerExtension}{U}{euex}{m}{n}
-\DeclareMathSymbol\intop\mathop{EulerExtension}{"52}
-\DeclareMathSymbol\ointop\mathop{EulerExtension}{"48}
+\ifDis@times
+  \AtEndOfPackage{%
+    \usepackage{pscyr}
+    \usepackage{txfonts}
+    \renewcommand{\rmdefault}{ftm}
+  }
+\fi
+\ifDis@fixint
+  \DeclareSymbolFont{EulerExtension}{U}{euex}{m}{n}
+  \DeclareMathSymbol\intop\mathop{EulerExtension}{"52}
+  \DeclareMathSymbol\ointop\mathop{EulerExtension}{"48}
+  \AtBeginDocument{%
+    \def\intkern@{\mkern -6mu }%
+    \def\ints@#1{\mkern -3mu
+      \mathop{\mkern 3mu
+        \intop
+        \ifnum #1=\z@ \intdots@ \else
+          \intkern@
+          \ifnum #1>\tw@ \intop\intkern@
+            \ifnum #1>\thr@@ \intop\intkern@ \fi
+          \fi
+        \fi
+        \intop
+       }\ilimits@
+    }%
+    \renewcommand{\iint}{\DOTSI\protect\MultiIntegral{2}}
+    \renewcommand{\iiint}{\DOTSI\protect\MultiIntegral{3}}
+    \renewcommand{\iiiint}{\DOTSI\protect\MultiIntegral{4}}
+    \renewcommand{\idotsint}{\DOTSI\protect\MultiIntegral{0}}
+  }{}
+\fi
 \usepackage[square, comma, sort&compress]{natbib}
-\def\phantomchapter{%
-  \ifhref
+\def\metaphantom#1{%
+  \ifDis@href
     \Hy@GlobalStepCount\Hy@linkcounter
-    \xdef\@currentHref{chapter*.\the\Hy@linkcounter}%
+    \xdef\@currentHref{#1*.\the\Hy@linkcounter}%
     \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
   \fi
 }
+\newcommand\nchapter[1]{%
+  \chapter*{%
+    \metaphantom{chapter}\addcontentsline{toc}{chapter}{#1}%
+    #1%
+    \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}
+  }
+}
+\newcommand\nsection[1]{%
+  \section*{\metaphantom{section}%
+  \addcontentsline{toc}{section}{#1}#1}
+}
+\newcommand\nsubsection[1]{%
+  \subsection*{\metaphantom{subsection}%
+  \addcontentsline{toc}{subsection}{#1}#1}
+}
+\newcommand\nsubsubsection[1]{%
+  \subsection*{\metaphantom{subsubsection}%
+  \addcontentsline{toc}{subsubsection}{#1}#1}
+}
 \renewcommand\bibsection{\nchapter{\bibname}}
+
 \renewenvironment{thebibliography}[1]{%
   \bibsection
   \parindent \z@
@@ -1217,12 +1291,13 @@
   \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%
 }
 \ifpdf
-  \ifhref
+  \ifDis@href
     \usepackage[pdftex,unicode,hyperfigures=true]{hyperref}
     \hypersetup{
       colorlinks         = false,
@@ -1235,23 +1310,19 @@
     \pdfcompresslevel = 9
   \fi
   \usepackage[pdftex]{graphicx}
-  \IfFileExists{cmap.sty}{%
-    \usepackage{cmap}
-  }{}
+  \usepackage{cmap}
 \else
-  \ifhref\usepackage[hypertex,colorlinks=false,hyperfigures=true]{hyperref}\fi
+  \ifDis@href\usepackage[hypertex,colorlinks=false,hyperfigures=true]{hyperref}\fi
   \usepackage{graphicx}
 \fi
-\ifhref\usepackage{hypernat}\fi
+\ifDis@href\usepackage{hypernat}\fi
 \usepackage[rflt]{floatflt}
-\ifsubf
+\ifDis@subf
   \usepackage[config,font=small,labelsep=period]{caption,subfig}
   \def\thesubfigure{\textit{\asbuk{subfigure}}}
-  \def\p@subfigure{\thefigure, }
+  \providecommand\thefigsubsep{,\ }
+  \def\p@subfigure{\@nameuse{thefigure}\thefigsubsep}
 \fi
-
-\lccode `\-=`\-
-\defaulthyphenchar=127
 \endinput
 %%
 %% End of file `disser.cls'.
diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx
index f827045cc63..d5052ee7231 100644
--- a/Master/texmf-dist/tex/latex/disser/doctor.rtx
+++ b/Master/texmf-dist/tex/latex/disser/doctor.rtx
@@ -12,6 +12,8 @@
 %% This file is part of the disser package.
 %% 
 
+\ProvidesFile{doctor.rtx}
+
 \def\firstskip{\vskip1.5cm}
 \def\secondskip{\vskip3cm}
 \def\thirdskip{\vskip1cm}
diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls
index ee23df423bb..61ad55de08b 100644
--- a/Master/texmf-dist/tex/latex/disser/gost732.cls
+++ b/Master/texmf-dist/tex/latex/disser/gost732.cls
@@ -11,9 +11,28 @@
 %% 
 %% This file is part of the disser package.
 %% 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% gost732 -- GOST 7.32-2001 implementation.
+%%
+%% Copyright (c) 2004-2007 Stanislav Kruchinin
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This program is distributed in the hope that it will be useful,
+%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{gost732}[2007/02/16 GOST 7.32-2001 implementation]
+\ProvidesClass{gost732}[2007/11/29 1.0.1 GOST 7.32-2001 implementation]
 
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}}
 \ProcessOptions\relax
@@ -21,33 +40,38 @@
 
 \renewcommand\tocprethechapter{}
 \renewcommand\tocpostthechapter{\@postskip}
+\renewcommand\tocposttheappendix{\@postskip}
+
 \renewcommand\chapteralign{\raggedright}
 \renewcommand\thechapterfont{\Large\bfseries}
 \renewcommand\prethechapter{\newpage}
-\renewcommand\postthechapter{~}
+\renewcommand\postthechapter{\@postskip}
 \renewcommand\postchapter{\vskip 16\p@}
 
-\renewcommand\postthesection{~}
-\renewcommand\tocpostthesection{~}
+\renewcommand\postthesection{\@postskip}
+\renewcommand\tocpostthesection{\@postskip}
 
-\renewcommand\postthesubsection{~}
+\renewcommand\postthesubsection{\@postskip}
 \renewcommand\tocpostthesubsection{\@postskip}
 
-\renewcommand\postthesubsubsection{~}
+\renewcommand\postthesubsubsection{\@postskip}
 \renewcommand\tocpostthesubsubsection{\@postskip}
 
-\renewcommand\posttheparagraph{~}
+\renewcommand\posttheparagraph{\@postskip}
 \renewcommand\tocposttheparagraph{\@postskip}
 
-\renewcommand\postthesubparagraph{~}
+\renewcommand\postthesubparagraph{\@postskip}
 \renewcommand\tocpostthesubparagraph{\@postskip}
 
-\newcommand\newbibname{\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ %
+\AtBeginDocument{%
+\addto\captionsrussian{%
+\def\bibname{%
+\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ %
 \cyri\cyrs\cyrp\cyro\cyrl\cyrsftsn\cyrz\cyro\cyrv\cyra\cyrn\cyrn\cyrery\cyrh\ %
 \cyri\cyrs\cyrt\cyro\cyrch\cyrn\cyri\cyrk\cyro\cyrv}
+}}
 
 \renewcommand\bibsection{%
-  \renewcommand\bibname\newbibname
   \nchapter{\bibname}
 }
 \renewcommand\theenumi  {\@asbuk\c@enumi}
diff --git a/Master/texmf-dist/tex/latex/disser/master.rtx b/Master/texmf-dist/tex/latex/disser/master.rtx
index 6c252ee2862..d1bd3caf9bc 100644
--- a/Master/texmf-dist/tex/latex/disser/master.rtx
+++ b/Master/texmf-dist/tex/latex/disser/master.rtx
@@ -12,6 +12,8 @@
 %% This file is part of the disser package.
 %% 
 
+\ProvidesFile{master.rtx}
+
 \def\firstskip{\vspace*{1em}}
 \def\secondskip{\vspace*{1em}}
 \def\thirdskip{\vskip1.em}
diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
index 682766b7303..b6431849ef4 100644
--- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx
+++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
@@ -11,6 +11,9 @@
 %% 
 %% This file is part of the disser package.
 %% 
+
+\ProvidesFile{titledefs.rtx}
+
 \def\abstractname{\cyr\CYRA\cyrn\cyrn\cyro\cyrt\cyra\cyrc\cyri\cyrya}
 \def\titlepagename{\cyr\CYRT\cyri\cyrt\cyru\cyrl\cyrsftsn\cyrn\cyrery\cyrishrt\ %
 \cyrl\cyri\cyrs\cyrt}
@@ -18,7 +21,6 @@
 \cyrs\cyrl\cyro\cyrv\cyra}
 \def\keywordssep{:}
 \def\keywordslabel{\keywordsname\keywordssep}
-\def\yearname{\cyr\cyrg.}
 \def\workname{\cyr\CYRD\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}
 \def\disserpermit{\workname\ \cyrd\cyro\cyrp\cyru\cyrshch\cyre\cyrn\cyra\ %
 \cyrk\ \cyrz\cyra\cyrshch\cyri\cyrt\cyre}
@@ -30,7 +32,8 @@
 \def\coursename{\cyr\CYRN\cyra\cyrp\cyrr\cyra\cyrv\cyrl\cyre\cyrn\cyri\cyre}
 \def\coursesep{:}
 \def\courselabel{\coursename\coursesep}
-\def\specname{\cyr\CYRS\cyrp\cyre\cyrc\cyri\cyra\cyrl\cyrsftsn\cyrn\cyro\cyrs\cyrt\cyrsftsn}
+\def\specname{%
+\cyr\CYRS\cyrp\cyre\cyrc\cyri\cyra\cyrl\cyrsftsn\cyrn\cyro\cyrs\cyrt\cyrsftsn}
 \def\specsep{:}
 \def\speclabel{\specname\specsep}
 \def\masterprogname{\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ %
@@ -40,7 +43,8 @@
 \def\studentname{\cyr\CYRV\cyrery\cyrp\cyro\cyrl\cyrn\cyri\cyrl\ %
 \cyrs\cyrt\cyru\cyrd\cyre\cyrn\cyrt}
 \def\studentlabel{\studentname}
-\def\saname{\cyr\CYRR\cyru\cyrk\cyro\cyrv\cyro\cyrd\cyri\cyrt\cyre\cyrl\cyrsftsn}
+\def\saname{\cyr\CYRN\cyra\cyru\cyrch\cyrn\cyrery\cyrishrt\ %
+\cyrr\cyru\cyrk\cyro\cyrv\cyro\cyrd\cyri\cyrt\cyre\cyrl\cyrsftsn}
 \def\salabel{\saname}
 \def\revname{\cyr\CYRR\cyre\cyrc\cyre\cyrn\cyrz\cyre\cyrn\cyrt}
 \def\revlabel{\revname}
@@ -63,6 +67,15 @@
 \def\faculty#1{\gdef\@faculty{#1}}\faculty{}
 \def\department#1{\gdef\@department{#1}}\department{}
 \def\hod#1{\gdef\@hod{#1}}\hod{}
+\def\libcatnum#1{\gdef\@libcatnum{#1}}\libcatnum{}
+\def\group#1{\gdef\@group{#1}}\group{}
+\def\masterprognum#1{\gdef\@masterprognum{#1}}\masterprognum{}
+\def\masterprog#1{\gdef\@masterprog{#1}}\masterprog{}
+
+\date{\number\year}
+
+\def\yearname{\cyr\cyrg.}
+\let\introsect=\paragraph
 \def\sa#1{\gdef\@sa{#1}}\sa{}
 \def\sastatus#1{\gdef\@sastatus{#1}}\sastatus{}
 \def\rev#1{\gdef\@rev{#1}}\rev{}
@@ -70,14 +83,30 @@
 \def\conspec#1{\gdef\@conspec{#1}}
 \def\con#1{\gdef\@con{#1}}
 \def\constatus#1{\gdef\@constatus{#1}}
-\def\libcatnum#1{\gdef\@libcatnum{#1}}\libcatnum{}
-\def\group#1{\gdef\@group{#1}}\group{}
-\def\masterprognum#1{\gdef\@masterprognum{#1}}\masterprognum{}
-\def\masterprog#1{\gdef\@masterprog{#1}}\masterprog{}
 
-\date{\number\year}
+\AtBeginDocument{
+  \addto\captionsrussian{%
+    \def\contentsname{\cyr\CYRS\cyro\cyrd\cyre\cyrr\cyrzh\cyra\cyrn\cyri\cyre}
+  }
+}
+
+\newcommand\introname{{\cyr\CYRV\cyrv\cyre\cyrd\cyre\cyrn\cyri\cyre}}
+\newcommand\intro{\nchapter{\introname}}
+\newcommand\conclusionname{%
+{\cyr\CYRZ\cyra\cyrk\cyrl\cyryu\cyrch\cyre\cyrn\cyri\cyre}
+}
+\newcommand\conclusion{\nchapter{\conclusionname}}
+\newcommand\defsname{%
+{\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ \cyru\cyrs\cyrl\cyro\cyrv\cyrn\cyrery\cyrh %
+\cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri\cyrishrt}
+}
+\newcommand\defs{\nchapter{\defsname}}
+
+\newcommand\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ %
+\cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery}
+\newcommand\review{\nchapter{\reviewname}}
 \def\field#1{%
-  \csname #1label\endcsname,\ %
+  \csname #1label\endcsname,\\%
   \csname @#1status\endcsname\>
   \makebox[8.5cm][l]{\hrulefill\ \csname @#1\endcsname}
 }
@@ -94,9 +123,13 @@
   \end{tabbing}
 }
 
-\def\yearname{\cyr\cyrg.}
 \newcommand\datefield[1][\number\year]{<<\rule[0pt]{1cm}{.5pt}\,>>%
 \rule[0pt]{3cm}{0.5pt}\ #1~\yearname}
+\newcommand\mkintrosect[3]{%
+  \@namedef{#1head}{#2}
+  \@namedef{#1section}{\introsect{\expandafter\csname #1head\endcsname}}
+  \@namedef{#1text}{#3}
+}
 
 \endinput
 %%