disser 1.1.7 (22nov10)

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

1 files changed, 36 insertions, 11 deletions

diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx
index ed5bb05472c..18f9e1e8261 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}[2010/05/22 1.1.6 Document class for dissertations]
+\ProvidesFile{disser.drv}[2010/11/21 1.1.7 Document class for dissertations]
 
 \documentclass{ltxdoc}
 \usepackage[a4paper,includeheadfoot,nohead,mag=1000,
@@ -36,8 +36,7 @@
 \fi
 
 \hypersetup{
-  pdfusetitle,
-  pdftitle           = {Documented source code of the disser package},
+  pdftitle           = {Documented source code of disser class},
   pdfauthor          = {Stanislav Kruchinin},
   pdfsubject         = {disser},
   pdfstartview       = {FitH},
@@ -124,6 +123,7 @@
   \DocInput{titledefs.dtx}
   \DocInput{titlepage.dtx}
   \DocInput{bachelor.dtx}
+  \DocInput{specialist.dtx}
   \DocInput{master.dtx}
   \DocInput{candidate.dtx}
   \DocInput{doctor.dtx}
@@ -180,7 +180,7 @@
 
 %<*disser>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2010/05/22 1.1.6 Document class for dissertations]
+\ProvidesClass{disser}[2010/06/13 1.1.7 Document class for dissertations]
 
 %    \end{macrocode}
 % Подключение пакета \pkg{kvoptions} для обработки опций в формате
@@ -197,6 +197,14 @@
 %    \begin{macrocode}
 \RequirePackage{ifpdf}
 
+% \item подключение пакета \pkg{ifthen} для построчных сравнений.
+% \DescribePackage{ifthen}\index{Пакеты!\verb*+ifthen+}
+\RequirePackage{ifthen}
+
+%    \end{macrocode}
+% \item Англоязычная версия титульного листа.
+%    \begin{macrocode}
+\newif\if@titlepage@en\@titlepage@enfalse
 %    \end{macrocode}
 % \item Разрешено оставлять одну колонку при двухколонном наборе.
 %    \begin{macrocode}
@@ -213,6 +221,7 @@
 % \item Типы документов (по умолчанию candidate).
 %    \begin{macrocode}
 \newif\ifDis@bachelor\Dis@bachelorfalse
+\newif\ifDis@specialist\Dis@specialistfalse
 \newif\ifDis@master\Dis@masterfalse
 \newif\ifDis@candidate\Dis@candidatetrue
 \newif\ifDis@doctor\Dis@doctorfalse
@@ -387,6 +396,15 @@
 %    \begin{macrocode}
 \DeclareOption{bachelor}{%
   \Dis@bachelortrue
+  \Dis@specialistfalse
+  \Dis@masterfalse
+  \Dis@candidatefalse
+  \Dis@doctorfalse
+  \Dis@autoreffalse
+}
+\DeclareOption{specialist}{%
+  \Dis@bachelorfalse
+  \Dis@specialisttrue
   \Dis@masterfalse
   \Dis@candidatefalse
   \Dis@doctorfalse
@@ -394,6 +412,7 @@
 }
 \DeclareOption{master}{%
   \Dis@bachelorfalse
+  \Dis@specialistfalse
   \Dis@mastertrue
   \Dis@candidatefalse
   \Dis@doctorfalse
@@ -451,11 +470,12 @@
 % Файл с описанием разметки титульного листа по умолчанию.
 %    \begin{macrocode}
 \ifx\Dis@substylefile\@empty
-  \ifDis@bachelor \renewcommand*{\Dis@substylefile}{bachelor.rtx}\fi
-  \ifDis@master   \renewcommand*{\Dis@substylefile}{master.rtx}\fi
-  \ifDis@candidate\renewcommand*{\Dis@substylefile}{candidate.rtx}\fi
-  \ifDis@doctor   \renewcommand*{\Dis@substylefile}{doctor.rtx}\fi
-  \ifDis@autoref  \renewcommand*{\Dis@substylefile}{autoref.rtx}\fi
+  \ifDis@bachelor   \renewcommand*{\Dis@substylefile}{bachelor.rtx}\fi
+  \ifDis@specialist \renewcommand*{\Dis@substylefile}{specialist.rtx}\fi
+  \ifDis@master     \renewcommand*{\Dis@substylefile}{master.rtx}\fi
+  \ifDis@candidate  \renewcommand*{\Dis@substylefile}{candidate.rtx}\fi
+  \ifDis@doctor     \renewcommand*{\Dis@substylefile}{doctor.rtx}\fi
+  \ifDis@autoref    \renewcommand*{\Dis@substylefile}{autoref.rtx}\fi
 \fi
 
 %    \end{macrocode}
@@ -529,11 +549,13 @@
 }{}
 \DeclareFontShape{OT1}{cmr}{bx}{sl}{%
   <5><6><7><8><9>%
-  <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxsl10%
+  <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99>%
+  <51.59>cmbxsl10%
 }{}
 \DeclareFontShape{OT1}{cmr}{bx}{it}{%
   <5><6><7><8><9>%
-  <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxti10%
+  <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99>%
+  <51.59>cmbxti10%
 }{}
 \input{size\@ptsize.clo}
 \RequirePackage{exscale}
@@ -562,6 +584,9 @@
 % \DescribeMacro{\deflength}\index{Макросы!\verb*+\deflength+}
 %    \begin{macrocode}
 \providecommand\deflength[2]{\newlength{#1}\setlength{#1}{#2}}
+\providecommand\ifundeflength[2]{%
+\ifx#1\undefined \newlength{#1}\setlength{#1}{#2} \else \relax \fi
+}
 
 %    \end{macrocode}
 %