disser (4jan15)

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

5 files changed, 83 insertions, 64 deletions

diff --git a/Master/texmf-dist/tex/latex/disser/autoref.rtx b/Master/texmf-dist/tex/latex/disser/autoref.rtx
index f1df72acebe..9e3f11914b2 100644
--- a/Master/texmf-dist/tex/latex/disser/autoref.rtx
+++ b/Master/texmf-dist/tex/latex/disser/autoref.rtx
@@ -18,11 +18,11 @@
 \autoref@the
 
 \if@titlepage\renewcommand\maketitle{
-\deflength\firstskip{1cm}
-\deflength\secondskip{2cm}
-\deflength\thirdskip{1cm}
-\deflength\fourthskip{1cm}
-\deflength\fifthskip{1cm}
+\disser@deflength\firstskip{1cm}
+\disser@deflength\secondskip{2cm}
+\disser@deflength\thirdskip{1cm}
+\disser@deflength\fourthskip{1cm}
+\disser@deflength\fifthskip{1cm}
 
 \def\titlefont{\normalsize}
 \def\topicfont{\Large\bfseries}
diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx
index a3d2b64c3c7..9a6cffe1468 100644
--- a/Master/texmf-dist/tex/latex/disser/candidate.rtx
+++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx
@@ -61,7 +61,7 @@
 \vskip\firstskip
 \begin{flushright}
   \ifDis@classified\classify\fi
-  \asmanuscript\\
+  \asmanuscript%\\ %avoid no line to end error
   \ifDis@facsimile\facsimile\fi
   \ifDis@libcat\libcatname\ \@libcatnum\fi
 \end{flushright}
diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls
index 3300d06518a..33b9aab64a3 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}[2013/12/30 1.3.0 %
+\ProvidesClass{disser}[2015/01/03 1.3.1 %
   Document class for dissertations]
 
 \RequirePackage{kvoptions}
@@ -71,13 +71,14 @@
 \newif\ifDis@subf\Dis@subffalse
 \newif\ifDis@times\Dis@timesfalse
 \newif\ifDis@mtpro\Dis@mtprofalse
-
+\newif\ifDis@natbib\Dis@natbibfalse
 \DeclareOption{href}{\Dis@hreftrue}
 \DeclareOption{subf}{\Dis@subftrue}
 \DeclareOption{libcat}{\Dis@libcattrue}
 \DeclareOption{classified}{\Dis@classifiedtrue}
 \DeclareOption{facsimile}{\Dis@facsimiletrue}
 \DeclareOption{noams}{\Dis@amsfalse}
+\DeclareOption{natbib}{\Dis@natbibtrue}
 \DeclareOption{a4paper}{%
   \setlength\paperheight{297mm}
   \setlength\paperwidth {210mm}
@@ -286,7 +287,7 @@
 \DeclareRobustCommand*\cal{\@fontswitch\relax\mathcal}
 \DeclareRobustCommand*\mit{\@fontswitch\relax\mathnormal}
 
-\providecommand\deflength[2]{\newlength{#1}\setlength{#1}{#2}}
+\providecommand\disser@deflength[2]{\newlength{#1}\setlength{#1}{#2}}
 \providecommand\ifundeflength[2]{%
 \ifx#1\undefined \newlength{#1}\setlength{#1}{#2} \else \relax \fi
 }
@@ -335,17 +336,18 @@
 \newcounter{figure}[chapter]
 \newcounter{table}[chapter]
 
-\renewcommand\thepart{\@Roman\c@part}
-\renewcommand\thechapter{\@arabic\c@chapter}
+
+\renewcommand\thepart{\Roman{part}}
+\renewcommand\thechapter{\arabic{chapter}}
 \newcommand\theappendix{\Asbuk{chapter}}
 \renewcommand\thesection{%
 \ifnum\c@chapter > \z@
-  \thechapter.\@arabic\c@section%
-\else\@arabic\c@section\fi}
-\renewcommand\thesubsection{\thesection.\@arabic\c@subsection}
-\renewcommand\thesubsubsection{\thesubsection.\@arabic\c@subsubsection}
-\renewcommand\theparagraph{\@arabic\c@paragraph}
-\renewcommand\thesubparagraph{\theparagraph.\@arabic\c@subparagraph}
+  \thechapter.\arabic{section}%
+\else\arabic{section}\fi}
+\renewcommand\thesubsection{\thesection.\arabic{subsection}}
+\renewcommand\thesubsubsection{\thesubsection.\arabic{subsubsection}}
+\renewcommand\theparagraph{\arabic{paragraph}}
+\renewcommand\thesubparagraph{\theparagraph.\arabic{subparagraph}}
 
 \newcommand\tocthepart{\thepart}
 \newcommand\tocthechapter{\thechapter}
@@ -898,9 +900,9 @@
 \@itempenalty     -\@lowpenalty
 
 \renewcommand\theenumi  {\@arabic\c@enumi}
-\renewcommand\theenumii {\@asbuk\c@enumii}
+\renewcommand\theenumii {\disser@asbuk\c@enumii}
 \renewcommand\theenumiii{\@roman\c@enumiii}
-\renewcommand\theenumiv {\@Asbuk\c@enumiv}
+\renewcommand\theenumiv {\disser@Asbuk\c@enumiv}
 \newcommand\labelenumi  {\theenumi.}
 \newcommand\labelenumii {\theenumii.}
 \newcommand\labelenumiii{\theenumiii.}
@@ -925,8 +927,8 @@
 \renewcommand\floatpagefraction{.5}
 \renewcommand\dbltopfraction{.7}
 \renewcommand\dblfloatpagefraction{.5}
-\deflength\abovecaptionskip{10\p@}
-\deflength\belowcaptionskip{0\p@}
+\disser@deflength\abovecaptionskip{10\p@}
+\disser@deflength\belowcaptionskip{0\p@}
 \newcommand\captionlabeldelim{.}
 \newcommand\captionfont{\small}
 \newcommand\captionlabelfont{\small\selectfont}
@@ -979,7 +981,7 @@
 \providecommand\prethefootnote{}
 \providecommand\postthefootnote{}
 \providecommand\prefootnote{\;}
-\deflength{\footnoteindent}{\parindent}
+\disser@deflength{\footnoteindent}{\parindent}
 
 \def\@makefnmark{\hbox{\prethefootnote%
 \@textsuperscript{\normalfont\@thefnmark}%
@@ -1260,7 +1262,7 @@
 
 %%% From File: toc.dtx
 
-\def\@postskip{\hskip1em}
+\def\@postskip{\texorpdfstring{\hskip1em}{  }}
 \newcommand\@pnumwidth{1.55em}
 \newcommand\@tocrmarg{2.55em}
 \newcommand\@dotsep{4.5}
@@ -1410,55 +1412,72 @@
   }{}
 \fi
 
-\usepackage[square,comma,sort&compress,numbers]{natbib}
+\ifDis@natbib
+  \usepackage[square,comma,sort&compress,numbers]{natbib}
+\else
+  \newcommand\bibsection{}
+  \newcommand\bibpreamble{}
+  \newcommand\bibpostamble{}
+  \newcommand\bibfont{\normalfont\selectfont}
+  \newlength\bibsep
+\fi
 
 \renewcommand\bibsection{\nchapter{\bibname}}
-\@ifundefined{chapter}{%
-  \renewcommand\bibsection{%
-   \nsection{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}%
-  }%
-}{%
-  \@ifxundefined\NAT@sectionbib{%
-    \renewcommand\bibsection{%
-      \nchapter{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}%
-    }%
-  }{%
-    \renewcommand\bibsection{%
-      \nsection{\bibname\ifx\@mkboth\@gobbletwo\else\markright{\MakeUppercase{\bibname}}\fi}%
-    }%
-  }%
-}%
 
 \renewcommand\bibpreamble{%
   \renewcommand\@biblabel[1]{##1.}%
+  \setlength\bibsep{0pt}
 }
 
-\renewenvironment{thebibliography}[1]{%
-  \setlength\bibsep{0pt}
-  \bibsection
-  \parindent \z@
-  \bibpreamble\bibfont
-  \list{\@biblabel{\arabic{NAT@ctr}}}%
-  {\@bibsetup{#1}\setcounter{NAT@ctr}{0}}%
-  \ifNAT@openbib
-    \renewcommand\newblock{\par}
-  \else
-    \renewcommand\newblock{\hskip .11em \@plus.33em \@minus.07em}%
-  \fi
-  \sloppy\clubpenalty4000\widowpenalty4000
-  \sfcode`\.=1000\relax
-  \let\citeN\cite
-  \let\shortcite\cite
-  \let\citeasnoun\cite
+\@ifpackageloaded{natbib}{
+  \@ifundefined{chapter}{%
+    \renewcommand\bibsection{%
+     \nsection{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}%
+    }%
+  }{%
+    \@ifxundefined\NAT@sectionbib{%
+      \renewcommand\bibsection{%
+        \nchapter{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}%
+      }%
+    }{%
+      \renewcommand\bibsection{%
+        \nsection{\bibname\ifx\@mkboth\@gobbletwo\else\markright{\MakeUppercase{\bibname}}\fi}%
+      }%
+    }%
+  }%
 }{%
-  \def\@noitemerr{%
-    \PackageWarning{natbib}{Empty `thebibliography' environment}%
+  \@ifundefined{chapter}{%
+    \renewcommand\bibsection{%
+     \nsection{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}%
+    }%
+  }{}
+  \renewenvironment{thebibliography}[1]{
+    \bibsection
+    \parindent\z@
+    \bibpreamble\bibfont
+    \list{\@biblabel{\@arabic\c@enumiv}}{\settowidth\labelwidth{\@biblabel{#1}}%
+    \setlength{\itemsep}{\bibsep}
+    \setlength{\parsep}{\bibsep}
+    \leftmargin\labelwidth
+    \advance\leftmargin\labelsep
+    \@openbib@code
+    \usecounter{enumiv}%
+    \let\p@enumiv\@empty
+    \renewcommand\theenumiv{\@arabic\c@enumiv}}%
+    \sloppy\clubpenalty4000\widowpenalty4000
+    \sfcode`\.\@m
+  }{%
+    \bibpostamble
+    \def\@noitemerr
+    {\@latex@warning{Empty `thebibliography' environment}}%
+    \endlist
   }
-  \endlist\vskip-\lastskip%
 }
 
 \ifDis@subf
-  \usepackage[config,font=small,labelsep=period]{caption,subfig}
+  \usepackage[config,font=small,labelsep=period]{caption}
+  \usepackage[list=true,subrefformat=parens]{subcaption}
+  \DeclareCaptionSubType[asbuk]{figure}
   \def\thesubfigure{\textit{\asbuk{subfigure}}}
   \providecommand\thefigsubsep{,~}
   \def\p@subfigure{\@nameuse{thefigure}\thefigsubsep}
diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls
index 1c23feca17d..b42500ac88e 100644
--- a/Master/texmf-dist/tex/latex/disser/gost732.cls
+++ b/Master/texmf-dist/tex/latex/disser/gost732.cls
@@ -78,10 +78,10 @@
 \renewcommand\conclusionname{%
 \cyr\CYRZ\CYRA\CYRK\CYRL\CYRYU\CYRCH\CYRE\CYRN\CYRI\CYRE
 }
-\renewcommand\theenumi  {\@asbuk\c@enumi}
+\renewcommand\theenumi  {\disser@asbuk\c@enumi}
 \renewcommand\theenumii {\@arabic\c@enumii}
 \renewcommand\theenumiii{\@roman\c@enumiii}
-\renewcommand\theenumiv {\@Asbuk\c@enumiv}
+\renewcommand\theenumiv {\disser@Asbuk\c@enumiv}
 
 \renewcommand\labelenumi  {\theenumi)}
 \renewcommand\labelenumii {\theenumii)}
diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
index 1b20a952480..3508d169b20 100644
--- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx
+++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
@@ -155,12 +155,12 @@
   \addto\captionsrussian{%
     \def\listfigurename{\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ %
     \cyri\cyrl\cyrl\cyryu\cyrs\cyrt\cyrr\cyra\cyrt\cyri\cyrv\cyrn\cyro%
-    \cyrg\cyro %
+    \cyrg\cyro\ %
     \cyrm\cyra\cyrt\cyre\cyrr\cyri\cyra\cyrl\cyra}
   }
 }
 
-\deflength\fieldhshift{8cm}
+\disser@deflength\fieldhshift{8cm}
 
 \providecommand\diplomafield[1]{%
   \csname #1label\endcsname,\\%