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/doc/latex/disser/ChangeLog | 8 +++++++- Master/texmf-dist/doc/latex/disser/README.ru | 2 +- .../doc/latex/disser/include/latex.nmk.cmd | 4 ++-- Master/texmf-dist/doc/latex/disser/manual.tex | 4 ++-- .../doc/latex/disser/templates/candidate/common.tex | 4 ++-- .../doc/latex/disser/templates/doctor/intro.tex | 18 +++++++++++++----- 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 + Master/texmf-dist/tex/latex/disser/candidate.rtx | 13 ++++++++----- Master/texmf-dist/tex/latex/disser/disser.cls | 13 +++++++------ Master/texmf-dist/tex/latex/disser/doctor.rtx | 4 +++- 15 files changed, 72 insertions(+), 44 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/disser/ChangeLog b/Master/texmf-dist/doc/latex/disser/ChangeLog index 0997ef38cdd..bb97edf0e8b 100644 --- a/Master/texmf-dist/doc/latex/disser/ChangeLog +++ b/Master/texmf-dist/doc/latex/disser/ChangeLog @@ -1,7 +1,13 @@ disser changelog -Copyright (C) 2015 Stanislav Kruchinin +Copyright (C) Stanislav Kruchinin ------------------------------------------- +Summary of changes in version 1.3.2 (2015-07-23): + +Classes and styles: +* Resolve conflict with 'setspace' package. + + Summary of changes in version 1.3.1 (2015-01-03): Classes and styles: diff --git a/Master/texmf-dist/doc/latex/disser/README.ru b/Master/texmf-dist/doc/latex/disser/README.ru index 6c5d7fb6d7b..c8d73556690 100644 --- a/Master/texmf-dist/doc/latex/disser/README.ru +++ b/Master/texmf-dist/doc/latex/disser/README.ru @@ -9,7 +9,7 @@ Для корректной сборки документов в вашем дистрибутиве LaTeX должны быть установлены следующие пакеты: amsfonts, amsmath, amssymb, caption, cmap, graphicx, ifpdf, kvoptions, -natbib, hyperref, subfig, wrapfig, а также пакеты для поддержки +natbib, hyperref, subcaption, wrapfig, а также пакеты для поддержки русского языка. Для использования шрифта Times в текстовом режиме следует установить diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd b/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd index c6c4f9020ae..fefdb440a16 100644 --- a/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd +++ b/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd @@ -43,9 +43,9 @@ if "%ps2pdfflags%"=="" ( if "%psnupflags%"=="" set psnupflags=-2 -pA4 if "%pdflatexflags%"=="" set pdflatexflags=--shell-escape --synctex=1 -if "%clext%"=="" set clext=*.bbl *.bak *.aux *.blg *.out *.toc *.log ^ +if "%clext%"=="" set clext=*.bbl *.bak *.aux *.blg *.out *.toc *.log ^ *.dvi *.tmp *.ps *.pdf *.synctex *.synctex.gz -if "%clfiles%"=="" set clfiles=!clext! %archive% +if "%clfiles%"=="" set clfiles=!clext! %archive% if "%srcfiles%"=="" set srcfiles=* if "%prereq%"=="" set prereq=*.tex *.bib diff --git a/Master/texmf-dist/doc/latex/disser/manual.tex b/Master/texmf-dist/doc/latex/disser/manual.tex index 39422a0fa47..33a0c18191a 100644 --- a/Master/texmf-dist/doc/latex/disser/manual.tex +++ b/Master/texmf-dist/doc/latex/disser/manual.tex @@ -55,7 +55,7 @@ \let\makelabel\deflabel} }{\end{list}} -\def\fileversion{1.3.1} +\def\fileversion{1.3.2} \sloppy \begin{document} @@ -182,7 +182,7 @@ Не подключать пакеты \pkg{amsmath}, \pkg{amssymb} и \pkg{amsfonts} из класса. \\\hline subf & - Подключение пакета \pkg{subfig} для ведения вложенной нумерации рисунков. + Подключение пакета \pkg{subcaption} для вложенной нумерации рисунков. \\\hline times & Использование гарнитуры Times в тексте и формулах. diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex index 243bf74b954..8fd2edfaf02 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex @@ -12,8 +12,8 @@ \sa{ФИО руководителя} \sastatus{д.~ф.-м.~н., проф.} -\sasnd{ФИО второго руководителя} -\sasndstatus{к.~ф.-м.~н., проф.} +%\sasnd{ФИО второго руководителя} +%\sasndstatus{к.~ф.-м.~н., проф.} %\scon{ФИО консультанта} %\sconstatus{д.~ф.-м.~н., проф.} diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/intro.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/intro.tex index fe56c241018..6476724e47c 100644 --- a/Master/texmf-dist/doc/latex/disser/templates/doctor/intro.tex +++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/intro.tex @@ -8,7 +8,11 @@ \actualitysection \actualitytext -% Цель диссертационной работы +% Степень разработанности темы исследования +\developmentsection +\developmenttext + +% Цели и задачи диссертационной работы \objectivesection \objectivetext @@ -16,15 +20,19 @@ \noveltysection \noveltytext -% Практическая ценность +% Теоретическая и практическая значимость \valuesection \valuetext -% Результаты и положения, выносимые на защиту +% Методология и методы исследования +\methodssection +\methodstext + +% Положения, выносимые на защиту \resultssection \resultstext -% Апробация работы +% Степень достоверности и апробация результатов \approbationsection \approbationtext @@ -38,4 +46,4 @@ % Структура и объем диссертации \structsection -\structtext \ No newline at end of file +\structtext 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 diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx index 9a6cffe1468..bb70e2d8cef 100644 --- a/Master/texmf-dist/tex/latex/disser/candidate.rtx +++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx @@ -46,6 +46,8 @@ \ifundeflength\fourthskip{1cm} \ifundeflength\fifthskip{1cm} \ifundeflength\sixthskip{0cm} +\ifundeflength\specskip{-6pt} +\ifundeflength\saskip{0pt} \def\titlefont{\normalsize} \def\topicfont{\Large\bfseries} @@ -71,9 +73,10 @@ \vskip\thirdskip {\topicfont\@topic\par} \vskip\fourthskip - {\specfont\@specnum~--\ \@spec}\\[-6pt] + {\specfont\@specnum~--\ \@spec} \ifx\@specsndnum\empty\else - {\specfont\@specsndnum~--\ \@specsnd} + \vskip\specskip +{\specfont\@specsndnum~--\ \@specsnd} \fi \vskip\fifthskip {\titlefont\@title} @@ -82,14 +85,14 @@ \vskip\sixthskip\disserfield{sa} \fi \ifx\@sasnd\empty\else - \vskip\sixthskip\disserfield{sasnd} + \vskip\saskip\disserfield{sasnd} \fi \ifx\@scon\empty\else - \vskip\sixthskip + \vskip\saskip \disserfield{scon} \fi \ifx\@sconsnd\empty\else - \vskip\sixthskip + \vskip\saskip \disserfield{sconsnd} \fi \vfill diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls index 33b9aab64a3..e7aa503146c 100644 --- a/Master/texmf-dist/tex/latex/disser/disser.cls +++ b/Master/texmf-dist/tex/latex/disser/disser.cls @@ -27,7 +27,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 @@ -44,7 +44,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2015/01/03 1.3.1 % +\ProvidesClass{disser}[2015/07/25 1.3.2 % Document class for dissertations] \RequirePackage{kvoptions} @@ -295,10 +295,10 @@ \setlength\lineskip{1\p@} \setlength\normallineskip{1\p@} -\newcommand\singlespacing {\renewcommand\baselinestretch{1}\normalsize} -\newcommand\onehalfspacing{\renewcommand\baselinestretch{1.5}\normalsize} -\newcommand\doublespacing {\renewcommand\baselinestretch{2}\normalsize} -\onehalfspacing +\newcommand\disser@singlespacing {\renewcommand\baselinestretch{1}\normalsize} +\newcommand\disser@onehalfspacing{\renewcommand\baselinestretch{1.5}\normalsize} +\newcommand\disser@doublespacing {\renewcommand\baselinestretch{2}\normalsize} +\disser@onehalfspacing \setlength\parindent{5ex} @@ -1225,6 +1225,7 @@ \newcommand\topicfont{\large\bfseries} \newcommand\instfont{\normalfont} \newcommand\cdsep{~-- } + \newcommand\maketitle{} \setcounter{footnote}{0} \else diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx index 8a3caeca64d..6465a3d7596 100644 --- a/Master/texmf-dist/tex/latex/disser/doctor.rtx +++ b/Master/texmf-dist/tex/latex/disser/doctor.rtx @@ -42,6 +42,7 @@ \ifundeflength\fourthskip{1cm} \ifundeflength\fifthskip{1cm} \ifundeflength\sixthskip{0cm} +\ifundeflength\specskip{-6pt} \def\titlefont{\normalsize} \def\topicfont{\Large\bfseries} @@ -67,8 +68,9 @@ \vskip\thirdskip {\topicfont\@topic\par} \vskip\fourthskip - {\specfont\@specnum~--\ \@spec}\\[-6pt] + {\specfont\@specnum~--\ \@spec} \ifx\@specsndnum\empty\else + \vskip\specskip {\specfont\@specsndnum~--\ \@specsnd} \fi \vskip\fifthskip -- cgit v1.2.3