From 53ef995986cf28c61e47d976d1a2b681ef9e1d7b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 23 Nov 2012 22:45:06 +0000 Subject: disser (23nov12) git-svn-id: svn://tug.org/texlive/trunk@28342 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/disser/autoref.dtx | 2 +- Master/texmf-dist/source/latex/disser/bachelor.dtx | 2 +- Master/texmf-dist/source/latex/disser/candidate.dtx | 11 +++++------ Master/texmf-dist/source/latex/disser/disser.dtx | 6 +++--- Master/texmf-dist/source/latex/disser/doctor.dtx | 17 ++++++++--------- Master/texmf-dist/source/latex/disser/gost705.dtx | 2 +- Master/texmf-dist/source/latex/disser/gost732.dtx | 4 ++-- Master/texmf-dist/source/latex/disser/master.dtx | 8 +++++--- Master/texmf-dist/source/latex/disser/page.dtx | 4 ++-- Master/texmf-dist/source/latex/disser/specialist.dtx | 2 +- Master/texmf-dist/source/latex/disser/titledefs.dtx | 19 +++++++++++++------ 11 files changed, 42 insertions(+), 35 deletions(-) (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/disser/autoref.dtx b/Master/texmf-dist/source/latex/disser/autoref.dtx index e1c60419c1d..39072240691 100644 --- a/Master/texmf-dist/source/latex/disser/autoref.dtx +++ b/Master/texmf-dist/source/latex/disser/autoref.dtx @@ -43,7 +43,7 @@ \def\specfont{\normalsize} \thispagestyle{empty} -\enlargethispage{2cm} +\enlargethispage{1cm} \vspace*{-2cm} % \end{macrocode} % \paragraph{Название организации} diff --git a/Master/texmf-dist/source/latex/disser/bachelor.dtx b/Master/texmf-dist/source/latex/disser/bachelor.dtx index 2bad720861b..7716b8fcab8 100644 --- a/Master/texmf-dist/source/latex/disser/bachelor.dtx +++ b/Master/texmf-dist/source/latex/disser/bachelor.dtx @@ -76,7 +76,7 @@ \def\workname{\CYRR\cyra\cyrb\cyro\cyrt\cyra} \thispagestyle{empty} -\enlargethispage{2cm} +\enlargethispage{1cm} \vspace*{-2cm} % \end{macrocode} % \paragraph{Название организации} diff --git a/Master/texmf-dist/source/latex/disser/candidate.dtx b/Master/texmf-dist/source/latex/disser/candidate.dtx index ef1f07fb401..b6cc69d1f16 100644 --- a/Master/texmf-dist/source/latex/disser/candidate.dtx +++ b/Master/texmf-dist/source/latex/disser/candidate.dtx @@ -39,7 +39,6 @@ % \DescribeMacro{\fourthskip}\index{Расстояния!\verb*+\fourthskip+} % \DescribeMacro{\fifthskip}\index{Расстояния!\verb*+\fifthskip+} % \DescribeMacro{\sixthskip}\index{Расстояния!\verb*+\sixthskip+} -% \DescribeMacro{\seventhskip}\index{Расстояния!\verb*+\seventhskip+} % \begin{macrocode} \ifx\firstskip\undefined \newlength\firstskip @@ -68,16 +67,14 @@ \def\specfont{\normalsize} \thispagestyle{empty} -\enlargethispage{2cm} +\enlargethispage{1cm} \vspace*{-2cm} - % \end{macrocode} % \paragraph{Название организации} % \begin{macrocode} \begin{center} \instfont\@institution\par \end{center} - \vskip\firstskip \begin{flushright} % \end{macrocode} @@ -135,10 +132,12 @@ % Научный консультант % \begin{macrocode} \ifx\@scon\empty\else - \vskip\sixthskip\disserfield{scon} + \vskip\sixthskip + \disserfield{scon} \fi \ifx\@sconsnd\empty\else - \vskip\sixthskip\disserfield{sconsnd} + \vskip\sixthskip + \disserfield{sconsnd} \fi % \end{macrocode} % \paragraph{Город и год} diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx index c154c1f6222..53f79ef4126 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}[2012/11/29 1.1.9 Document class for dissertations] +\ProvidesFile{disser.drv}[2012/11/21 1.2.0 Document class for dissertations] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -180,7 +180,7 @@ %<*disser> \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2011/11/29 1.1.9 Document class for dissertations] +\ProvidesClass{disser}[2012/11/29 1.2.0 Document class for dissertations] % \end{macrocode} % Подключение пакета \pkg{kvoptions} для обработки опций в формате @@ -619,7 +619,7 @@ % \DescribeMacro{\parindent}\index{Расстояния!\verb*+\parindent+} % Абзацный отступ. % \begin{macrocode} -\setlength\parindent{1cm} +\setlength\parindent{5ex} % \end{macrocode} % Интервал между абзацами (добавляется к межстрочному). diff --git a/Master/texmf-dist/source/latex/disser/doctor.dtx b/Master/texmf-dist/source/latex/disser/doctor.dtx index 5af09f75735..f6ec90aeeb0 100644 --- a/Master/texmf-dist/source/latex/disser/doctor.dtx +++ b/Master/texmf-dist/source/latex/disser/doctor.dtx @@ -63,16 +63,15 @@ \def\specfont{\normalsize} \thispagestyle{empty} -\enlargethispage{2cm} +\enlargethispage{1cm} \vspace*{-2cm} - % \end{macrocode} % \paragraph{Название организации} % \begin{macrocode} \begin{center} \instfont\@institution\par \end{center} -\vskip\firstskip\normalfont +\vskip\firstskip \begin{flushright} % \end{macrocode} % Гриф секретности @@ -95,17 +94,17 @@ % \end{macrocode} % Автор % \begin{macrocode} - \vskip\secondskip\normalfont + \vskip\secondskip {\authorfont\@author} % \end{macrocode} % Название диссертации % \begin{macrocode} - \vskip\thirdskip\normalfont + \vskip\thirdskip {\topicfont\@topic\par} % \end{macrocode} % Шифр и наименование специальности % \begin{macrocode} - \vskip\fourthskip\normalfont + \vskip\fourthskip {\specfont\@specnum~--\ \@spec}\\[-6pt] \ifx\@specsndnum\empty\else {\specfont\@specsndnum~--\ \@specsnd} @@ -113,18 +112,18 @@ % \end{macrocode} % Диссертация на соискание ученой степени... % \begin{macrocode} - \vskip\fifthskip\normalfont + \vskip\fifthskip {\titlefont\@title} \end{center} % \end{macrocode} % Научный консультант % \begin{macrocode} \ifx\@scon\empty\else - \vskip\sixthskip\normalfont + \vskip\sixthskip \disserfield{scon} \fi \ifx\@sconsnd\empty\else - \vskip\sixthskip\normalfont + \vskip\sixthskip \disserfield{sconsnd} \fi % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/gost705.dtx b/Master/texmf-dist/source/latex/disser/gost705.dtx index 69dd971d9c2..deb3424936e 100644 --- a/Master/texmf-dist/source/latex/disser/gost705.dtx +++ b/Master/texmf-dist/source/latex/disser/gost705.dtx @@ -155,7 +155,7 @@ and the derived files % %<*driver> \ProvidesFile{gost705.drv}% - [2011/11/29 1.1.9 Bibliography style for GOST R 7.0.5-2008.] + [2012/11/21 1.2.0 Bibliography style for GOST R 7.0.5-2008] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, diff --git a/Master/texmf-dist/source/latex/disser/gost732.dtx b/Master/texmf-dist/source/latex/disser/gost732.dtx index e5dc47786d3..abe8c62e269 100644 --- a/Master/texmf-dist/source/latex/disser/gost732.dtx +++ b/Master/texmf-dist/source/latex/disser/gost732.dtx @@ -125,7 +125,7 @@ and the derived files \fi % %<*driver> -\ProvidesFile{gost732.drv}[2011/11/29 1.1.9 GOST 7.32-2001 implementation] +\ProvidesFile{gost732.drv}[2012/11/21 1.2.0 GOST 7.32-2001 implementation] \documentclass{ltxdoc} \usepackage[a4paper,includeheadfoot,nohead,mag=1000, @@ -217,7 +217,7 @@ and the derived files % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{gost732}[2011/11/29 1.1.9 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2012/11/21 1.2.0 GOST 7.32-2001 implementation] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}} \ProcessOptions\relax diff --git a/Master/texmf-dist/source/latex/disser/master.dtx b/Master/texmf-dist/source/latex/disser/master.dtx index 49fafe8d40d..80e167c79bf 100644 --- a/Master/texmf-dist/source/latex/disser/master.dtx +++ b/Master/texmf-dist/source/latex/disser/master.dtx @@ -16,6 +16,9 @@ % \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+} % \begin{macrocode} \if@titlepage\renewcommand\maketitle[1][]{ +% \end{macrocode} +% Переопределения некоторых полей титульного листа для англоязычной версии. +% \begin{macrocode} \ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} \if@titlepage@en \def\appos{Head of Department} @@ -68,7 +71,7 @@ \def\topicfont{\large\bfseries} \thispagestyle{empty} -\enlargethispage{2cm} +\enlargethispage{1cm} \vspace*{-2cm} % \end{macrocode} % \paragraph{Название организации} @@ -115,8 +118,7 @@ % \begin{macrocode} \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip] % \end{macrocode} -% -% Научный руководитель +% Научный руководитель. % \begin{macrocode} \ifx\@sa\empty\else\diplomafield{sa}\\[\sixthskip]\fi \ifx\@sasnd\empty\else\diplomafield{sasnd}\\[\sixthskip]\fi diff --git a/Master/texmf-dist/source/latex/disser/page.dtx b/Master/texmf-dist/source/latex/disser/page.dtx index a1adf56d25a..6cae9cb4de0 100644 --- a/Master/texmf-dist/source/latex/disser/page.dtx +++ b/Master/texmf-dist/source/latex/disser/page.dtx @@ -174,7 +174,7 @@ % \subsubsection{Стили колонтитулов по умолчанию} % Стиль колонтитулов обычных страниц. % \begin{macrocode} -\pagestyle{plain} +\pagestyle{headcenter} % \end{macrocode} % Команда, определяющая стиль страницы, с которой начинается глава. @@ -185,7 +185,7 @@ % \end{macrocode} % Стиль колонтитулов страниц, с которых начинается глава. % \begin{macrocode} -\chapterpagestyle{plain} +\chapterpagestyle{headcenter} % \end{macrocode} % Стиль нумерации страниц. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/specialist.dtx b/Master/texmf-dist/source/latex/disser/specialist.dtx index d59903499f5..92abcff3351 100644 --- a/Master/texmf-dist/source/latex/disser/specialist.dtx +++ b/Master/texmf-dist/source/latex/disser/specialist.dtx @@ -80,7 +80,7 @@ \def\workname{\CYRR\cyra\cyrb\cyro\cyrt\cyra} \thispagestyle{empty} -\enlargethispage{2cm} +\enlargethispage{1cm} \vspace*{-2cm} % \end{macrocode} % \paragraph{Название организации} diff --git a/Master/texmf-dist/source/latex/disser/titledefs.dtx b/Master/texmf-dist/source/latex/disser/titledefs.dtx index 25e47e07df5..5b8fae69b40 100644 --- a/Master/texmf-dist/source/latex/disser/titledefs.dtx +++ b/Master/texmf-dist/source/latex/disser/titledefs.dtx @@ -238,7 +238,7 @@ % \begin{macrocode} \def\masterprog#1{\gdef\@masterprog{#1}}\masterprog{} % \end{macrocode} -% Значение |\data| по умолчанию +% Значение |\date| по умолчанию % \begin{macrocode} \date{\number\year} @@ -358,27 +358,34 @@ } \providecommand*\conclusion{\nchapter{\conclusionname}} % \end{macrocode} -% \item Список используемых обозначений +% \item Список сокращений и условных обозначений % \DescribeMacro{\defsname}\index{Макросы!\verb*+\defsname+} % \DescribeMacro{\defs}\index{Макросы!\verb*+\defs+} -% \end{itemize} % \begin{macrocode} \providecommand*\defsname{% {\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ % -\cyri\cyrs\cyrp\cyro\cyrl\cyrsftsn\cyrz\cyru\cyre\cyrm\cyrery\cyrh\ % +\cyrs\cyro\cyrk\cyrr\cyra\cyrshch\cyre\cyrn\cyri\cyrishrt\ \cyri\ % +\cyru\cyrs\cyrl\cyro\cyrv\cyrn\cyrery\cyrh\ % \cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri\cyrishrt} } \providecommand*\defs{\nchapter{\defsname}} - % \end{macrocode} -% Обзор литературы +% \item Обзор литературы % \DescribeMacro{\reviewname}\index{Макросы!\verb*+\reviewname+} % \begin{macrocode} \providecommand*\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ % \cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery} \providecommand*\review{\nchapter{\reviewname}} +% \end{macrocode} +% \item Словарь терминов +% \DescribeMacro{\dictname}\index{Макросы!\verb*+\dictname+} +% \begin{macrocode} +\providecommand*\dictname{\cyr\CYRS\cyrl\cyro\cyrv\cyra\cyrr\cyrsftsn\ % +\cyrt\cyre\cyrr\cyrm\cyri\cyrn\cyro\cyrv} +\providecommand*\dict{\nchapter{\dictname}} % \end{macrocode} +% \end{itemize} % % \subsubsection{Элементы титульного листа} % -- cgit v1.2.3