disser (4jan15)

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

11 files changed, 106 insertions, 75 deletions

diff --git a/Master/texmf-dist/source/latex/disser/autoref.dtx b/Master/texmf-dist/source/latex/disser/autoref.dtx
index 39072240691..a643719f497 100644
--- a/Master/texmf-dist/source/latex/disser/autoref.dtx
+++ b/Master/texmf-dist/source/latex/disser/autoref.dtx
@@ -24,11 +24,11 @@
 % \DescribeMacro{\fourthskip}\index{Расстояния!\verb*+\fourthskip+}
 % \DescribeMacro{\fifthskip}\index{Расстояния!\verb*+\fifthskip+}
 %    \begin{macrocode}
-\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}
 
 %    \end{macrocode}
 % Шрифты элементов титульного листа.
diff --git a/Master/texmf-dist/source/latex/disser/candidate.dtx b/Master/texmf-dist/source/latex/disser/candidate.dtx
index 052b1df8693..7fd422c0ce0 100644
--- a/Master/texmf-dist/source/latex/disser/candidate.dtx
+++ b/Master/texmf-dist/source/latex/disser/candidate.dtx
@@ -84,7 +84,7 @@
 %    \end{macrocode}
 % На правах рукописи
 %    \begin{macrocode}
-  \asmanuscript\\
+  \asmanuscript%\\ %avoid no line to end error
 %    \end{macrocode}
 % Факсимиле
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/disser/counters.dtx b/Master/texmf-dist/source/latex/disser/counters.dtx
index 738269e2200..a429c8aed1d 100644
--- a/Master/texmf-dist/source/latex/disser/counters.dtx
+++ b/Master/texmf-dist/source/latex/disser/counters.dtx
@@ -60,17 +60,18 @@
 % \DescribeMacro{\theparagraph}\index{Макросы!\verb*+\theparagraph+}
 % \DescribeMacro{\thesubparagraph}\index{Макросы!\verb*+\thesubparagraph+}
 %    \begin{macrocode}
-\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}}
 
 %    \end{macrocode}
 % Формат нумерации разделов документа в оглавлении.
diff --git a/Master/texmf-dist/source/latex/disser/custom.dtx b/Master/texmf-dist/source/latex/disser/custom.dtx
index 668e1e12b1f..6410d7762a4 100644
--- a/Master/texmf-dist/source/latex/disser/custom.dtx
+++ b/Master/texmf-dist/source/latex/disser/custom.dtx
@@ -122,29 +122,29 @@
 % \subsubsection{Библиографические ссылки}
 % \DescribePackage{natbib}\index{Пакеты!\verb*+natbib+}
 %    \begin{macrocode}
-\usepackage[square,comma,sort&compress,numbers]{natbib}
+\ifDis@natbib
+  \usepackage[square,comma,sort&compress,numbers]{natbib}
+\else
+%    \end{macrocode}
+% Пустые определения команд из пакета |natbib|.
+% \DescribeMacro{\bibsection}\index{Макросы!\verb*+\bibsection+}
+% \DescribeMacro{\bibpreamble}\index{Макросы!\verb*+\bibpreamble+}
+% \DescribeMacro{\bibpostamble}\index{Макросы!\verb*+\bibpostamble+}
+% \DescribeMacro{\bibfont}\index{Макросы!\verb*+\bibfont+}
+% \DescribeMacro{\bibsep}\index{Макросы!\verb*+\bibsep+}
+%    \begin{macrocode}
+  \newcommand\bibsection{}
+  \newcommand\bibpreamble{}
+  \newcommand\bibpostamble{}
+  \newcommand\bibfont{\normalfont\selectfont}
+  \newlength\bibsep
+\fi
 
 %    \end{macrocode}
-% Переопределение |\bibsection| для включения ссылки на список литературы в
-% оглавление.
+% Команда, создающая заголовок библиографии.
 % \DescribeMacro{\bibsection}\index{Макросы!\verb*+\bibsection+}
 %    \begin{macrocode}
 \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}%
-    }%
-  }%
-}%
 
 %    \end{macrocode}
 % Преамбула окружения |thebibliography|.
@@ -156,50 +156,72 @@
 % \DescribeMacro{\@biblabel}\index{Макросы!\verb*+"\"@biblabel+}
 %    \begin{macrocode}
   \renewcommand\@biblabel[1]{##1.}%
+  \setlength\bibsep{0pt}
 }
 
+\@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}%
+      }%
+    }%
+  }%
+}{%
+  \@ifundefined{chapter}{%
+    \renewcommand\bibsection{%
+     \nsection{\bibname\@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}}%
+    }%
+  }{}
 %    \end{macrocode}
