diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/disser/bachelor.rtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/disser/candidate.rtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/disser/disser.cls | 118 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/disser/master.rtx | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/disser/titledefs.rtx | 21 |
5 files changed, 95 insertions, 54 deletions
diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx index a4e4dd0298b..5b8ac573288 100644 --- a/Master/texmf-dist/tex/latex/disser/bachelor.rtx +++ b/Master/texmf-dist/tex/latex/disser/bachelor.rtx @@ -27,7 +27,7 @@ \def\workname{\CYRR\cyra\cyrb\cyro\cyrt\cyra} -\firstskip\@permitted\secondskip +\firstskip\@approved\secondskip \begin{center} {\titlefont\@title\par} \thirdskip diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx index e0ca65c11dc..b539fbd53f7 100644 --- a/Master/texmf-dist/tex/latex/disser/candidate.rtx +++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx @@ -20,7 +20,7 @@ \def\fourthskip{\vskip1cm} \def\fifthskip{\vskip1cm} \def\sixthskip{} -\def\@sahshift{10cm} +\def\@sahshift{8cm} \def\titlefont{\normalsize} \def\topicfont{\Large\bfseries} diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls index 91b87298aa1..800bb9ea0ff 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-2007 Stanislav Kruchinin +%% Copyright (c) 2004-2008 Stanislav Kruchinin %% %% It may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -319,6 +319,7 @@ \newcommand\toctheappendix{\theappendix} \newcommand\tocthesection{\thesection} \newcommand\tocthesubsection{\thesubsection} +\newcommand\tocthesubsubsection{\thesubsubsection} \newcommand\toctheparagraph{\theparagraph} \newcommand\tocthesubparagraph{\thesubparagraph} @@ -525,8 +526,7 @@ \begingroup \parindent \z@ \rightskip \@pnumwidth \parfillskip -\@pnumwidth - \leavevmode - \tocchapterfont + \leavevmode\tocchapterfont \advance\leftskip\@tempdima \hskip -\leftskip #1\nobreak @@ -758,7 +758,7 @@ \fi #7}}% \fi - \@xsect{#5} + \@xsect{#5}% } \def\@tocline#1#2#3#4#5#6{% \ifnum #2>\c@tocdepth \else @@ -778,23 +778,36 @@ \fi } -\newcommand\defsection[2]{% - \@namedef{l@#1}{% - \@tocline{#1}{#2}{\csname toc#1indent\endcsname} - {\csname toc#1nameindent\endcsname} - } - \@namedef{#1}{% - \@startsection{#1}{#2}{\csname #1indent\endcsname} - {\csname before#1\endcsname}{\csname after#1\endcsname} - {\csname #1font\endcsname\csname #1align\endcsname} - } -} -\defsection{section}{1} -\defsection{subsection}{2} -\defsection{subsubsection}{3} -\defsection{paragraph}{4} -\defsection{subparagraph}{5} +\newcommand\section{\@startsection{section}{1} + {\sectionindent}{\beforesection}% + {\aftersection}{\sectionfont\sectionalign}} +\newcommand*\l@section{\@tocline{section}{1}{\tocsectionindent}% +{\tocsectionnameindent}} + +\newcommand\subsection{\@startsection{subsection}{2} + {\subsectionindent}{\beforesubsection}% + {\aftersubsection}{\subsectionfont\subsectionalign}} +\newcommand*\l@subsection{\@tocline{subsection}{2}{\tocsubsectionindent}% +{\tocsubsectionnameindent}} + +\newcommand\subsubsection{\@startsection{subsubsection}{3} + {\subsubsectionindent}{\beforesubsubsection}% + {\aftersubsubsection}{\subsubsectionfont\subsubsectionalign}} +\newcommand*\l@subsubsection{\@tocline{subsubsection}{3}{\tocsubsubsectionindent}% +{\tocsubsubsectionnameindent}} + +\newcommand\paragraph{\@startsection{paragraph}{4} + {\paragraphindent}{\beforeparagraph}% + {\afterparagraph}{\paragraphfont\paragraphalign}} +\newcommand*\l@paragraph{\@tocline{paragraph}{4}{\tocparagraphindent}% +{\tocparagraphnameindent}} + +\newcommand\subparagraph{\@startsection{subparagraph}{5} + {\subparagraphindent}{\beforesubparagraph}% + {\aftersubparagraph}{\subparagraphfont\subparagraphalign}} +\newcommand*\l@subparagraph{\@tocline{subparagraph}{5}{\tocsubparagraphindent}% +{\tocsubparagraphnameindent}} %%% From File: lists.dtx @@ -963,19 +976,39 @@ \newenvironment{figure*}{\@dblfloat{figure}}{\end@dblfloat} \newenvironment{table}{\@float{table}}{\end@float} \newenvironment{table*}{\@dblfloat{table}}{\end@dblfloat} -\providecommand\theoremstyle{\itshape} -\providecommand\thetheoremstyle{\bfseries} -\providecommand\opargtheoremstyle{\rm} -\providecommand\preopargtheorem{(} -\providecommand\postopargtheorem{)} -\providecommand\postthetheorem{.} + +\def\newtheorem#1{% + { + \global\@namedef{#1style}{\itshape} + \global\@namedef{the#1style}{\bfseries} + \global\@namedef{postthe#1}{.} + \global\@namedef{oparg#1style}{\rm} + \global\@namedef{preoparg#1}{(} + \global\@namedef{postoparg#1}{)} + } + \@ifnextchar[{\@othm{#1}}{\@nthm{#1}}% +} + +\def\@xthm#1#2{% + \@begintheorem{#1}{#2}\ignorespaces} +\def\@ythm#1#2[#3]{% + \@opargbegintheorem{#1}{#2}{#3}\ignorespaces} \def\@begintheorem#1#2{\trivlist - \item[\hskip \labelsep{\thetheoremstyle #1\ % - #2\unskip\postthetheorem}]\theoremstyle} + \item[\hskip \labelsep{\csname the#1style\endcsname #2\ % + \csname the#1\endcsname\unskip% + \csname postthe#1\endcsname}]% + \csname #1style\endcsname} + \def\@opargbegintheorem#1#2#3{\trivlist - \item[\hskip \labelsep{\thetheoremstyle #1\ #2\ % - {\opargtheoremstyle\preopargtheorem #3\postopargtheorem}}]\theoremstyle} + \item[\hskip \labelsep{% + {\csname the#1style\endcsname #2}\ % + \csname the#1\endcsname\ % + {\csname oparg#1style\endcsname% + \csname preoparg#1\endcsname #3% + \csname postoparg#1\endcsname}}]% + \csname #1style\endcsname} + \def\@endtheorem{\endtrivlist} @@ -1144,7 +1177,7 @@ \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} \def\tocfill#1{ - \leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{#1}\mkern \@dotsep mu$} + \leaders\hbox{$\m@th\mkern\@dotsep mu\hbox{#1}\mkern\@dotsep mu$} } \newcommand\indexspace{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax} \newdimen\bibindent @@ -1168,8 +1201,8 @@ \newcommand\listoffigures{% \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\fi - \nchapter{ - \listfigurename + \nchapter{% + \listfigurename% \@mkboth{\MakeUppercase\listfigurename}{\MakeUppercase\listfigurename}% }% \@starttoc{lof}% @@ -1182,9 +1215,9 @@ \else \@restonecolfalse \fi - \nchapter{ - \listtablename - \@mkboth{\MakeUppercase\listtablename}{\MakeUppercase\listtablename} + \nchapter{% + \listtablename% + \@mkboth{\MakeUppercase\listtablename}{\MakeUppercase\listtablename}% }% \@starttoc{lot}% \if@restonecol\twocolumn\fi @@ -1312,15 +1345,20 @@ \usepackage[pdftex]{graphicx} \usepackage{cmap} \else - \ifDis@href\usepackage[hypertex,colorlinks=false,hyperfigures=true]{hyperref}\fi + \ifDis@href + \usepackage[hypertex,colorlinks=false,hyperfigures=true]{hyperref} + \fi \usepackage{graphicx} \fi -\ifDis@href\usepackage{hypernat}\fi -\usepackage[rflt]{floatflt} +\ifDis@href + \usepackage{hypernat} + \usepackage[all]{hypcap} +\fi +\usepackage{wrapfig} \ifDis@subf \usepackage[config,font=small,labelsep=period]{caption,subfig} \def\thesubfigure{\textit{\asbuk{subfigure}}} - \providecommand\thefigsubsep{,\ } + \providecommand\thefigsubsep{,~} \def\p@subfigure{\@nameuse{thefigure}\thefigsubsep} \fi \endinput diff --git a/Master/texmf-dist/tex/latex/disser/master.rtx b/Master/texmf-dist/tex/latex/disser/master.rtx index d1bd3caf9bc..6697ee62717 100644 --- a/Master/texmf-dist/tex/latex/disser/master.rtx +++ b/Master/texmf-dist/tex/latex/disser/master.rtx @@ -20,7 +20,11 @@ \def\fourthskip{\vspace*{-1cm}} \def\fifthskip{\vskip0em} -\firstskip\@permitted\secondskip +\def\titlefont{\Large\bfseries} +\def\topiclabelfont{\large} +\def\topicfont{\large\bfseries} + +\firstskip\@approved\secondskip \begin{center} {\titlefont\@title} \par\thirdskip diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx index b6431849ef4..91aea5aba40 100644 --- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx +++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx @@ -22,9 +22,9 @@ \def\keywordssep{:} \def\keywordslabel{\keywordsname\keywordssep} \def\workname{\cyr\CYRD\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya} -\def\disserpermit{\workname\ \cyrd\cyro\cyrp\cyru\cyrshch\cyre\cyrn\cyra\ % +\def\approved{\workname\ \cyrd\cyro\cyrp\cyru\cyrshch\cyre\cyrn\cyra\ % \cyrk\ \cyrz\cyra\cyrshch\cyri\cyrt\cyre} -\def\hodname{\cyr\cyrz\cyra\cyrv.\ \cyrk\cyra\cyrf\cyre\cyrd\cyrr\cyro\cyrishrt} +\def\appos{\cyr\cyrz\cyra\cyrv.\ \cyrk\cyra\cyrf\cyre\cyrd\cyrr\cyro\cyrishrt} \def\groupname{\cyr\cyrg\cyrr.} \def\topicname{\cyr\CYRT\cyre\cyrm\cyra} \def\topicsep{:\ } @@ -32,8 +32,7 @@ \def\coursename{\cyr\CYRN\cyra\cyrp\cyrr\cyra\cyrv\cyrl\cyre\cyrn\cyri\cyre} \def\coursesep{:} \def\courselabel{\coursename\coursesep} -\def\specname{% -\cyr\CYRS\cyrp\cyre\cyrc\cyri\cyra\cyrl\cyrsftsn\cyrn\cyro\cyrs\cyrt\cyrsftsn} +\def\specname{\cyr\CYRS\cyrp\cyre\cyrc\cyri\cyra\cyrl\cyrsftsn\cyrn\cyro\cyrs\cyrt\cyrsftsn} \def\specsep{:} \def\speclabel{\specname\specsep} \def\masterprogname{\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ % @@ -66,16 +65,16 @@ \def\city#1{\gdef\@city{#1}}\city{} \def\faculty#1{\gdef\@faculty{#1}}\faculty{} \def\department#1{\gdef\@department{#1}}\department{} -\def\hod#1{\gdef\@hod{#1}}\hod{} +\def\apname#1{\gdef\@apname{#1}}\apname{} \def\libcatnum#1{\gdef\@libcatnum{#1}}\libcatnum{} \def\group#1{\gdef\@group{#1}}\group{} \def\masterprognum#1{\gdef\@masterprognum{#1}}\masterprognum{} \def\masterprog#1{\gdef\@masterprog{#1}}\masterprog{} - \date{\number\year} \def\yearname{\cyr\cyrg.} \let\introsect=\paragraph +\def\postintrosect{\ } \def\sa#1{\gdef\@sa{#1}}\sa{} \def\sastatus#1{\gdef\@sastatus{#1}}\sastatus{} \def\rev#1{\gdef\@rev{#1}}\rev{} @@ -110,13 +109,13 @@ \csname @#1status\endcsname\> \makebox[8.5cm][l]{\hrulefill\ \csname @#1\endcsname} } -\def\@permitted{ +\def\@approved{ \begin{tabbing} - \hspace{8cm}\={\disserpermit} + \hspace{8cm}\={\approved} \\ - \>\hodname + \>\appos \\[9pt] - \>\makebox[8.5cm][r]{\hrulefill\ \@hod} + \>\makebox[8.5cm][r]{\hrulefill\ \@apname} \\[9pt] \>\makebox[1.5cm][r]{<<\hrulefill>>} \makebox[7cm][r]{\hrulefill\ \@date\,\yearname} @@ -127,7 +126,7 @@ \rule[0pt]{3cm}{0.5pt}\ #1~\yearname} \newcommand\mkintrosect[3]{% \@namedef{#1head}{#2} - \@namedef{#1section}{\introsect{\expandafter\csname #1head\endcsname}} + \@namedef{#1section}{\introsect{\expandafter\csname #1head\endcsname}\postintrosect} \@namedef{#1text}{#3} } |