disser 1.1.0

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

8 files changed, 167 insertions, 80 deletions

diff --git a/Master/texmf-dist/tex/latex/disser/autoref.rtx b/Master/texmf-dist/tex/latex/disser/autoref.rtx
index c117c5847ba..418194ab789 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-2007 Stanislav Kruchinin.
+%% Copyright (c) 2004-2009 Stanislav Kruchinin.
 %% All rights reserved.
 %% 
 %% This file is part of the disser package.
@@ -29,6 +29,7 @@
 \begin{flushright}
   \firstskip
   \asmanuscriptname\\
+  \ifDis@facsimile\facsimile\fi
 \end{flushright}
 \begin{center}
   \secondskip
diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx
index 5b8ac573288..b7ad9c5c25e 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-2007 Stanislav Kruchinin.
+%% Copyright (c) 2004-2009 Stanislav Kruchinin.
 %% All rights reserved.
 %% 
 %% This file is part of the disser package.
@@ -15,11 +15,17 @@
 \ProvidesFile{bachelor.rtx}
 
 
-\def\firstskip{\vskip1.5cm}
-\def\secondskip{\vskip1.5cm}
-\def\thirdskip{\vskip1.em}
-\def\fourthskip{\vskip1.em}
-\def\fifthskip{\vskip2cm}
+\newlength\firstskip
+\newlength\secondskip
+\newlength\thirdskip
+\newlength\fourthskip
+\newlength\fifthskip
+
+\setlength\firstskip{1.5cm}
+\setlength\secondskip{1.5cm}
+\setlength\thirdskip{1.em}
+\setlength\fourthskip{1.em}
+\setlength\fifthskip{2cm}
 
 \def\titlefont{\Large\bfseries}
 \def\topiclabelfont{\large}
@@ -27,16 +33,18 @@
 
 \def\workname{\CYRR\cyra\cyrb\cyro\cyrt\cyra}
 
-\firstskip\@approved\secondskip
+\vskip\firstskip
+\@approved
+\vskip\secondskip
 \begin{center}
   {\titlefont\@title\par}
-  \thirdskip
+  \vskip\thirdskip
   {\topiclabelfont\topiclabel\;}
   {\topicfont\@topic\par}
-  \fourthskip\normalfont
+  \vskip\fourthskip\normalfont
   \courselabel\ \@coursenum~-- \@course
 \end{center}
-\fifthskip
+\vskip\fifthskip
 \begin{tabbing}
   \studentlabel\ \groupname\ \@group\hspace{2cm}\=
   \makebox[8.5cm][l]{\hrulefill\ \@author}
diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx
index b539fbd53f7..c2d21107b1e 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-2007 Stanislav Kruchinin.
+%% Copyright (c) 2004-2009 Stanislav Kruchinin.
 %% All rights reserved.
 %% 
 %% This file is part of the disser package.
@@ -14,36 +14,52 @@
 
 \ProvidesFile{candidate.rtx}
 
-\def\firstskip{\vskip1cm}
-\def\secondskip{\vskip2cm}
-\def\thirdskip{\vskip1cm}
-\def\fourthskip{\vskip1cm}
-\def\fifthskip{\vskip1cm}
-\def\sixthskip{}
-\def\@sahshift{8cm}
+\newlength\firstskip
+\newlength\secondskip
+\newlength\thirdskip
+\newlength\fourthskip
+\newlength\fifthskip
+\newlength\sixthskip
+
+\ifDis@libcat
+  \setlength\firstskip{2em}
+\else
+  \setlength\firstskip{4em}
+\fi
+\setlength\secondskip{2cm}
+\setlength\thirdskip{1cm}
+\setlength\fourthskip{1cm}
+\setlength\fifthskip{1cm}
+\setlength\sixthskip{0pt}
+
+\newlength\@sahshift
+\setlength\@sahshift{8cm}
 
 \def\titlefont{\normalsize}
 \def\topicfont{\Large\bfseries}
 \def\authorfont{\large}
 \def\specfont{\normalsize}
 
+\vskip\firstskip
 \normalfont
 \begin{flushright}
-  \firstskip
   \asmanuscriptname\\
-  {\libcatname\ \@libcatnum}
+  \ifDis@facsimile\facsimile\fi
+  \ifDis@libcat
+    {\libcatname\ \@libcatnum}
+  \fi
 \end{flushright}
 \begin{center}
-  \secondskip
+  \vskip\secondskip
   {\authorfont\@author}
-  \thirdskip
+  \vskip\thirdskip
   {\topicfont\@topic\par}
-  \fourthskip
+  \vskip\fourthskip
   {\specfont\@specnum~--\ \@spec}
-  \fifthskip
+  \vskip\fifthskip
   {\titlefont\@title}
 \end{center}
