disser (5jul16)

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

1 files changed, 11 insertions, 7 deletions

diff --git a/Master/texmf-dist/source/latex/disser/candidate.dtx b/Master/texmf-dist/source/latex/disser/candidate.dtx
index 6964a6a80f3..73f09869162 100644
--- a/Master/texmf-dist/source/latex/disser/candidate.dtx
+++ b/Master/texmf-dist/source/latex/disser/candidate.dtx
@@ -26,7 +26,7 @@
   \def\sconname{Scientific Consultant}
   \def\sconlabel{\sconname}
   \def\sconsndname{\sconname}
-  \def\sconsndlabel{\sconsndname}
+  \def\sconsndlabel{\sconname}
   \def\topicname{Topic}
   \def\asmanuscript{As Manuscript}
 \fi
@@ -44,10 +44,10 @@
 %    \begin{macrocode}
 \ifx\firstskip\undefined
   \newlength\firstskip
-  \ifDis@libcat
-    \setlength\firstskip{2ex}
-  \else
+  \ifx\@libcatnum\empty
     \setlength\firstskip{4ex}
+  \else
+    \setlength\firstskip{2ex}
   \fi
 \fi
 \ifundeflength\secondskip{2cm}
@@ -55,6 +55,7 @@
 \ifundeflength\fourthskip{1cm}
 \ifundeflength\fifthskip{1cm}
 \ifundeflength\sixthskip{0cm}
+\ifundeflength\libcatskip{0cm}
 \ifundeflength\specskip{-6pt}
 \ifundeflength\saskip{0pt}
 
@@ -88,7 +89,7 @@
 %    \end{macrocode}
 % На правах рукописи
 %    \begin{macrocode}
-  \asmanuscript%\\ %avoid no line to end error
+  \asmanuscript
 %    \end{macrocode}
 % Факсимиле
 %    \begin{macrocode}
@@ -96,7 +97,10 @@
 %    \end{macrocode}
 % Номер УДК
 %    \begin{macrocode}
-  \ifDis@libcat\libcatname\ \@libcatnum\fi
+  \ifx\@libcatnum\empty\else
+    \vskip\libcatskip
+    {\libcatname\ \@libcatnum}
+  \fi
 \end{flushright}
 \begin{center}
 %    \end{macrocode}
@@ -116,7 +120,7 @@
   {\specfont\@specnum~--\ \@spec}
   \ifx\@specsndnum\empty\else
     \vskip\specskip
-	{\specfont\@specsndnum~--\ \@specsnd}
+    {\specfont\@specsndnum~--\ \@specsnd}
   \fi
 %    \end{macrocode}
 % Диссертация на соискание ученой степени...