-% Переопределение окружения |thebibliography| для создания корректной
-% PDF-закладки (основано на варианте из \pkg{natbib}).
 % \DescribeEnv{thebibliography}\index{Окружения!\verb*+thebibliography+}
 %    \begin{macrocode}
-\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
-}{%
-  \def\@noitemerr{%
-    \PackageWarning{natbib}{Empty `thebibliography' environment}%
+  \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%
 }
 
 %    \end{macrocode}
 % \subsubsection{Плавающие объекты}
 %
-% Пакеты \pkg{caption} и \pkg{subfig} для вложенной нумерации плавающих
+% Пакеты \pkg{caption} и \pkg{subcaption} для вложенной нумерации плавающих
 % объектов.
 % \DescribePackage{caption}\index{Пакеты!\verb*+caption+}
-% \DescribePackage{subfig}\index{Пакеты!\verb*+subfig+}
+% \DescribePackage{subcaption}\index{Пакеты!\verb*+subcaption+}
 %    \begin{macrocode}
 \ifDis@subf
-  \usepackage[config,font=small,labelsep=period]{caption,subfig}
+  \usepackage[config,font=small,labelsep=period]{caption}
+  \usepackage[list=true,subrefformat=parens]{subcaption}
 %    \end{macrocode}
 % Формат счетчика.
 %    \begin{macrocode}
+  \DeclareCaptionSubType[asbuk]{figure}
   \def\thesubfigure{\textit{\asbuk{subfigure}}}
 %    \end{macrocode}
 % Формат ссылки через |\ref|.
diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx
index 4f01dfb9ab9..8f943be3a15 100644
--- a/Master/texmf-dist/source/latex/disser/disser.dtx
+++ b/Master/texmf-dist/source/latex/disser/disser.dtx
@@ -19,7 +19,7 @@
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %<*driver>
-\ProvidesFile{disser.drv}[2013/12/30 1.3.0 %
+\ProvidesFile{disser.drv}[2015/01/03 1.3.1 %
   Document class for dissertations]
 
 \documentclass{ltxdoc}
@@ -65,6 +65,7 @@
 \usepackage[T2A]{fontenc}
 \usepackage[cp1251]{inputenc}
 \usepackage[english,russian]{babel}
+
 \usepackage{microtype}
 
 \MakeShortVerb{\|}
@@ -182,7 +183,7 @@
 
 %<*disser>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2013/12/30 1.3.0 %
+\ProvidesClass{disser}[2015/01/03 1.3.1 %
   Document class for dissertations]
 
 %    \end{macrocode}
@@ -251,7 +252,7 @@
 %    \begin{macrocode}
 \newif\ifDis@href\Dis@hreffalse
 %    \end{macrocode}
-% \item Подключение \pkg{subfig} (отключено).
+% \item Подключение \pkg{subcaption} (отключено).
 %    \begin{macrocode}
 \newif\ifDis@subf\Dis@subffalse
 %    \end{macrocode}
@@ -262,7 +263,10 @@
 % \item Поддержка математических шрифтов MathTime Pro (отключено).
 %    \begin{macrocode}
 \newif\ifDis@mtpro\Dis@mtprofalse
-
+%    \end{macrocode}
+% \item Подключение \pkg{natbib} (отключено).
+%    \begin{macrocode}
+\newif\ifDis@natbib\Dis@natbibfalse
 %    \end{macrocode}
 % \end{itemize}
 %
@@ -272,7 +276,7 @@
 %    \begin{macrocode}
 \DeclareOption{href}{\Dis@hreftrue}
 %    \end{macrocode}
-% Подключение пакета \pkg{subfig} и необходимых настроек.
+% Подключение пакета \pkg{subcaption} и необходимых настроек.
 %    \begin{macrocode}
 \DeclareOption{subf}{\Dis@subftrue}
 %    \end{macrocode}
@@ -292,6 +296,10 @@
 %    \begin{macrocode}
 \DeclareOption{noams}{\Dis@amsfalse}
 %    \end{macrocode}
+% Подключение пакета \pkg{natbib} и необходимых настроек.
+%    \begin{macrocode}
+\DeclareOption{natbib}{\Dis@natbibtrue}
+%    \end{macrocode}
 % Размеры листов.
 %    \begin{macrocode}
 \DeclareOption{a4paper}{%
@@ -584,9 +592,9 @@
 
 %    \end{macrocode}
 % Команда, объединяющая |\newlength| и |\setlength|.
-% \DescribeMacro{\deflength}\index{Макросы!\verb*+\deflength+}
+% \DescribeMacro{\disser@deflength}\index{Макросы!\verb*+\disser@deflength+}
 %    \begin{macrocode}
-\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
 }
diff --git a/Master/texmf-dist/source/latex/disser/floats.dtx b/Master/texmf-dist/source/latex/disser/floats.dtx
index 73115b45b46..153bfbc25f4 100644
--- a/Master/texmf-dist/source/latex/disser/floats.dtx
+++ b/Master/texmf-dist/source/latex/disser/floats.dtx
@@ -86,12 +86,12 @@
 % \DescribeMacro{\abovecaptionskip}\index{Расстояния!\verb*+\abovecaptionskip+}
 % Вертикальный интервал перед подписью.
 %    \begin{macrocode}
-\deflength\abovecaptionskip{10\p@}
+\disser@deflength\abovecaptionskip{10\p@}
 %    \end{macrocode}
 % \DescribeMacro{\belowcaptionskip}\index{Расстояния!\verb*+\belowcaptionskip+}
 % Вертикальный интервал за подписью.
 %    \begin{macrocode}
-\deflength\belowcaptionskip{0\p@}
+\disser@deflength\belowcaptionskip{0\p@}
 %    \end{macrocode}
 % \DescribeMacro{\captionlabeldelim}\index{Макросы!\verb*+\captionlabeldelim+}
 % Разделитель метки (постоянная часть + номер) и текста подписи.
diff --git a/Master/texmf-dist/source/latex/disser/footnote.dtx b/Master/texmf-dist/source/latex/disser/footnote.dtx
index 515e6e2dd03..97436ed7e37 100644
--- a/Master/texmf-dist/source/latex/disser/footnote.dtx
+++ b/Master/texmf-dist/source/latex/disser/footnote.dtx
@@ -42,7 +42,7 @@
 %    \end{macrocode}
 % \DescribeMacro{\footnoteindent}\index{Расстояния!\verb+\footnoteindent+}
 %    \begin{macrocode}
-\deflength{\footnoteindent}{\parindent}
+\disser@deflength{\footnoteindent}{\parindent}
 
 %    \end{macrocode}
 % \DescribeMacro{\@makefnmark}\index{Макросы!\verb+\@makefnmark+}
diff --git a/Master/texmf-dist/source/latex/disser/gost732.dtx b/Master/texmf-dist/source/latex/disser/gost732.dtx
index 50203ab3790..bb464e00888 100644
--- a/Master/texmf-dist/source/latex/disser/gost732.dtx
+++ b/Master/texmf-dist/source/latex/disser/gost732.dtx
@@ -288,10 +288,10 @@ and the derived files
 %
 % Формат счетчиков.
 %    \begin{macrocode}
-\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}
 
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/disser/lists.dtx b/Master/texmf-dist/source/latex/disser/lists.dtx
index 0ee1573ea02..d10293c9f96 100644
--- a/Master/texmf-dist/source/latex/disser/lists.dtx
+++ b/Master/texmf-dist/source/latex/disser/lists.dtx
@@ -69,9 +69,9 @@
 % Формат счетчиков.
 %    \begin{macrocode}
 \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}
 %    \end{macrocode}
 %
 % \DescribeMacro{\labelenumi}\index{Макросы!\verb*+\labelenumi+}
diff --git a/Master/texmf-dist/source/latex/disser/titledefs.dtx b/Master/texmf-dist/source/latex/disser/titledefs.dtx
index 72133c82021..0444b992a63 100644
--- a/Master/texmf-dist/source/latex/disser/titledefs.dtx
+++ b/Master/texmf-dist/source/latex/disser/titledefs.dtx
@@ -411,7 +411,7 @@
   \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}
   }
 }
@@ -422,7 +422,7 @@
 % \subsubsection{Элементы титульного листа}
 %
 %    \begin{macrocode}
-\deflength\fieldhshift{8cm}
+\disser@deflength\fieldhshift{8cm}
 
 %    \end{macrocode}
 % \DescribeMacro{\namefield}\index{Макросы!\verb*+\namefield+}
diff --git a/Master/texmf-dist/source/latex/disser/toc.dtx b/Master/texmf-dist/source/latex/disser/toc.dtx
index 74f16a4a403..de8da6e517c 100644
--- a/Master/texmf-dist/source/latex/disser/toc.dtx
+++ b/Master/texmf-dist/source/latex/disser/toc.dtx
@@ -16,7 +16,7 @@
 % Горизонтальный пробел между постоянной и переменной частями заголовков.
 % \DescribeMacro{\@postskip}\index{Макросы!\verb+"\"@postskip+}
 %    \begin{macrocode}
-\def\@postskip{\hskip1em}
+\def\@postskip{\texorpdfstring{\hskip1em}{  }}
 %    \end{macrocode}
 % Длина пробела между заполнителем строки и номером страницы.
 % \DescribeMacro{\@pnumwidth}\index{Макросы!\verb+"\"@pnumwidth+}