1 files changed, 23 insertions, 22 deletions
diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx
index 30d6d2581ff..ed5bb05472c 100644
--- a/Master/texmf-dist/source/latex/disser/disser.dtx
+++ b/Master/texmf-dist/source/latex/disser/disser.dtx
@@ -3,7 +3,7 @@
 %%
 %% disser -- LaTeX document class for dissertations.
 %%
-%% Copyright (c) 2004-2009 Stanislav Kruchinin
+%% Copyright (c) 2004-2010 Stanislav Kruchinin
 %%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,7 +19,7 @@
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %<*driver>
-\ProvidesFile{disser.drv}[2009/03/23 1.1.5 Document class for dissertations]
+\ProvidesFile{disser.drv}[2010/05/22 1.1.6 Document class for dissertations]
 
 \documentclass{ltxdoc}
 \usepackage[a4paper,includeheadfoot,nohead,mag=1000,
@@ -121,13 +121,13 @@
   \DocInput{floats.dtx}
   \DocInput{env.dtx}
   \DocInput{page.dtx}
+  \DocInput{titledefs.dtx}
   \DocInput{titlepage.dtx}
   \DocInput{bachelor.dtx}
   \DocInput{master.dtx}
   \DocInput{candidate.dtx}
   \DocInput{doctor.dtx}
   \DocInput{autoref.dtx}
-  \DocInput{titledefs.dtx}
   \DocInput{toc.dtx}
   \DocInput{custom.dtx}
   \IndexPrologue{\section{Предметный указатель}}
@@ -180,7 +180,7 @@
 
 %<*disser>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2009/03/23 1.1.5 Document class for dissertations]
+\ProvidesClass{disser}[2010/05/22 1.1.6 Document class for dissertations]
 
 %    \end{macrocode}
 % Подключение пакета \pkg{kvoptions} для обработки опций в формате
@@ -435,7 +435,7 @@
 % Создание цветных ссылок.
 %    \begin{macrocode}
 \DeclareBoolOption[false]{colorlinks}
-\DeclareStringOption{titlepagefile}
+\DeclareStringOption{substylefile}
 
 %    \end{macrocode}
 % Выполнение опций по умолчанию.
@@ -450,30 +450,25 @@
 %    \end{macrocode}
 % Файл с описанием разметки титульного листа по умолчанию.
 %    \begin{macrocode}
-\ifx\Dis@titlepagefile\@empty
-  \ifDis@bachelor \renewcommand*{\Dis@titlepagefile}{bachelor.rtx}\fi
-  \ifDis@master   \renewcommand*{\Dis@titlepagefile}{master.rtx}\fi
-  \ifDis@candidate\renewcommand*{\Dis@titlepagefile}{candidate.rtx}\fi
-  \ifDis@doctor   \renewcommand*{\Dis@titlepagefile}{doctor.rtx}\fi
-  \ifDis@autoref  \renewcommand*{\Dis@titlepagefile}{autoref.rtx}\fi
+\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
 \fi
 
 %    \end{macrocode}
-% Команды изменения регистра.
-% \DescribeMacro{\MakeTextUppercase}\index{Макросы!\verb*+\MakeTextUppercase+}
+% Подключение стиля документа.
 %    \begin{macrocode}
-\DeclareRobustCommand\MakeTextUppercase{%
-  \@uclcnotmath{\def\i{I}\def\j{J}}{##1##2}\uppercase}
-
-\protected@edef\MakeTextUppercase#1{\MakeTextUppercase{#1}}
+\AtEndOfClass{\input{\Dis@substylefile}}
 
 %    \end{macrocode}
-% \DescribeMacro{\MakeTextLowercase}\index{Макросы!\verb*+\MakeTextLowercase+}
+% Определение команд изменения регистра |\MakeTextUppercase|
+% и |\MakeTextLowercase|.
+% \DescribeMacro{textcase}\index{Пакеты!\verb*+textcase+}
 %    \begin{macrocode}
-\DeclareRobustCommand\MakeTextLowercase{%
-  \@uclcnotmath{}{##2##1}\lowercase}
-
-\protected@edef\MakeTextLowercase#1{\MakeTextLowercase{#1}}
+\RequirePackage[overload]{textcase}
 
 %    \end{macrocode}
 % \subsection{Настройка шрифтов}
@@ -640,6 +635,12 @@
 %    \begin{macrocode}
 \lccode`\-=`\-
 \defaulthyphenchar=127
+%    \end{macrocode}
+% Пустое определение макроса для вывода сегодняшней даты (переопределяется
+% в \pkg{babel}).
+% \DescribeMacro{\today}\index{Макросы!\verb*+\today+}
+%    \begin{macrocode}
+\newcommand\today{}
 
 %</disser>
 %    \end{macrocode}