From eadac6a4b811db258d2b4d5dd4dec4fb0551ca4d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Jul 2016 21:39:30 +0000 Subject: disser (5jul16) git-svn-id: svn://tug.org/texlive/trunk@41635 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/disser/bachelor.rtx | 15 +++++---- Master/texmf-dist/tex/latex/disser/candidate.rtx | 18 ++++++----- Master/texmf-dist/tex/latex/disser/disser.cls | 40 ++++++++++++------------ Master/texmf-dist/tex/latex/disser/doctor.rtx | 14 ++++++--- Master/texmf-dist/tex/latex/disser/gost732.cls | 2 +- Master/texmf-dist/tex/latex/disser/master.rtx | 9 +++--- 6 files changed, 53 insertions(+), 45 deletions(-) (limited to 'Master/texmf-dist/tex/latex/disser') diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx index 40c9b84e570..a8dc21546fa 100644 --- a/Master/texmf-dist/tex/latex/disser/bachelor.rtx +++ b/Master/texmf-dist/tex/latex/disser/bachelor.rtx @@ -54,21 +54,20 @@ \thispagestyle{empty} \enlargethispage{1cm} \vspace*{-2cm} -\begin{center}% +\begin{center} {\instfont\@institution} \end{center} \vskip\firstskip {\@approved} \vskip\secondskip - -\begin{center}% - {\titlefont\@title\par}% - \vskip\thirdskip% - {\topiclabelfont\topiclabel\ }% +\begin{center} + {\titlefont\@title} + \vskip\thirdskip + {\topiclabelfont\topiclabel\ } {\topicfont\@topic} - \vskip\fourthskip\normalfont% - \courselabel\ \@coursenum~--\ \@course% + \vskip\fourthskip\normalfont + {\courselabel\ \@coursenum~--\ \@course} \end{center} \vskip\fifthskip diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx index bb70e2d8cef..3923107675e 100644 --- a/Master/texmf-dist/tex/latex/disser/candidate.rtx +++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx @@ -28,17 +28,17 @@ \def\sconname{Scientific Consultant} \def\sconlabel{\sconname} \def\sconsndname{\sconname} - \def\sconsndlabel{\sconsndname} + \def\sconsndlabel{\sconname} \def\topicname{Topic} \def\asmanuscript{As Manuscript} \fi \ifx\firstskip\undefined \newlength\firstskip - \ifDis@libcat - \setlength\firstskip{2ex} - \else + \ifx\@libcatnum\empty \setlength\firstskip{4ex} + \else + \setlength\firstskip{2ex} \fi \fi \ifundeflength\secondskip{2cm} @@ -46,6 +46,7 @@ \ifundeflength\fourthskip{1cm} \ifundeflength\fifthskip{1cm} \ifundeflength\sixthskip{0cm} +\ifundeflength\libcatskip{0cm} \ifundeflength\specskip{-6pt} \ifundeflength\saskip{0pt} @@ -63,9 +64,12 @@ \vskip\firstskip \begin{flushright} \ifDis@classified\classify\fi - \asmanuscript%\\ %avoid no line to end error + \asmanuscript \ifDis@facsimile\facsimile\fi - \ifDis@libcat\libcatname\ \@libcatnum\fi + \ifx\@libcatnum\empty\else + \vskip\libcatskip + {\libcatname\ \@libcatnum} + \fi \end{flushright} \begin{center} \vskip\secondskip @@ -76,7 +80,7 @@ {\specfont\@specnum~--\ \@spec} \ifx\@specsndnum\empty\else \vskip\specskip -{\specfont\@specsndnum~--\ \@specsnd} + {\specfont\@specsndnum~--\ \@specsnd} \fi \vskip\fifthskip {\titlefont\@title} diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls index c76c0438dd7..4153eecd01a 100644 --- a/Master/texmf-dist/tex/latex/disser/disser.cls +++ b/Master/texmf-dist/tex/latex/disser/disser.cls @@ -44,8 +44,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2015/07/25 1.3.2 % - Document class for dissertations] +\ProvidesClass{disser}[2016/06/26 1.4.0 Document class for dissertations] \RequirePackage{kvoptions} @@ -72,6 +71,8 @@ \newif\ifDis@times\Dis@timesfalse \newif\ifDis@mtpro\Dis@mtprofalse \newif\ifDis@natbib\Dis@natbibfalse +\newif\ifDis@colorlinks\Dis@colorlinksfalse +\newif\ifDis@fixint\Dis@fixintfalse \DeclareOption{href}{\Dis@hreftrue} \DeclareOption{subf}{\Dis@subftrue} \DeclareOption{libcat}{\Dis@libcattrue} @@ -79,6 +80,8 @@ \DeclareOption{facsimile}{\Dis@facsimiletrue} \DeclareOption{noams}{\Dis@amsfalse} \DeclareOption{natbib}{\Dis@natbibtrue} +\DeclareOption{fixint}{\Dis@fixinttrue} +\DeclareOption{colorlinks}{\Dis@colorlinkstrue} \DeclareOption{a4paper}{% \setlength\paperheight{297mm} \setlength\paperwidth {210mm} @@ -191,8 +194,6 @@ prefix=Dis@ } -\DeclareBoolOption[true]{fixint} -\DeclareBoolOption[false]{colorlinks} \DeclareStringOption{substylefile} \ExecuteOptions{a4paper,14pt,oneside,titlepage,onecolumn,final,openany,candidate} @@ -349,14 +350,14 @@ \renewcommand\theparagraph{\arabic{paragraph}} \renewcommand\thesubparagraph{\theparagraph.\arabic{subparagraph}} -\newcommand\tocthepart{\thepart} -\newcommand\tocthechapter{\thechapter} -\newcommand\toctheappendix{\theappendix} -\newcommand\tocthesection{\thesection} -\newcommand\tocthesubsection{\thesubsection} -\newcommand\tocthesubsubsection{\thesubsubsection} -\newcommand\toctheparagraph{\theparagraph} -\newcommand\tocthesubparagraph{\thesubparagraph} +\providecommand\tocthepart{\thepart} +\providecommand\tocthechapter{\thechapter} +\providecommand\toctheappendix{\theappendix} +\providecommand\tocthesection{\thesection} +\providecommand\tocthesubsection{\thesubsection} +\providecommand\tocthesubsubsection{\thesubsubsection} +\providecommand\toctheparagraph{\theparagraph} +\providecommand\tocthesubparagraph{\thesubparagraph} \newcommand\default@the{% \@addtoreset{footnote}{chapter} @@ -1358,14 +1359,14 @@ \usepackage[subscriptcorrection,nofontinfo,boldalphabet]{mtpro} }{ \PackageWarning{disser}% - {Unable to find mtpro package. Font is unchanged.} + {Unable to find mtpro2 or mtpro package. Math font is unchanged.} } } } \else \AtEndOfPackage{% - \IfFileExists{txfonts.sty}{ - \usepackage{txfonts} + \IfFileExists{newtxmath.sty}{ + \usepackage[varg,cmbraces,cmintegrals]{newtxmath} }{ \PackageWarning{disser}% {Unable to find txfonts package. Font is unchanged.} @@ -1416,10 +1417,9 @@ \ifDis@natbib \usepackage[square,comma,sort&compress,numbers]{natbib} \else - \newcommand\bibsection{} - \newcommand\bibpreamble{} - \newcommand\bibpostamble{} - \newcommand\bibfont{\normalfont\selectfont} + \providecommand*\bibsection{} + \providecommand*\bibpreamble{} + \providecommand*\bibpostamble{} \newlength\bibsep \fi @@ -1455,7 +1455,7 @@ \renewenvironment{thebibliography}[1]{ \bibsection \parindent\z@ - \bibpreamble\bibfont + \bibpreamble\normalfont\selectfont \list{\@biblabel{\@arabic\c@enumiv}}{\settowidth\labelwidth{\@biblabel{#1}}% \setlength{\itemsep}{\bibsep} \setlength{\parsep}{\bibsep} diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx index 6465a3d7596..71150c3f984 100644 --- a/Master/texmf-dist/tex/latex/disser/doctor.rtx +++ b/Master/texmf-dist/tex/latex/disser/doctor.rtx @@ -31,10 +31,10 @@ \ifx\firstskip\undefined \newlength\firstskip - \ifDis@libcat - \setlength\firstskip{1ex} - \else + \ifx\@libcatnum\empty \setlength\firstskip{4ex} + \else + \setlength\firstskip{2ex} \fi \fi \ifundeflength\secondskip{3cm} @@ -42,6 +42,7 @@ \ifundeflength\fourthskip{1cm} \ifundeflength\fifthskip{1cm} \ifundeflength\sixthskip{0cm} +\ifundeflength\libcatskip{0cm} \ifundeflength\specskip{-6pt} \def\titlefont{\normalsize} @@ -58,9 +59,12 @@ \vskip\firstskip \begin{flushright} \ifDis@classified\classify\fi - \asmanuscript\\ + \asmanuscript \ifDis@facsimile\facsimile\fi - \ifDis@libcat\libcatname\ \@libcatnum\fi + \ifx\@libcatnum\empty\else + \vskip\libcatskip + {\libcatname\ \@libcatnum} + \fi \end{flushright} \begin{center} \vskip\secondskip diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls index 5798b4481a9..8d8ba6ed28d 100644 --- a/Master/texmf-dist/tex/latex/disser/gost732.cls +++ b/Master/texmf-dist/tex/latex/disser/gost732.cls @@ -12,7 +12,7 @@ %% This file is part of the disser package. %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{gost732}[2013/12/30 1.3.0 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2016/07/03 1.4.0 GOST 7.32-2001 implementation] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}} \ProcessOptions\relax diff --git a/Master/texmf-dist/tex/latex/disser/master.rtx b/Master/texmf-dist/tex/latex/disser/master.rtx index d6f8e7e60e0..81fec860b43 100644 --- a/Master/texmf-dist/tex/latex/disser/master.rtx +++ b/Master/texmf-dist/tex/latex/disser/master.rtx @@ -54,19 +54,20 @@ \enlargethispage{1cm} \vspace*{-2cm} \begin{center} -\instfont\@institution\par + {\instfont\@institution} \end{center} \vskip\firstskip -\@approved +{\@approved} \vskip\secondskip \begin{center} {\titlefont\@title} \vskip\thirdskip - {\topiclabelfont\topiclabel} + {\topiclabelfont\topiclabel\ } {\topicfont\@topic} + \vskip\fourthskip\normalfont \end{center} -\vskip\fourthskip + \begin{tabbing} \phantom{\masterproglabel}\=\\ \courselabel\>\ \@coursenum\ --\ \@course\\ -- cgit v1.2.3