From 494bd0475fd9f4b8ad307a7fb97b96d1f8093936 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 16 Nov 2009 19:57:36 +0000 Subject: disser 1.1.3 (6nov09) git-svn-id: svn://tug.org/texlive/trunk@16036 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/disser/autoref.rtx | 2 +- Master/texmf-dist/tex/latex/disser/bachelor.rtx | 2 +- Master/texmf-dist/tex/latex/disser/disser.cls | 79 ++++++++++++------------ Master/texmf-dist/tex/latex/disser/gost732.cls | 4 +- Master/texmf-dist/tex/latex/disser/titledefs.rtx | 10 ++- 5 files changed, 52 insertions(+), 45 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 97029b99ad1..74b63d3dc8c 100644 --- a/Master/texmf-dist/tex/latex/disser/autoref.rtx +++ b/Master/texmf-dist/tex/latex/disser/autoref.rtx @@ -37,7 +37,7 @@ \vskip\thirdskip {\topicfont\@topic\par} \vskip\fourthskip - {\specfont\@specnum~--\;\@spec} + {\specfont\@specnum~--\ \@spec} \vskip\fifthskip {\titlefont\@title} \end{center} diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx index 85aac46bfe4..1d55a905f7d 100644 --- a/Master/texmf-dist/tex/latex/disser/bachelor.rtx +++ b/Master/texmf-dist/tex/latex/disser/bachelor.rtx @@ -36,7 +36,7 @@ {\topiclabelfont\topiclabel\;} {\topicfont\@topic\par} \vskip\fourthskip\normalfont - \courselabel\ \@coursenum~-- \@course + \courselabel\ \@coursenum~--\ \@course \end{center} \vskip\fifthskip \begin{tabbing} diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls index 2e33f682d9d..40c950266f2 100644 --- a/Master/texmf-dist/tex/latex/disser/disser.cls +++ b/Master/texmf-dist/tex/latex/disser/disser.cls @@ -44,7 +44,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{disser}[2009/06/11 1.1.2 Document class for dissertations] +\ProvidesClass{disser}[2009/11/05 1.1.3 Document class for dissertations] \def\substyle@ext{.rtx} @@ -301,6 +301,7 @@ \newcounter{subsubsection}[subsection] \newcounter{paragraph}[subsubsection] \newcounter{subparagraph}[paragraph] + \newcounter{figure}[chapter] \newcounter{table}[chapter] @@ -474,6 +475,7 @@ \providecommand\chapterindent{0pt} \newcommand*\chaptermark[1]{} + \newcommand\chapter{% \if@openright \cleardoublepage @@ -1251,62 +1253,62 @@ \newcommand\@pnumwidth{1.55em} \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} -\def\tocfill#1{ - \leaders\hbox{$\m@th\mkern\@dotsep mu\hbox{#1}\mkern\@dotsep mu$} +\def\tocfill#1{% + \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 -\setlength\bibindent{1.5em} -\newcommand\newblock{\hskip .11em\@plus.33em\@minus.07em} -\let\@openbib@code\@empty + +\newcommand\tocsection{\chapter*{\contentsname}} \newcommand\tableofcontents{% - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse - \fi - \chapter*{\contentsname% - \@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname} - }% + \if@twocolumn\@restonecoltrue\onecolumn% + \else\@restonecolfalse\fi% + \tocsection% + \@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}% \@starttoc{toc}% \if@restonecol\twocolumn\fi \clearpage } +\newcommand\lofsection{\nchapter{\listfigurename}} + \newcommand\listoffigures{% - \if@twocolumn\@restonecoltrue\onecolumn - \else\@restonecolfalse\fi - \nchapter{% - \listfigurename% - \@mkboth{\MakeUppercase\listfigurename}{\MakeUppercase\listfigurename}% - }% + \if@twocolumn\@restonecoltrue\onecolumn% + \else\@restonecolfalse\fi% + \lofsection% + \@mkboth{\MakeUppercase\listfigurename}{\MakeUppercase\listfigurename}% \@starttoc{lof}% \if@restonecol\twocolumn\fi } + \newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}} + +\newcommand\lotsection{\nchapter{\listtablename}} + \newcommand\listoftables{% - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse - \fi - \nchapter{% - \listtablename% - \@mkboth{\MakeUppercase\listtablename}{\MakeUppercase\listtablename}% - }% + \if@twocolumn\@restonecoltrue\onecolumn% + \else\@restonecolfalse\fi% + \lotsection% + \@mkboth{\MakeUppercase\listtablename}{\MakeUppercase\listtablename}% \@starttoc{lot}% \if@restonecol\twocolumn\fi } + \let\l@table\l@figure \newenvironment{thebibliography}[1]{}{} -\newenvironment{theindex}{ - \if@twocolumn\@restonecolfalse - \else\@restonecoltrue\fi +\newdimen\bibindent +\setlength\bibindent{1.5em} +\newcommand\newblock{\hskip .11em\@plus.33em\@minus.07em} +\let\@openbib@code\@empty + +\providecommand\indexsection{\twocolumn[\@makeschapterhead{\indexname}]} + +\newenvironment{theindex}{% + \if@twocolumn\@restonecolfalse% + \else\@restonecoltrue\fi% \columnseprule \z@ \columnsep 35\p@ - \twocolumn[\@makeschapterhead{\indexname}]% + \indexsection% \@mkboth{\MakeUppercase\indexname}{\MakeUppercase\indexname}% \thispagestyle{plain} \parindent\z@ @@ -1316,6 +1318,7 @@ \newcommand\@idxitem{\par\hangindent 40\p@} \newcommand\subitem{\@idxitem \hspace*{20\p@}} \newcommand\subsubitem{\@idxitem \hspace*{30\p@}} +\newcommand\indexspace{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax} %%% From File: custom.dtx @@ -1391,7 +1394,7 @@ }{} \fi -\usepackage[square, comma, sort&compress, numbers]{natbib} +\usepackage[square,comma,sort&compress,numbers]{natbib} \renewcommand\bibsection{\nchapter{\bibname}} @@ -1427,7 +1430,7 @@ \ifpdf \ifDis@href - \usepackage[pdftex,unicode,hyperfigures=true]{hyperref} + \usepackage[pdftex,unicode]{hyperref} \hypersetup{ colorlinks = false, bookmarksopen = true, @@ -1442,7 +1445,7 @@ \usepackage{cmap} \else \ifDis@href - \usepackage[hypertex,colorlinks=false,hyperfigures=true]{hyperref} + \usepackage[hypertex,colorlinks=false]{hyperref} \fi \usepackage{graphicx} \fi diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls index 5b8330a71e7..2f9905a4b0e 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/06/19 1.1.2 GOST 7.32-2001 implementation] +\ProvidesClass{gost732}[2009/11/05 1.1.3 GOST 7.32-2001 implementation] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}} \ProcessOptions\relax @@ -118,7 +118,7 @@ \captionsetup[longtable]{justification=raggedright,singlelinecheck=false} \captionsetup[table]{justification=raggedright,singlelinecheck=false} -\renewcommand\postthefootnote{)} +\renewcommand\postthefootnote{$^)$} \endinput %% diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx index 0b5c110e823..ffd09227554 100644 --- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx +++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx @@ -32,10 +32,12 @@ \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\ % +\def\masterprogname{% +\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ % \cyrp\cyrr\cyro\cyrg\cyrr\cyra\cyrm\cyrm\cyra} \def\masterprogsep{:} \def\masterproglabel{\masterprogname\masterprogsep} @@ -52,7 +54,8 @@ \def\asmanuscriptname{\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{\cyr\CYRK\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt\cyrery:} +\def\consultname{% +\cyr\CYRK\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt\cyrery:} \def\institution#1{\gdef\@institution{#1}}\institution{} \def\spec#1{\gdef\@spec{#1}}\spec{} \def\specnum#1{\gdef\@specnum{#1}}\specnum{} @@ -105,6 +108,7 @@ \newcommand\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ % \cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery} \newcommand\review{\nchapter{\reviewname}} + \def\field#1{% \csname #1label\endcsname,\\% \csname @#1status\endcsname\> -- cgit v1.2.3