From 4015a058f2c68e873ea7f12eb582b49b9a903cd7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 29 Mar 2010 23:31:05 +0000 Subject: disser 1.1.5 (28mar10) git-svn-id: svn://tug.org/texlive/trunk@17612 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/disser/autoref.rtx | 15 ++- Master/texmf-dist/tex/latex/disser/bachelor.rtx | 22 +++- Master/texmf-dist/tex/latex/disser/candidate.rtx | 43 +++++-- Master/texmf-dist/tex/latex/disser/disser.cls | 147 +++++++++++++---------- Master/texmf-dist/tex/latex/disser/doctor.rtx | 42 +++++-- Master/texmf-dist/tex/latex/disser/gost732.cls | 2 +- Master/texmf-dist/tex/latex/disser/master.rtx | 19 ++- Master/texmf-dist/tex/latex/disser/titledefs.rtx | 50 +++++--- 8 files changed, 224 insertions(+), 116 deletions(-) (limited to 'Master/texmf-dist/tex/latex/disser') diff --git a/Master/texmf-dist/tex/latex/disser/autoref.rtx b/Master/texmf-dist/tex/latex/disser/autoref.rtx index 74b63d3dc8c..97dbe501e3c 100644 --- a/Master/texmf-dist/tex/latex/disser/autoref.rtx +++ b/Master/texmf-dist/tex/latex/disser/autoref.rtx @@ -25,10 +25,19 @@ \def\authorfont{\large} \def\specfont{\normalsize} +\thispagestyle{empty} +\enlargethispage{2cm} +\vspace*{-2cm} +\begin{center} +\instfont\@institution\par +\end{center} + +\vskip\firstskip \normalfont + \begin{flushright} - \vskip\firstskip - \asmanuscriptname\\ + \ifDis@classified\classify\fi + \asmanuscript \ifDis@facsimile\facsimile\fi \end{flushright} \begin{center} @@ -40,6 +49,8 @@ {\specfont\@specnum~--\ \@spec} \vskip\fifthskip {\titlefont\@title} + \vfill + {\@city\cdsep\@date} \end{center} \endinput %% diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx index 1d55a905f7d..89d8d3f22f5 100644 --- a/Master/texmf-dist/tex/latex/disser/bachelor.rtx +++ b/Master/texmf-dist/tex/latex/disser/bachelor.rtx @@ -14,7 +14,6 @@ \ProvidesFile{bachelor.rtx} - \deflength\firstskip{1.5cm} \deflength\secondskip{1.5cm} \deflength\thirdskip{1ex} @@ -27,24 +26,37 @@ \def\workname{\CYRR\cyra\cyrb\cyro\cyrt\cyra} -\vskip\firstskip +\thispagestyle{empty} +\enlargethispage{2cm} +\vspace*{-2cm} +\begin{center} +\instfont\@institution\par +\end{center} + +\vskip\firstskip\normalfont \@approved \vskip\secondskip + \begin{center} {\titlefont\@title\par} - \vskip\thirdskip - {\topiclabelfont\topiclabel\;} + \vskip\thirdskip\normalfont + {\topiclabelfont\topiclabel\ }% {\topicfont\@topic\par} \vskip\fourthskip\normalfont \courselabel\ \@coursenum~--\ \@course \end{center} -\vskip\fifthskip + +\vskip\fifthskip\normalfont \begin{tabbing} \studentlabel\ \groupname\ \@group\hspace{2cm}\= \makebox[8.5cm][l]{\hrulefill\ \@author} \\[9pt] \field{sa} \end{tabbing} +\vfill +\begin{center} + {\@city\cdsep\@date} +\end{center} \endinput %% %% End of file `bachelor.rtx'. diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx index 17f7ea5217c..b77557a5881 100644 --- a/Master/texmf-dist/tex/latex/disser/candidate.rtx +++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx @@ -24,7 +24,8 @@ \deflength\thirdskip{1cm} \deflength\fourthskip{1cm} \deflength\fifthskip{1cm} -\deflength\sixthskip{0pt} +\deflength\sixthskip{0cm} +\deflength\seventhskip{0cm} \deflength\@sahshift{8cm} @@ -33,31 +34,49 @@ \def\authorfont{\large} \def\specfont{\normalsize} -\vskip\firstskip -\normalfont +\thispagestyle{empty} +\enlargethispage{2cm} +\vspace*{-2cm} + +\begin{center} + \instfont\@institution\par +\end{center} + +\vskip\firstskip\normalfont \begin{flushright} - \asmanuscriptname\\ + \ifDis@classified\classify\fi + \asmanuscript \ifDis@facsimile\facsimile\fi - \ifDis@libcat - {\libcatname\ \@libcatnum} - \fi + \ifDis@libcat\libcatname\ \@libcatnum\fi \end{flushright} \begin{center} - \vskip\secondskip + \vskip\secondskip\normalfont {\authorfont\@author} - \vskip\thirdskip + \vskip\thirdskip\normalfont {\topicfont\@topic\par} - \vskip\fourthskip + \vskip\fourthskip\normalfont {\specfont\@specnum~--\ \@spec} - \vskip\fifthskip + \vskip\fifthskip\normalfont {\titlefont\@title} \end{center} -\vskip\sixthskip +\vskip\sixthskip\normalfont \begin{tabbing} \hspace{\@sahshift}\={\saname}\\ \>\@sastatus\\ \>\@sa \end{tabbing} +\ifx\@scon\empty\else + \vskip\seventhskip\normalfont + \begin{tabbing} + \hspace{\@sahshift}\={\sconname}\\ + \>\@sconstatus\\ + \>\@scon + \end{tabbing} +\fi +\vfill +\begin{center} + {\@city\cdsep\@date} +\end{center} \endinput %% %% End of file `candidate.rtx'. diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls index f99339f9388..64fb2370b9f 100644 --- a/Master/texmf-dist/tex/latex/disser/disser.cls +++ b/Master/texmf-dist/tex/latex/disser/disser.cls @@ -44,9 +44,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2009/11/20 1.1.4 Document class for dissertations] +\ProvidesClass{disser}[2009/03/23 1.1.5 Document class for dissertations] -\def\substyle@ext{.rtx} +\RequirePackage{kvoptions} \RequirePackage{ifpdf} @@ -59,6 +59,7 @@ \newif\ifDis@doctor\Dis@doctorfalse \newif\ifDis@autoref\Dis@autoreffalse \newif\ifDis@libcat\Dis@libcatfalse +\newif\ifDis@classified\Dis@classifiedfalse \newif\ifDis@facsimile\Dis@facsimilefalse \newif\ifDis@ams\Dis@amstrue \newif\ifDis@href\Dis@hreffalse @@ -66,21 +67,12 @@ \newif\ifDis@times\Dis@timesfalse \newif\ifDis@mtpro\Dis@mtprofalse -\RequirePackage{kvoptions}[2006/08/17] - \DeclareOption{href}{\Dis@hreftrue} \DeclareOption{subf}{\Dis@subftrue} \DeclareOption{libcat}{\Dis@libcattrue} +\DeclareOption{classified}{\Dis@classifiedtrue} \DeclareOption{facsimile}{\Dis@facsimiletrue} \DeclareOption{noams}{\Dis@amsfalse} - -\SetupKeyvalOptions{ - family=Dis, - prefix=Dis@ -} - -\DeclareBoolOption[true]{fixint} - \DeclareOption{a4paper}{% \setlength\paperheight{297mm} \setlength\paperwidth {210mm} @@ -178,10 +170,27 @@ \Dis@autoreftrue } +\SetupKeyvalOptions{ + family=Dis, + prefix=Dis@ +} + +\DeclareBoolOption[true]{fixint} +\DeclareBoolOption[false]{colorlinks} +\DeclareStringOption{titlepagefile} + \ExecuteOptions{a4paper,14pt,oneside,titlepage,onecolumn,final,openany,candidate} \ProcessKeyvalOptions{Dis} \ProcessOptions +\ifx\Dis@titlepagefile\@empty + \ifDis@bachelor \renewcommand*{\Dis@titlepagefile}{bachelor.rtx}\fi + \ifDis@master \renewcommand*{\Dis@titlepagefile}{master.rtx}\fi + \ifDis@candidate\renewcommand*{\Dis@titlepagefile}{candidate.rtx}\fi + \ifDis@doctor \renewcommand*{\Dis@titlepagefile}{doctor.rtx}\fi + \ifDis@autoref \renewcommand*{\Dis@titlepagefile}{autoref.rtx}\fi +\fi + \DeclareRobustCommand\MakeTextUppercase{% \@uclcnotmath{\def\i{I}\def\j{J}}{##1##2}\uppercase} @@ -196,6 +205,7 @@ \DeclareFontShape{#1}{#2}{#3}{#4}% {<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>genb*#5}{}} + \EC@family{T1}{cmr}{m}{n}{ecrm} \EC@family{T1}{cmr}{m}{sl}{ecsl} \EC@family{T1}{cmr}{m}{it}{ecti} @@ -206,45 +216,49 @@ \EC@family{T1}{cmr}{bx}{sl}{ecbl} \EC@family{T1}{cmr}{bx}{sc}{ecxc} \EC@family{T1}{cmr}{m}{ui}{ecui} -\DeclareFontShape{OT1}{cmr}{m}{n}% - {<5><6><7><8><9><10><12>gen*cmr% - <10.95>cmr10% - <14.4>cmr12% - <17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmr17}{} -\DeclareFontShape{OT1}{cmr}{m}{sl}% - {<5><6><7>cmsl8% - <8><9>gen*cmsl% - <10><10.95>cmsl10% - <12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmsl12% - }{} -\DeclareFontShape{OT1}{cmr}{m}{it}% - {<5><6><7>cmti7% - <8>cmti8% - <9>cmti9% - <10><10.95>cmti10% - <12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmti12% - }{} -\DeclareFontShape{OT1}{cmr}{m}{sc}% - {<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>cmcsc10% - }{} -\DeclareFontShape{OT1}{cmr}{m}{ui}{ + +\DeclareFontShape{OT1}{cmr}{m}{n}{% + <5><6><7><8><9><10><12>gen*cmr% + <10.95>cmr10% + <14.4>cmr12% + <17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmr17% +}{} +\DeclareFontShape{OT1}{cmr}{m}{sl}{% + <5><6><7>cmsl8% + <8><9>gen*cmsl% + <10><10.95>cmsl10% + <12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmsl12% +}{} +\DeclareFontShape{OT1}{cmr}{m}{it}{% + <5><6><7>cmti7% + <8>cmti8% + <9>cmti9% + <10><10.95>cmti10% + <12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmti12% +}{} +\DeclareFontShape{OT1}{cmr}{m}{sc}{% + <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>cmcsc10% +}{} +\DeclareFontShape{OT1}{cmr}{m}{ui}{% <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>cmu10% }{} -\DeclareFontShape{OT1}{cmr}{b}{n}{ +\DeclareFontShape{OT1}{cmr}{b}{n}{% <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>cmb10% }{} -\DeclareFontShape{OT1}{cmr}{bx}{n}{ +\DeclareFontShape{OT1}{cmr}{bx}{n}{% <5><6><7><8><9>gen*cmbx% <10><10.95>cmbx10% <12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbx12% }{} -\DeclareFontShape{OT1}{cmr}{bx}{sl}{<5><6><7><8><9>% +\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% }{} -\DeclareFontShape{OT1}{cmr}{bx}{it}{<5><6><7><8><9>% +\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% }{} \input{size\@ptsize.clo} @@ -472,7 +486,7 @@ \providecommand\chapterfont{\Large\bfseries} \providecommand\beforechapter{} \providecommand\afterchapter{\par\nobreak\vskip 20\p@} -\providecommand\chapterindent{0pt} +\providecommand\chapterindent{0\p@} \newcommand*\chaptermark[1]{} @@ -505,6 +519,7 @@ \@afterheading \fi } + \def\@makechapterhead#1{{% \parindent\z@ \normalfont\hskip\chapterindent% @@ -530,6 +545,7 @@ \interlinepenalty\@M \chapteralign\chapterfont\beforechapter #1\afterchapter }} + \newcommand*\l@chapter[2]{% \ifnum \c@tocdepth >\m@ne \addpenalty{-\@highpenalty} @@ -566,7 +582,7 @@ \providecommand\appendixfont{\Large\bfseries} \providecommand\beforeappendix{} \providecommand\afterappendix{\par\nobreak\vskip 20\p@} -\providecommand\appendixindent{0pt} +\providecommand\appendixindent{0\p@} \newcommand\appendix{ \setcounter{chapter}{0} \setcounter{section}{0} @@ -807,7 +823,8 @@ \ifnum #2>\c@secnumdepth \else \protect\numberline{\@tocseccntformat{#1}}% \fi - #7}}% + #7}% + }% \fi \@xsect{#5}% } @@ -1079,6 +1096,14 @@ \newcommand\oddfootfont{\reset@font} \newcommand\headfont{\reset@font} \newcommand\footfont{\reset@font} +\def\ps@empty{ + \let\@mkboth\@gobbletwo + \let\@oddhead\@empty + \let\@oddfoot\@empty + \let\@evenhead\@empty + \let\@evenfoot\@empty +} + \def\ps@footcenter{ \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -1185,7 +1210,7 @@ \newcommand\today{} -\input{titledefs\substyle@ext} +\input{titledefs.rtx} \if@titlepage \newcommand\titlefont{\Large\bfseries} @@ -1195,23 +1220,9 @@ \newcommand\cdsep{~-- } \newcommand\maketitle{ - \thispagestyle{empty} - \vspace*{-2cm} - \begin{center} - \instfont\@institution\par - \makeatletter - \ifDis@bachelor \input{bachelor\substyle@ext}\fi - \ifDis@master \input{master\substyle@ext}\fi - \ifDis@candidate\input{candidate\substyle@ext}\fi - \ifDis@doctor \input{doctor\substyle@ext}\fi - \ifDis@autoref \input{autoref\substyle@ext}\fi - \enlargethispage{2cm} - \vfill - {\@city\cdsep\@date} - \end{center} - \normalsize - \clearpage - \thispagestyle{empty} + \makeatletter + \input{\Dis@titlepagefile} + \normalfont\clearpage } % \newcommand\maketitle \setcounter{footnote}{0} \else %\if@titlepage @@ -1260,7 +1271,8 @@ \newcommand\tocsection{\chapter*{\contentsname}} \newcommand\tableofcontents{% - \if@twocolumn\@restonecoltrue\onecolumn% + \if@twocolumn% + \@restonecoltrue\onecolumn% \else\@restonecolfalse\fi% \tocsection% \@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}% @@ -1450,11 +1462,18 @@ \usepackage{graphicx} \fi \ifDis@href - \usepackage{hypernat} - \usepackage[all]{hypcap} + \ifDis@colorlinks + \usepackage{color} + \definecolor{darkblue}{rgb}{0,0,.6} + \hypersetup{ + colorlinks = true, linkcolor = darkblue, + citecolor = darkblue, filecolor = darkblue, + menucolor = darkblue, urlcolor = darkblue + } + \fi \fi -\def\metaphantom#1{% +\providecommand\metaphantom[1]{% \ifDis@href \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{#1*.\the\Hy@linkcounter}% diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx index e696971d13b..b54bf6cd310 100644 --- a/Master/texmf-dist/tex/latex/disser/doctor.rtx +++ b/Master/texmf-dist/tex/latex/disser/doctor.rtx @@ -24,31 +24,51 @@ \deflength\thirdskip{1cm} \deflength\fourthskip{1cm} \deflength\fifthskip{1cm} +\deflength\sixthskip{0cm} + +\deflength\@sahshift{8cm} \def\titlefont{\normalsize} \def\topicfont{\Large\bfseries} \def\authorfont{\large} \def\specfont{\normalsize} -\vskip\firstskip -\normalfont +\thispagestyle{empty} +\enlargethispage{2cm} +\vspace*{-2cm} + +\begin{center} + \instfont\@institution\par +\end{center} +\vskip\firstskip\normalfont \begin{flushright} - \asmanuscriptname\\ + \ifDis@classified\classify\fi + \asmanuscript \ifDis@facsimile\facsimile\fi -\ifDis@libcat - {\libcatname\ \@libcatnum} -\fi + \ifDis@libcat\libcatname\ \@libcatnum\fi \end{flushright} \begin{center} - \vskip\secondskip + \vskip\secondskip\normalfont {\authorfont\@author} - \vskip\thirdskip + \vskip\thirdskip\normalfont {\topicfont\@topic\par} - \vskip\fourthskip - {\specfont\@specnum~--\;\@spec} - \vskip\fifthskip + \vskip\fourthskip\normalfont + {\specfont\@specnum~--\ \@spec} + \vskip\fifthskip\normalfont {\titlefont\@title} \end{center} +\ifx\@scon\empty\else + \vskip\sixthskip\normalfont + \begin{tabbing} + \hspace{\@sahshift}\={\sconname}\\ + \>\@sconstatus\\ + \>\@scon + \end{tabbing} +\fi +\vfill +\begin{center} + {\@city\cdsep\@date} +\end{center} \endinput %% %% End of file `doctor.rtx'. diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls index b0a202e4731..635029c2055 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}[2009/11/20 1.1.4 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2009/03/23 1.1.5 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 9759d07598d..7e2ff5d74dd 100644 --- a/Master/texmf-dist/tex/latex/disser/master.rtx +++ b/Master/texmf-dist/tex/latex/disser/master.rtx @@ -24,22 +24,29 @@ \def\topiclabelfont{\large} \def\topicfont{\large\bfseries} -\vskip\firstskip +\thispagestyle{empty} +\enlargethispage{2cm} +\vspace*{-2cm} +\begin{center} +\instfont\@institution\par +\end{center} + +\vskip\firstskip\normalfont \@approved \vskip\secondskip \begin{center} {\titlefont\@title} - \vskip\thirdskip + \vskip\thirdskip\normalfont {\topiclabelfont\topiclabel} {\topicfont\@topic} \end{center} -\vskip\fourthskip +\vskip\fourthskip\normalfont \begin{tabbing} \phantom{\masterproglabel}\=\\ \courselabel\>\ \@coursenum\ --\ \@course\\ \masterproglabel\>\ \@masterprognum\ --\ \@masterprog \end{tabbing} -\vskip\fifthskip +\vskip\fifthskip\normalfont \begin{tabbing} \studentlabel\ \groupname\ \@group\hspace{2cm}\= \makebox[8.5cm][l]{\hrulefill\ \@author} @@ -50,6 +57,10 @@ \\[9pt] \ifdefined\@con\field{con}\fi \end{tabbing} +\vfill +\begin{center} + {\@city\cdsep\@date} +\end{center} \endinput %% %% End of file `master.rtx'. diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx index ffd09227554..7b92d2e143a 100644 --- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx +++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx @@ -47,11 +47,14 @@ \def\saname{\cyr\CYRN\cyra\cyru\cyrch\cyrn\cyrery\cyrishrt\ % \cyrr\cyru\cyrk\cyro\cyrv\cyro\cyrd\cyri\cyrt\cyre\cyrl\cyrsftsn} \def\salabel{\saname} +\def\sconname{\cyr\CYRN\cyra\cyru\cyrch\cyrn\cyrery\cyrishrt\ % +\cyrk\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt} +\def\sconlabel{\sconname} \def\revname{\cyr\CYRR\cyre\cyrc\cyre\cyrn\cyrz\cyre\cyrn\cyrt} \def\revlabel{\revname} \def\conname{\cyr\CYRK\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt} \def\conlabel{\conname\ \cyrp\cyro\ \@conspec} -\def\asmanuscriptname{\cyr\CYRN\cyra\ \cyrp\cyrr\cyra\cyrv\cyra\cyrh\ % +\def\asmanuscript{\cyr\CYRN\cyra\ \cyrp\cyrr\cyra\cyrv\cyra\cyrh\ % \cyrr\cyru\cyrk\cyro\cyrp\cyri\cyrs\cyri} \def\libcatname{\cyr\CYRU\CYRD\CYRK} \def\consultname{% @@ -80,6 +83,8 @@ \def\postcommonsect{\ } \def\sa#1{\gdef\@sa{#1}}\sa{} \def\sastatus#1{\gdef\@sastatus{#1}}\sastatus{} +\def\scon#1{\gdef\@scon{#1}}\scon{} +\def\sconstatus#1{\gdef\@sconstatus{#1}}\sconstatus{} \def\rev#1{\gdef\@rev{#1}}\rev{} \def\revstatus#1{\gdef\@revstatus{#1}}\revstatus{} \def\conspec#1{\gdef\@conspec{#1}} @@ -92,36 +97,33 @@ } } -\newcommand\introname{\cyr\CYRV\cyrv\cyre\cyrd\cyre\cyrn\cyri\cyre} -\newcommand\intro{\nchapter{\introname}} -\newcommand\conclusionname{% +\providecommand*\introname{\cyr\CYRV\cyrv\cyre\cyrd\cyre\cyrn\cyri\cyre} +\providecommand*\intro{\nchapter{\introname}} +\providecommand*\conclusionname{% \cyr\CYRZ\cyra\cyrk\cyrl\cyryu\cyrch\cyre\cyrn\cyri\cyre } -\newcommand\conclusion{\nchapter{\conclusionname}} -\newcommand\defsname{% +\providecommand*\conclusion{\nchapter{\conclusionname}} +\providecommand*\defsname{% {\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ % \cyri\cyrs\cyrp\cyro\cyrl\cyrsftsn\cyrz\cyru\cyre\cyrm\cyrery\cyrh\ % \cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri\cyrishrt} } -\newcommand\defs{\nchapter{\defsname}} +\providecommand*\defs{\nchapter{\defsname}} -\newcommand\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ % +\providecommand*\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ % \cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery} -\newcommand\review{\nchapter{\reviewname}} +\providecommand*\review{\nchapter{\reviewname}} -\def\field#1{% +\providecommand\field[1]{% \csname #1label\endcsname,\\% \csname @#1status\endcsname\> \makebox[8.5cm][l]{\hrulefill\ \csname @#1\endcsname} } -\def\@approved{ +\providecommand\@approved{ \begin{tabbing} - \hspace{8cm}\={\approved} -\\ - \>\appos -\\[9pt] - \>\makebox[8.5cm][r]{\hrulefill\ \@apname} -\\[9pt] + \hspace{8cm}\={\approved}\\ + \>\appos\\[9pt] + \>\makebox[8.5cm][r]{\hrulefill\ \@apname}\\[9pt] \>\makebox[1.5cm][r]{<<\hrulefill>>} \makebox[7cm][r]{\hrulefill\ \@date\,\yearname} \end{tabbing} @@ -129,6 +131,7 @@ \providecommand\datefield[1][\number\year]{<<\rule[0pt]{1cm}{.5pt}>>\ % \rule[0pt]{3cm}{0.5pt}\ #1~\yearname} + \providecommand\mkcommonsect[3]{% \@namedef{#1head}{#2} \@namedef{#1section}{\commonsect{\expandafter\csname #1head\endcsname}\postcommonsect} @@ -136,6 +139,19 @@ } \let\mkintrosect=\mkcommonsect +\def\copynum#1{\gdef\@copynum{#1}} +\copynum{1} +\def\classlabel#1{\gdef\@classlabel{#1}} +\classlabel{\cyr\CYRS\cyre\cyrk\cyrr\cyre\cyrt\cyrn\cyro} + +\def\classify{ + \begin{flushright} + \@classlabel\\ + {\cyr\CYREREV\cyrk\cyrz.~\textnumero\,\@copynum} + \end{flushright} + \vspace{2ex} +} + \providecommand\facsimile{\vskip 6pt\includegraphics[width=3cm]{facsimile}} \endinput -- cgit v1.2.3