-\sixthskip
+\vskip\sixthskip
 \begin{tabbing}
   \hspace{\@sahshift}\={\saname}\\
   \>\@sastatus\\
diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls
index 800bb9ea0ff..b4e040c3f16 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-2007 Stanislav Kruchinin.
+%% Copyright (c) 2004-2009 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-2008 Stanislav Kruchinin
+%% Copyright (c) 2004-2009 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}[2007/11/29 Document class for dissertations.]
+\ProvidesClass{disser}[2008/11/11 1.1.0 Document class for dissertations.]
 
 \def\substyle@ext{.rtx}
 \newif\if@restonecol
@@ -57,10 +57,13 @@
 \newif\ifDis@candidate
 \newif\ifDis@doctor
 \newif\ifDis@autoref
+\newif\ifDis@libcat
+\newif\ifDis@facsimile
 
 \newif\ifDis@href
 \newif\ifDis@subf
 \newif\ifDis@times
+\newif\ifDis@mtpro
 
 \@titlepagetrue
 \Dis@bachelorfalse
@@ -69,8 +72,11 @@
 \Dis@doctorfalse
 \Dis@autoreffalse
 \Dis@timesfalse
+\Dis@mtprofalse
 \Dis@subffalse
 \Dis@hreffalse
+\Dis@libcatfalse
+\Dis@facsimilefalse
 
 \RequirePackage{kvoptions}[2006/08/17]
 
@@ -78,6 +84,9 @@
 
 \DeclareOption{subf}{\Dis@subftrue}
 
