From 1a9e525f4cfeebc43345769293278fc86d237e0b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 21 Nov 2010 23:53:45 +0000 Subject: disser 1.1.7 (22nov10) git-svn-id: svn://tug.org/texlive/trunk@20522 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/disser/bachelor.rtx | 54 ++++++---- Master/texmf-dist/tex/latex/disser/candidate.rtx | 61 +++++++----- Master/texmf-dist/tex/latex/disser/disser.cls | 40 ++++++-- Master/texmf-dist/tex/latex/disser/doctor.rtx | 35 ++++--- Master/texmf-dist/tex/latex/disser/gost732.cls | 2 +- Master/texmf-dist/tex/latex/disser/master.rtx | 41 +++++--- Master/texmf-dist/tex/latex/disser/specialist.rtx | 114 ++++++++++++++++++++++ Master/texmf-dist/tex/latex/disser/titledefs.rtx | 5 +- 8 files changed, 276 insertions(+), 76 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/disser/specialist.rtx (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx index 7c73e819c65..c60628dd4a5 100644 --- a/Master/texmf-dist/tex/latex/disser/bachelor.rtx +++ b/Master/texmf-dist/tex/latex/disser/bachelor.rtx @@ -17,13 +17,31 @@ \newcommand\bachelor@the{\default@the} \bachelor@the -\if@titlepage\renewcommand\maketitle{ -\deflength\firstskip{1.5cm} -\deflength\secondskip{1.5cm} -\deflength\thirdskip{1ex} -\deflength\fourthskip{1ex} -\deflength\fifthskip{2cm} -\deflength\sixthskip{1.5ex} +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\approved{``Approved for defence''} + \def\revname{Reviewer} + \def\revsndname{\revname} + \def\revlabel{\revname} + \def\revsndlabel{\revsndname} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} + \def\topicname{Topic} + \def\coursename{Speciality} + \def\studentname{Student} + \def\studentlabel{\studentname\hspace{6cm}} +\fi + +\ifundeflength\firstskip{1.5cm} +\ifundeflength\secondskip{1.5cm} +\ifundeflength\thirdskip{1ex} +\ifundeflength\fourthskip{1ex} +\ifundeflength\fifthskip{2cm} +\ifundeflength\sixthskip{1.5ex} \setlength\fieldhshift{8.5cm} @@ -36,24 +54,24 @@ \thispagestyle{empty} \enlargethispage{2cm} \vspace*{-2cm} -\begin{center} -\instfont\@institution\par +\begin{center}% + {\instfont\@institution} \end{center} -\vskip\firstskip\normalfont -\@approved +\vskip\firstskip +{\@approved} \vskip\secondskip -\begin{center} - {\titlefont\@title\par} - \vskip\thirdskip\normalfont +\begin{center}% + {\titlefont\@title\par}% + \vskip\thirdskip% {\topiclabelfont\topiclabel\ }% - {\topicfont\@topic\par} - \vskip\fourthskip\normalfont - \courselabel\ \@coursenum~--\ \@course + {\topicfont\@topic} + \vskip\fourthskip\normalfont% + \courselabel\ \@coursenum~--\ \@course% \end{center} -\vskip\fifthskip\normalfont +\vskip\fifthskip \begin{tabbing} \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip] \ifx\@sa\empty\else\diplomafield{sa}\\[\sixthskip]\fi diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx index 136fd656f41..673b0c1b42b 100644 --- a/Master/texmf-dist/tex/latex/disser/candidate.rtx +++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx @@ -17,18 +17,35 @@ \newcommand\candidate@the{\default@the} \candidate@the -\if@titlepage\renewcommand\maketitle{ -\newlength\firstskip -\ifDis@libcat - \setlength\firstskip{2ex} -\else - \setlength\firstskip{4ex} +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} + \def\sconname{Scientific Consultant} + \def\sconlabel{\sconname} + \def\sconsndname{\sconname} + \def\sconsndlabel{\sconname} + \def\topicname{Topic} + \def\asmanuscript{As Manuscript} \fi -\deflength\secondskip{2cm} -\deflength\thirdskip{1cm} -\deflength\fourthskip{1cm} -\deflength\fifthskip{1cm} -\deflength\sixthskip{0cm} + +\ifx\firstskip\undefined + \newlength\firstskip + \ifDis@libcat + \setlength\firstskip{2ex} + \else + \setlength\firstskip{4ex} + \fi +\fi +\ifundeflength\secondskip{2cm} +\ifundeflength\thirdskip{1cm} +\ifundeflength\fourthskip{1cm} +\ifundeflength\fifthskip{1cm} +\ifundeflength\sixthskip{0cm} \def\titlefont{\normalsize} \def\topicfont{\Large\bfseries} @@ -43,7 +60,7 @@ \instfont\@institution\par \end{center} -\vskip\firstskip\normalfont +\vskip\firstskip \begin{flushright} \ifDis@classified\classify\fi \asmanuscript @@ -51,33 +68,29 @@ \ifDis@libcat\libcatname\ \@libcatnum\fi \end{flushright} \begin{center} - \vskip\secondskip\normalfont + \vskip\secondskip {\authorfont\@author} - \vskip\thirdskip\normalfont + \vskip\thirdskip {\topicfont\@topic\par} - \vskip\fourthskip\normalfont + \vskip\fourthskip {\specfont\@specnum~--\ \@spec}\\[-6pt] \ifx\@specsndnum\empty\else {\specfont\@specsndnum~--\ \@specsnd} \fi - \vskip\fifthskip\normalfont + \vskip\fifthskip {\titlefont\@title} \end{center} \ifx\@sa\empty\else - \vskip\sixthskip\normalfont - \disserfield{sa} + \vskip\sixthskip\disserfield{sa} \fi \ifx\@sasnd\empty\else - \vskip\sixthskip\normalfont - \disserfield{sasnd} + \vskip\sixthskip\disserfield{sasnd} \fi \ifx\@scon\empty\else - \vskip\sixthskip\normalfont - \disserfield{scon} + \vskip\sixthskip\disserfield{scon} \fi \ifx\@sconsnd\empty\else - \vskip\sixthskip\normalfont - \disserfield{sconsnd} + \vskip\sixthskip\disserfield{sconsnd} \fi \vfill \begin{center} diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls index 120972cdcf5..0f11530d226 100644 --- a/Master/texmf-dist/tex/latex/disser/disser.cls +++ b/Master/texmf-dist/tex/latex/disser/disser.cls @@ -44,16 +44,20 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2010/05/22 1.1.6 Document class for dissertations] +\ProvidesClass{disser}[2010/06/13 1.1.7 Document class for dissertations] \RequirePackage{kvoptions} \RequirePackage{ifpdf} +\RequirePackage{ifthen} + +\newif\if@titlepage@en\@titlepage@enfalse \newif\if@restonecol \newif\if@titlepage\@titlepagetrue \newif\if@openright\@openrightfalse \newif\ifDis@bachelor\Dis@bachelorfalse +\newif\ifDis@specialist\Dis@specialistfalse \newif\ifDis@master\Dis@masterfalse \newif\ifDis@candidate\Dis@candidatetrue \newif\ifDis@doctor\Dis@doctorfalse @@ -136,6 +140,15 @@ \DeclareOption{bachelor}{% \Dis@bachelortrue + \Dis@specialistfalse + \Dis@masterfalse + \Dis@candidatefalse + \Dis@doctorfalse + \Dis@autoreffalse +} +\DeclareOption{specialist}{% + \Dis@bachelorfalse + \Dis@specialisttrue \Dis@masterfalse \Dis@candidatefalse \Dis@doctorfalse @@ -143,6 +156,7 @@ } \DeclareOption{master}{% \Dis@bachelorfalse + \Dis@specialistfalse \Dis@mastertrue \Dis@candidatefalse \Dis@doctorfalse @@ -184,11 +198,12 @@ \ProcessOptions \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 + \ifDis@bachelor \renewcommand*{\Dis@substylefile}{bachelor.rtx}\fi + \ifDis@specialist \renewcommand*{\Dis@substylefile}{specialist.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 \AtEndOfClass{\input{\Dis@substylefile}} @@ -249,11 +264,13 @@ }{} \DeclareFontShape{OT1}{cmr}{bx}{sl}{% <5><6><7><8><9>% - <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxsl10% + <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99>% + <51.59>cmbxsl10% }{} \DeclareFontShape{OT1}{cmr}{bx}{it}{% <5><6><7><8><9>% - <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxti10% + <10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99>% + <51.59>cmbxti10% }{} \input{size\@ptsize.clo} \RequirePackage{exscale} @@ -269,6 +286,9 @@ \DeclareRobustCommand*\mit{\@fontswitch\relax\mathnormal} \providecommand\deflength[2]{\newlength{#1}\setlength{#1}{#2}} +\providecommand\ifundeflength[2]{% +\ifx#1\undefined \newlength{#1}\setlength{#1}{#2} \else \relax \fi +} \setlength\lineskip{1\p@} \setlength\normallineskip{1\p@} @@ -1405,7 +1425,9 @@ \let\shortcite\cite \let\citeasnoun\cite }{% - \def\@noitemerr{\PackageWarning{natbib}{Empty `thebibliography' environment}} + \def\@noitemerr{% + \PackageWarning{natbib}{Empty `thebibliography' environment}% + } \endlist\vskip-\lastskip% } diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx index 867652075c5..852faed2654 100644 --- a/Master/texmf-dist/tex/latex/disser/doctor.rtx +++ b/Master/texmf-dist/tex/latex/disser/doctor.rtx @@ -17,18 +17,31 @@ \newcommand\doctor@the{\default@the} \doctor@the -\if@titlepage\renewcommand\maketitle{ -\newlength\firstskip -\ifDis@libcat - \setlength\firstskip{1ex} -\else - \setlength\firstskip{4ex} +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\sconname{Scientific Consultant} + \def\sconlabel{\sconname} + \def\sconsndname{\sconname} + \def\sconsndlabel{\sconname} + \def\topicname{Topic} + \def\asmanuscript{As Manuscript} \fi -\deflength\secondskip{3cm} -\deflength\thirdskip{1cm} -\deflength\fourthskip{1cm} -\deflength\fifthskip{1cm} -\deflength\sixthskip{0cm} + +\ifx\firstskip\undefined + \newlength\firstskip + \ifDis@libcat + \setlength\firstskip{1ex} + \else + \setlength\firstskip{4ex} + \fi +\fi +\ifundeflength\secondskip{3cm} +\ifundeflength\thirdskip{1cm} +\ifundeflength\fourthskip{1cm} +\ifundeflength\fifthskip{1cm} +\ifundeflength\sixthskip{0cm} \def\titlefont{\normalsize} \def\topicfont{\Large\bfseries} diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls index 4d2506570a3..f20f8dd3a29 100644 --- a/Master/texmf-dist/tex/latex/disser/gost732.cls +++ b/Master/texmf-dist/tex/latex/disser/gost732.cls @@ -32,7 +32,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{gost732}[2010/05/22 1.1.6 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2010/06/13 1.1.7 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 78fdc88ec24..043208fcf02 100644 --- a/Master/texmf-dist/tex/latex/disser/master.rtx +++ b/Master/texmf-dist/tex/latex/disser/master.rtx @@ -17,13 +17,32 @@ \newcommand\master@the{\default@the} \master@the -\if@titlepage\renewcommand\maketitle{ -\deflength\firstskip{1ex} -\deflength\secondskip{1ex} -\deflength\thirdskip{1ex} -\deflength\fourthskip{-1cm} -\deflength\fifthskip{0ex} -\deflength\sixthskip{1.5ex} +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\approved{``Approved for defence''} + \def\revname{Reviewer} + \def\revsndname{\revname} + \def\revlabel{\revname} + \def\revsndlabel{\revsndname} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} + \def\topicname{Topic} + \def\coursename{Speciality} + \def\studentname{Student} + \def\studentlabel{\studentname\hspace{6cm}} + \def\masterprogname{Master's Program} +\fi + +\ifundeflength\firstskip{1ex} +\ifundeflength\secondskip{1ex} +\ifundeflength\thirdskip{1ex} +\ifundeflength\fourthskip{-1cm} +\ifundeflength\fifthskip{0ex} +\ifundeflength\sixthskip{1.5ex} \setlength\fieldhshift{8.5cm} @@ -38,22 +57,22 @@ \instfont\@institution\par \end{center} -\vskip\firstskip\normalfont +\vskip\firstskip \@approved \vskip\secondskip \begin{center} {\titlefont\@title} - \vskip\thirdskip\normalfont + \vskip\thirdskip {\topiclabelfont\topiclabel} {\topicfont\@topic} \end{center} -\vskip\fourthskip\normalfont +\vskip\fourthskip \begin{tabbing} \phantom{\masterproglabel}\=\\ \courselabel\>\ \@coursenum\ --\ \@course\\ \masterproglabel\>\ \@masterprognum\ --\ \@masterprog \end{tabbing} -\vskip\fifthskip\normalfont +\vskip\fifthskip \begin{tabbing} \studentlabel\=\makebox[\fieldhshift][l]{\hrulefill\ \@author}\\[\sixthskip] \ifx\@sa\empty\else\diplomafield{sa}\\[\sixthskip]\fi diff --git a/Master/texmf-dist/tex/latex/disser/specialist.rtx b/Master/texmf-dist/tex/latex/disser/specialist.rtx new file mode 100644 index 00000000000..6006dbde8de --- /dev/null +++ b/Master/texmf-dist/tex/latex/disser/specialist.rtx @@ -0,0 +1,114 @@ +%% +%% This is file `specialist.rtx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% specialist.dtx (with options: `specialist') +%% +%% Copyright (c) 2004-2010 Stanislav Kruchinin. +%% All rights reserved. +%% +%% This file is part of the disser package. +%% + +\ProvidesFile{specialist.rtx} + +\newcommand\specialist@the{\default@the} +\specialist@the + +\def\diplomafield#1{% + \csname #1label\endcsname\\% + \csname @#1status\endcsname\ \csname @#1\endcsname +} + +\if@titlepage\renewcommand\maketitle[1][]{ +\ifthenelse{\equal{#1}{en}}{\@titlepage@entrue}{\@titlepage@enfalse} +\if@titlepage@en + \def\appos{Head of Department} + \def\approved{``Approved for defence''} + \def\revname{Reviewer} + \def\revsndname{\revname} + \def\revlabel{\revname} + \def\revsndlabel{\revsndname} + \def\saname{Scientific Supervisor} + \def\sasndname{\saname} + \def\salabel{\saname} + \def\sasndlabel{\saname} +\else + \def\appos{\CYRZ\cyra\cyrv\cyre\cyrd\cyru\cyryu\cyrshch\cyri\cyrishrt\ % + \cyrk\cyra\cyrf\cyre\cyrd\cyrr\cyro\cyrishrt} + \def\approved{<<\CYRD\cyro\cyrp\cyru\cyrs\cyrt\cyri\cyrt\cyrsftsn\ % + \cyrk\ \cyrz\cyra\cyrshch\cyri\cyrt\cyre>>} +\fi + +\ifundeflength\firstskip{1.5cm} +\ifundeflength\secondskip{1.5cm} +\ifundeflength\thirdskip{3ex} +\ifundeflength\fourthskip{1ex} +\ifundeflength\fifthskip{1ex} +\ifundeflength\sixthskip{2cm} +\ifundeflength\seventhskip{1ex} + +\setlength\fieldhshift{8.5cm} + +\def\titlefont{\Large\bfseries} +\def\topiclabelfont{\large} +\def\topicfont{\large\bfseries} + +\def\workname{\CYRR\cyra\cyrb\cyro\cyrt\cyra} + +\thispagestyle{empty} +\enlargethispage{2cm} +\vspace*{-2cm} +\begin{center} + {\instfont\@institution} +\end{center} + +\def\@approved{ +\hfill +\begin{minipage}{.5\linewidth} + {\approved}\hrulefill\\[9pt]% + \appos\\% + \@apname% +\end{minipage} +} + +\vskip\firstskip +{\@approved} +\vskip\secondskip +\begin{center} + {\titlefont\@title} + \vskip\thirdskip + {\@group} + \vskip\fourthskip + {\@author} + \vskip\fifthskip + {\topicfont\@topic} +\end{center} +\normalfont +\vskip\sixthskip +\hfill +\begin{minipage}{.5\linewidth} + \ifx\@sa\empty\else + \vskip\seventhskip\diplomafield{sa} + \fi + \ifx\@sasnd\empty\else + \vskip\seventhskip\diplomafield{sasnd} + \fi + \ifx\@rev\empty\else + \vskip\seventhskip\diplomafield{rev} + \fi + \ifx\@revsnd\empty\else + \vskip\seventhskip\diplomafield{revsnd} + \fi +\end{minipage} +\vfill +\begin{center} + {\@city\cdsep\@date} +\end{center} +\normalfont\clearpage +}\fi +\endinput +%% +%% End of file `specialist.rtx'. diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx index 61e5958c4ec..fe47de01536 100644 --- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx +++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx @@ -15,7 +15,8 @@ \ProvidesFile{titledefs.rtx} \def\abstractname{\cyr\CYRA\cyrn\cyrn\cyro\cyrt\cyra\cyrc\cyri\cyrya} -\def\titlepagename{\cyr\CYRT\cyri\cyrt\cyru\cyrl\cyrsftsn\cyrn\cyrery\cyrishrt\ % +\def\titlepagename{% +\cyr\CYRT\cyri\cyrt\cyru\cyrl\cyrsftsn\cyrn\cyrery\cyrishrt\ % \cyrl\cyri\cyrs\cyrt} \def\keywordsname{\cyr\CYRK\cyrk\cyryu\cyrch\cyre\cyrv\cyrery\cyre\ % \cyrs\cyrl\cyro\cyrv\cyra} @@ -38,7 +39,7 @@ \def\masterproglabel{\masterprogname:} \def\studentname{\cyr\CYRV\cyrery\cyrp\cyro\cyrl\cyrn\cyri\cyrl\ % \cyrs\cyrt\cyru\cyrd\cyre\cyrn\cyrt} -\def\studentlabel{\studentname\ \groupname\ \@group\hspace{2cm}} +\def\studentlabel{\studentname\ \groupname\ \@group\hspace{1.5cm}} \def\saname{\cyr\CYRN\cyra\cyru\cyrch\cyrn\cyrery\cyrishrt\ % \cyrr\cyru\cyrk\cyro\cyrv\cyro\cyrd\cyri\cyrt\cyre\cyrl\cyrsftsn} \def\sasndname{\saname} -- cgit v1.2.3