From 662cbab0534a510978ea4b6497b06c94258f339e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 19 Aug 2015 22:21:57 +0000 Subject: disser (19aug15) git-svn-id: svn://tug.org/texlive/trunk@38162 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/disser/candidate.dtx | 15 ++++++++++----- Master/texmf-dist/source/latex/disser/disser.dtx | 20 ++++++++++---------- Master/texmf-dist/source/latex/disser/doctor.dtx | 5 ++++- Master/texmf-dist/source/latex/disser/gost705.dtx | 3 +-- Master/texmf-dist/source/latex/disser/gost732.dtx | 2 +- Master/texmf-dist/source/latex/disser/titlepage.dtx | 1 + 6 files changed, 27 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/source/latex/disser') diff --git a/Master/texmf-dist/source/latex/disser/candidate.dtx b/Master/texmf-dist/source/latex/disser/candidate.dtx index 7fd422c0ce0..72da7f01b0e 100644 --- a/Master/texmf-dist/source/latex/disser/candidate.dtx +++ b/Master/texmf-dist/source/latex/disser/candidate.dtx @@ -39,6 +39,8 @@ % \DescribeMacro{\fourthskip}\index{Расстояния!\verb*+\fourthskip+} % \DescribeMacro{\fifthskip}\index{Расстояния!\verb*+\fifthskip+} % \DescribeMacro{\sixthskip}\index{Расстояния!\verb*+\sixthskip+} +% \DescribeMacro{\saskip}\index{Расстояния!\verb*+\saskip+} +% \DescribeMacro{\specskip}\index{Расстояния!\verb*+\specskip+} % \begin{macrocode} \ifx\firstskip\undefined \newlength\firstskip @@ -53,6 +55,8 @@ \ifundeflength\fourthskip{1cm} \ifundeflength\fifthskip{1cm} \ifundeflength\sixthskip{0cm} +\ifundeflength\specskip{-6pt} +\ifundeflength\saskip{0pt} % \end{macrocode} % Шрифты элементов титульного листа. @@ -109,9 +113,10 @@ % Шифр и наименование специальности % \begin{macrocode} \vskip\fourthskip - {\specfont\@specnum~--\ \@spec}\\[-6pt] + {\specfont\@specnum~--\ \@spec} \ifx\@specsndnum\empty\else - {\specfont\@specsndnum~--\ \@specsnd} + \vskip\specskip + {\specfont\@specsndnum~--\ \@specsnd} \fi % \end{macrocode} % Диссертация на соискание ученой степени... @@ -126,17 +131,17 @@ \vskip\sixthskip\disserfield{sa} \fi \ifx\@sasnd\empty\else - \vskip\sixthskip\disserfield{sasnd} + \vskip\saskip\disserfield{sasnd} \fi % \end{macrocode} % Научный консультант % \begin{macrocode} \ifx\@scon\empty\else - \vskip\sixthskip + \vskip\saskip \disserfield{scon} \fi \ifx\@sconsnd\empty\else - \vskip\sixthskip + \vskip\saskip \disserfield{sconsnd} \fi % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx index 8f943be3a15..637e3b56e12 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-2014 Stanislav Kruchinin +%% Copyright (c) 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}[2015/01/03 1.3.1 % +\ProvidesFile{disser.drv}[2015/07/25 1.3.2 % Document class for dissertations] \documentclass{ltxdoc} @@ -183,7 +183,7 @@ %<*disser> \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2015/01/03 1.3.1 % +\ProvidesClass{disser}[2015/07/25 1.3.2 % Document class for dissertations] % \end{macrocode} @@ -613,18 +613,18 @@ \setlength\normallineskip{1\p@} % \end{macrocode} -% \DescribeMacro{\singlespacing} \index{Макросы!\verb*+\singlespacing+} -% \DescribeMacro{\onehalfspacing}\index{Макросы!\verb*+\onehalfspacing+} -% \DescribeMacro{\doublespacing} \index{Макросы!\verb*+\doublespacing+} +% \DescribeMacro{\disser@singlespacing} \index{Макросы!\verb*+\disser@singlespacing+} +% \DescribeMacro{\disser@onehalfspacing}\index{Макросы!\verb*+\disser@onehalfspacing+} +% \DescribeMacro{\disser@doublespacing} \index{Макросы!\verb*+\disser@doublespacing+} % Характерные величины межстрочнах интервалов. % \begin{macrocode} -\newcommand\singlespacing {\renewcommand\baselinestretch{1}\normalsize} -\newcommand\onehalfspacing{\renewcommand\baselinestretch{1.5}\normalsize} -\newcommand\doublespacing {\renewcommand\baselinestretch{2}\normalsize} +\newcommand\disser@singlespacing {\renewcommand\baselinestretch{1}\normalsize} +\newcommand\disser@onehalfspacing{\renewcommand\baselinestretch{1.5}\normalsize} +\newcommand\disser@doublespacing {\renewcommand\baselinestretch{2}\normalsize} % \end{macrocode} % Межстрочный интервал по умолчанию. % \begin{macrocode} -\onehalfspacing +\disser@onehalfspacing % \end{macrocode} % \DescribeMacro{\parindent}\index{Расстояния!\verb*+\parindent+} diff --git a/Master/texmf-dist/source/latex/disser/doctor.dtx b/Master/texmf-dist/source/latex/disser/doctor.dtx index f6ec90aeeb0..f6966203113 100644 --- a/Master/texmf-dist/source/latex/disser/doctor.dtx +++ b/Master/texmf-dist/source/latex/disser/doctor.dtx @@ -35,6 +35,7 @@ % \DescribeMacro{\fourthskip}\index{Расстояния!\verb*+\fourthskip+} % \DescribeMacro{\fifthskip}\index{Расстояния!\verb*+\fifthskip+} % \DescribeMacro{\sixthskip}\index{Расстояния!\verb*+\sixthskip+} +% \DescribeMacro{\specskip}\index{Расстояния!\verb*+\specskip+} % \begin{macrocode} \ifx\firstskip\undefined \newlength\firstskip @@ -49,6 +50,7 @@ \ifundeflength\fourthskip{1cm} \ifundeflength\fifthskip{1cm} \ifundeflength\sixthskip{0cm} +\ifundeflength\specskip{-6pt} % \end{macrocode} % Шрифты элементов титульного листа. @@ -105,8 +107,9 @@ % Шифр и наименование специальности % \begin{macrocode} \vskip\fourthskip - {\specfont\@specnum~--\ \@spec}\\[-6pt] + {\specfont\@specnum~--\ \@spec} \ifx\@specsndnum\empty\else + \vskip\specskip {\specfont\@specsndnum~--\ \@specsnd} \fi % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/disser/gost705.dtx b/Master/texmf-dist/source/latex/disser/gost705.dtx index 46b7cd6ea11..a8439bd0347 100644 --- a/Master/texmf-dist/source/latex/disser/gost705.dtx +++ b/Master/texmf-dist/source/latex/disser/gost705.dtx @@ -102,8 +102,7 @@ Requires 8-bit bibtex with switch -H and csf file supporting cyrillic. bibtex8 -H -c .csf -Copyright (C) 2004-2012 by - Stanislav Kruchinin +Copyright (C) Stanislav Kruchinin This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either diff --git a/Master/texmf-dist/source/latex/disser/gost732.dtx b/Master/texmf-dist/source/latex/disser/gost732.dtx index bb464e00888..8fc350758df 100644 --- a/Master/texmf-dist/source/latex/disser/gost732.dtx +++ b/Master/texmf-dist/source/latex/disser/gost732.dtx @@ -2,7 +2,7 @@ % % gost732 -- GOST 7.32-2001 implementation. % -% Copyright (c) 2004-2012 Stanislav Kruchinin +% Copyright (c) Stanislav Kruchinin % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either diff --git a/Master/texmf-dist/source/latex/disser/titlepage.dtx b/Master/texmf-dist/source/latex/disser/titlepage.dtx index e909b002639..db1dc886b89 100644 --- a/Master/texmf-dist/source/latex/disser/titlepage.dtx +++ b/Master/texmf-dist/source/latex/disser/titlepage.dtx @@ -26,6 +26,7 @@ % \DescribeMacro{\cdsep}\index{Макросы!\verb*+\cdsep+} % \begin{macrocode} \newcommand\cdsep{~-- } + \newcommand\maketitle{} \setcounter{footnote}{0} \else -- cgit v1.2.3