+\DeclareOption{libcat}{\Dis@libcattrue}
+\DeclareOption{facsimile}{\Dis@facsimiletrue}
+
 \SetupKeyvalOptions{
   family=Dis,
   prefix=Dis@
@@ -132,6 +141,7 @@
 
 \DeclareOption{fleqn}{\input{fleqn.clo}}
 \DeclareOption{times}{\Dis@timestrue}
+\DeclareOption{mtpro}{\Dis@mtprotrue}
 \DeclareOption{openbib}{%
   \AtEndOfPackage{%
     \renewcommand\@openbib@code{%
@@ -180,6 +190,10 @@
   \Dis@autoreftrue
 }
 
+\ExecuteOptions{a4paper,14pt,oneside,titlepage,onecolumn,final,openany}
+\ProcessOptions
+\ProcessKeyvalOptions{Dis}
+
 \DeclareRobustCommand\MakeTextUppercase{%
   \@uclcnotmath{\def\i{I}\def\j{J}}{##1##2}\uppercase}
 
@@ -190,10 +204,6 @@
 
 \protected@edef\MakeTextLowercase#1{\MakeTextLowercase{#1}}
 
-\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>%
@@ -270,9 +280,6 @@
 \onehalfspacing
 \setlength\parskip{0\p@ \@plus \p@}
 
-\setcounter{tocdepth}{1}
-\setcounter{secnumdepth}{2}
-
 \setlength\columnsep{10\p@}
 \setlength\columnseprule{0\p@}
 
@@ -293,6 +300,9 @@
 
 %%% From File: counters.dtx
 
+\setcounter{tocdepth}{1}
+\setcounter{secnumdepth}{2}
+
 \newcounter{part}
 \newcounter{chapter}
 \newcounter{section}[chapter]
@@ -302,6 +312,7 @@
 \newcounter{subparagraph}[paragraph]
 \newcounter{figure}[chapter]
 \newcounter{table}[chapter]
+
 \renewcommand\thepart{\@Roman\c@part}
 \renewcommand\thechapter{\@arabic\c@chapter}
 \newcommand\theappendix{\@Asbuk\c@chapter}
@@ -459,7 +470,8 @@
 \providecommand\prechapter{}
 \providecommand\postchapter{\par\nobreak\vskip 20\p@}
 
-\def\chapterpagestyle#1{\gdef\@chapterpagestyle{#1}}\chapterpagestyle{plain}
+\def\chapterpagestyle#1{\gdef\@chapterpagestyle{#1}}
+\chapterpagestyle{plain}
 
 \newcommand*\chaptermark[1]{}
 \newcommand\chapter{%
@@ -704,7 +716,7 @@
 \providecommand\paragraphindent{\z@}
 \providecommand\beforeparagraph{3.25ex \@plus1ex \@minus.2ex}
 \providecommand\afterparagraph{-1em}
-\providecommand\paragraphalign{\raggedright}
+\providecommand\paragraphalign{}
 
 \providecommand\tocprethesubparagraph{}
 \providecommand\tocpostthesubparagraph{.\@postskip}
@@ -923,25 +935,30 @@
   {\list{}{\labelwidth\z@ \itemindent-\leftmargin
     \let\makelabel\descriptionlabel}}
   {\endlist}
+
 \newcommand*\descriptionlabel[1]{\hspace\labelsep\normalfont\bfseries #1}
+
+\newcommand\abstractnamefont{\bfseries\small}
+\newcommand\abstractfont{\small}
+\newcommand\postabstract{\par\vfil\null}
+
 \if@titlepage
   \newenvironment{abstract}{
     \thispagestyle{empty}
     \@beginparpenalty\@lowpenalty
     \begin{center}%
-      \bfseries\small\abstractname
+      \abstractnamefont\abstractname
       \@endparpenalty\@M
-    \end{center}\small
-  }{\par\vfil\null}
+    \end{center}\abstractfont
+  }{\postabstract}
 \else
   \newenvironment{abstract}{
     \if@twocolumn
       \section*{\abstractname}
     \else
-      \small
       \begin{center}
-        {\bfseries\abstractname\vspace{-.5em}\vspace{\z@}}%
-      \end{center}
+        {\abstractnamefont\vspace{-.5em}\vspace{\z@}}%
+      \end{center}\abstractfont
       \quotation
     \fi
   }{\if@twocolumn\else\endquotation\fi}
@@ -967,8 +984,7 @@
   \fi
   \thispagestyle{empty}
   \setcounter{page}\@ne
-}
-{
+}{
   \if@restonecol\twocolumn\else\newpage\fi
   \if@twoside\else\setcounter{page}\@ne\fi
 }
@@ -1246,13 +1262,35 @@
 
 \let\@afterindentfalse\@afterindenttrue
 \@afterindenttrue
+\lccode`\-=`\-
+\defaulthyphenchar=127
+\hyphenchar\font=127
 \usepackage[intlimits]{amsmath}
 \usepackage{amssymb,amsfonts}
 \ifDis@times
+  \ifDis@mtpro
+  \AtBeginDocument{%
+    \IfFileExists{mtpro.sty}{
+      \usepackage[subscriptcorrection,nofontinfo,boldalphabet]{mtpro}
+    }{\PackageWarning{disser}{Unable to find mtpro package. Font is unchanged.}}
+  }
+  \else
   \AtEndOfPackage{%
-    \usepackage{pscyr}
-    \usepackage{txfonts}
-    \renewcommand{\rmdefault}{ftm}
+    \IfFileExists{txfonts.sty}{
+      \usepackage{txfonts}
+    }{\PackageWarning{disser}{Unable to find txfonts package. Font is unchanged.}}
+  }
+  \fi
+  \AtEndOfPackage{%
+    \IfFileExists{pscyr.sty}{
+      \usepackage{pscyr}
+      \renewcommand\rmdefault{ftm}
+      \renewcommand\ttdefault{cmtt}
+    }{
+      \IfFileExists{cyrtimes.sty}{
+        \usepackage{cyrtimes}
+      }{\PackageWarning{disser}{Unable to find pscyr or cyrtimes package. Font is unchanged.}}
+    }
   }
 \fi
 \ifDis@fixint
diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx
index d5052ee7231..dc28fffef06 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-2007 Stanislav Kruchinin.
+%% Copyright (c) 2004-2009 Stanislav Kruchinin.
 %% All rights reserved.
 %% 
 %% This file is part of the disser package.
@@ -14,31 +14,44 @@
 
 \ProvidesFile{doctor.rtx}
 
-\def\firstskip{\vskip1.5cm}
-\def\secondskip{\vskip3cm}
-\def\thirdskip{\vskip1cm}
-\def\fourthskip{\vskip1cm}
-\def\fifthskip{\vskip1cm}
+\newlength\firstskip
+\newlength\secondskip
+\newlength\thirdskip
+\newlength\fourthskip
+\newlength\fifthskip
+
+\ifDis@libcat
+  \setlength\firstskip{1em}
+\else
+  \setlength\firstskip{4em}
+\fi
+\setlength\secondskip{3cm}
+\setlength\thirdskip{1cm}
+\setlength\fourthskip{1cm}
+\setlength\fifthskip{1cm}
 
 \def\titlefont{\normalsize}
 \def\topicfont{\Large\bfseries}
 \def\authorfont{\large}
 \def\specfont{\normalsize}
 
+\vskip\firstskip
 \normalfont
 \begin{flushright}
-  \firstskip
   \asmanuscriptname\\
-  {\libcatname\;\@libcatnum}
+  \ifDis@facsimile\facsimile\fi
+\ifDis@libcat
+  {\libcatname\ \@libcatnum}
+\fi
 \end{flushright}
 \begin{center}
-  \secondskip
+  \vskip\secondskip
   {\authorfont\@author}
-  \thirdskip
+  \vskip\thirdskip
   {\topicfont\@topic\par}
-  \fourthskip
+  \vskip\fourthskip
   {\specfont\@specnum~--\;\@spec}
-  \fifthskip
+  \vskip\fifthskip
   {\titlefont\@title}
 \end{center}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls
index 61ad55de08b..3b6fd0666ff 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-2007 Stanislav Kruchinin.
+%% Copyright (c) 2004-2009 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-2007 Stanislav Kruchinin
+%% Copyright (c) 2004-2009 Stanislav Kruchinin
 %%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/disser/master.rtx b/Master/texmf-dist/tex/latex/disser/master.rtx
index 6697ee62717..83c754f80cf 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-2007 Stanislav Kruchinin.
+%% Copyright (c) 2004-2009 Stanislav Kruchinin.
 %% All rights reserved.
 %% 
 %% This file is part of the disser package.
@@ -14,31 +14,38 @@
 
 \ProvidesFile{master.rtx}
 
-\def\firstskip{\vspace*{1em}}
-\def\secondskip{\vspace*{1em}}
-\def\thirdskip{\vskip1.em}
-\def\fourthskip{\vspace*{-1cm}}
-\def\fifthskip{\vskip0em}
+\newlength\firstskip
+\newlength\secondskip
+\newlength\thirdskip
+\newlength\fourthskip
+\newlength\fifthskip
+
+\setlength\firstskip{1em}
+\setlength\secondskip{1em}
+\setlength\thirdskip{1em}
+\setlength\fourthskip{-1cm}
+\setlength\fifthskip{0em}
 
 \def\titlefont{\Large\bfseries}
 \def\topiclabelfont{\large}
 \def\topicfont{\large\bfseries}
 
-\firstskip\@approved\secondskip
+\vskip\firstskip
+\@approved
+\vskip\secondskip
 \begin{center}
   {\titlefont\@title}
-  \par\thirdskip
+  \vskip\thirdskip
   {\topiclabelfont\topiclabel}
   {\topicfont\@topic}
-  \par
 \end{center}
-\fourthskip
+\vskip\fourthskip
 \begin{tabbing}
   \phantom{\masterproglabel}\=\\
   \courselabel\>\ \@coursenum\ --\ \@course\\
   \masterproglabel\>\ \@masterprognum\ --\ \@masterprog
 \end{tabbing}
-\fifthskip
+\vskip\fifthskip
 \begin{tabbing}
   \studentlabel\ \groupname\ \@group\hspace{2cm}\=
   \makebox[8.5cm][l]{\hrulefill\ \@author}
diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
index 91aea5aba40..985cf3eaa17 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-2007 Stanislav Kruchinin.
+%% Copyright (c) 2004-2009 Stanislav Kruchinin.
 %% All rights reserved.
 %% 
 %% This file is part of the disser package.
@@ -73,8 +73,8 @@
 \date{\number\year}
 
 \def\yearname{\cyr\cyrg.}
-\let\introsect=\paragraph
-\def\postintrosect{\ }
+\let\commonsect=\textbf
+\def\postcommonsect{\ }
 \def\sa#1{\gdef\@sa{#1}}\sa{}
 \def\sastatus#1{\gdef\@sastatus{#1}}\sastatus{}
 \def\rev#1{\gdef\@rev{#1}}\rev{}
@@ -96,7 +96,8 @@
 }
 \newcommand\conclusion{\nchapter{\conclusionname}}
 \newcommand\defsname{%
-{\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ \cyru\cyrs\cyrl\cyro\cyrv\cyrn\cyrery\cyrh %
+{\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ %
+\cyri\cyrs\cyrp\cyro\cyrl\cyrsftsn\cyrz\cyru\cyre\cyrm\cyrery\cyrh\ %
 \cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri\cyrishrt}
 }
 \newcommand\defs{\nchapter{\defsname}}
@@ -124,11 +125,14 @@
 
 \newcommand\datefield[1][\number\year]{<<\rule[0pt]{1cm}{.5pt}\,>>%
 \rule[0pt]{3cm}{0.5pt}\ #1~\yearname}
-\newcommand\mkintrosect[3]{%
+\newcommand\mkcommonsect[3]{%
   \@namedef{#1head}{#2}
-  \@namedef{#1section}{\introsect{\expandafter\csname #1head\endcsname}\postintrosect}
+  \@namedef{#1section}{\commonsect{\expandafter\csname #1head\endcsname}\postcommonsect}
   \@namedef{#1text}{#3}
 }
+\let\mkintrosect=\mkcommonsect
+
+\newcommand\facsimile{\vskip 6pt\includegraphics[width=3cm]{facsimile}}
 
 \endinput
 %%