disser update (23jul07)

git-svn-id: svn://tug.org/texlive/trunk@4658 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 64 insertions, 51 deletions

diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx
index 302b794a9f7..ae0173d2523 100644
--- a/Master/texmf-dist/tex/latex/disser/candidate.rtx
+++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx
@@ -29,7 +29,7 @@
 \begin{flushright}
   \firstskip
   \asmanuscriptname\\
-  {\libcatname\;\@libcatnum}
+  {\libcatname\ \@libcatnum}
 \end{flushright}
 \begin{center}
   \secondskip
@@ -37,7 +37,7 @@
   \thirdskip
   {\topicfont\@topic\par}
   \fourthskip
-  {\specfont\@specnum~--\;\@spec}
+  {\specfont\@specnum~--\ \@spec}
   \fifthskip
   {\titlefont\@title}
 \end{center}
diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls
index abe2c3e130e..13d25579cf1 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-2006 Stanislav Kruchinin
+%% Copyright (c) 2004-2007 Stanislav Kruchinin
 %%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2006/09/06 Document class for dissertations.]
+\ProvidesClass{disser}[2007/06/15 Document class for dissertations.]
 \ProvidesPackage{disser}
 
 
@@ -341,14 +341,14 @@
 \providecommand\prepart{}
 \providecommand\postpart{\par}
 
-\providecommand\partpagestyle{empty}
+\def\partpagestyle#1{\gdef\@partpagestyle{#1}}\partpagestyle{empty}
 \newcommand\part{
   \if@openright
     \cleardoublepage
   \else
     \clearpage
   \fi
-  \thispagestyle{\partpagestyle}%
+  \thispagestyle{\@partpagestyle}%
   \if@twocolumn
     \onecolumn
     \@tempswatrue
@@ -430,6 +430,8 @@
 \providecommand\prechapter{}
 \providecommand\postchapter{\par\nobreak\vskip 20\p@}
 
+\def\chapterpagestyle#1{\gdef\@chapterpagestyle{#1}}\chapterpagestyle{plain}
+
 \providecommand\tocpretheappendix{\protect\appendixname~}
 \providecommand\tocposttheappendix{.\@postskip}
 \providecommand\tocappendixfill{\tocfill{.}}
@@ -454,7 +456,7 @@
   \else
     \clearpage
   \fi
-  \thispagestyle{plain}%
+  \thispagestyle{\@chapterpagestyle}%
   \global\@topnum\z@
   \@afterindentfalse
   \secdef\@chapter\@schapter
@@ -598,6 +600,23 @@
   }
 }
 
+\def\newcontentsname{\cyr\CYRS\cyro\cyrd\cyre\cyrr\cyrzh\cyra\cyrn\cyri\cyre}
+
+\def\introname{{\cyr\CYRV\cyrv\cyre\cyrd\cyre\cyrn\cyri\cyre}}
+\newcommand\intro{\nchapter{\introname}}
+\def\conclusionname{%
+{\cyr\CYRZ\cyra\cyrk\cyrl\cyryu\cyrch\cyre\cyrn\cyri\cyre}
+}
+\newcommand\conclusion{\nchapter{\conclusionname}}
+\def\defsname{%
+{\cyr\CYRI\cyrs\cyrp\cyro\cyrl\cyrsftsn\cyrz\cyru\cyre\cyrm\cyrery\cyre\ %
+\cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri\cyrya}
+}
+\newcommand\defs{\nchapter{\defsname}}
+\def\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ %
+\cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery}
+\newcommand\review{\nchapter{\reviewname}}
+
 \providecommand\tocprethesection{}
 \providecommand\tocpostthesection{.\@postskip}
 \providecommand\tocsectionfill{\tocfill{.}}
@@ -781,6 +800,10 @@
   \@startsection{subparagraph}{5}{\parindent}%
   {\presubparagraph}{\postsubparagraph}{\subparagraphfont\subparagraphalign}}
 
+\newcommand\nsection[1]{%
+  \section*{\phantomsection\addcontentsline{toc}{section}{#1}#1}
+}
+
 \if@twocolumn
   \setlength\leftmargini {2em}
 \else
@@ -826,7 +849,7 @@
 \setlength\belowcaptionskip{0\p@}
 \newcommand\captionlabeldelim{.}
 \newcommand\captionfont{\small}
-\newcommand\captionlabelfont{\small\bfseries\selectfont}
+\newcommand\captionlabelfont{\small\selectfont}
 \long\def\@makecaption#1#2{%
   \vskip\abovecaptionskip
   \sbox\@tempboxa{{\captionlabelfont #1\captionlabeldelim} {\captionfont #2}}%
@@ -929,29 +952,22 @@
 \newenvironment{figure}{\@float{figure}}{\end@float}
 \newenvironment{figure*}{\@dblfloat{figure}}{\end@dblfloat}
 
-\setlength\columnsep{10\p@}
-\setlength\columnseprule{0\p@}
-\pagestyle{plain}
-\pagenumbering{arabic}
-\if@twoside\else\raggedbottom\fi
-\if@twocolumn\twocolumn\sloppy\flushbottom
-\else\onecolumn\fi
-
 \if@twoside
   \def\ps@headings{%
-    \let\@oddfoot\@empty\let\@evenfoot\@empty
-    \def\@evenhead{\thepage\hfil\slshape\leftmark}%
-    \def\@oddhead{{\slshape\rightmark}\hfil\thepage}%
+    \let\@evenfoot\@empty
+    \let\@oddfoot\@empty
+    \def\@evenhead{\thepage\hfil\evenheadfont\leftmark}%
+    \def\@oddhead{{\oddheadfont\rightmark}\hfil\thepage}%
     \let\@mkboth\markboth
     \def\chaptermark##1{%
-      \markboth{\textsc{%
+      \markboth{{\chaptermarkfont %
       \ifnum \c@secnumdepth >\m@ne
         \@tocseccntformat{chapter} \ %
       \fi
       ##1}}{}%
     }%
     \def\sectionmark##1{%
-      \markright{\MakeUppercase{%
+      \markright{{\sectionmarkfont %
       \ifnum \c@secnumdepth >\z@
         \@tocseccntformat{section}%
       \fi
@@ -968,14 +984,13 @@
     }%
     \let\@mkboth\markboth
     \def\chaptermark##1{%
-    \markright {\textsc{%
+    \markright {{\chaptermarkfont %
     \ifnum\c@secnumdepth >\m@ne
       \@tocseccntformat{chapter} \ %
     \fi
     ##1}}{}}
     \def\sectionmark##1{%
-      \markright{
-        \MakeUppercase{
+      \markright{{\sectionmarkfont %
           \ifnum \c@secnumdepth >\z@
             \@tocseccntformat{section} \ %
           \fi
@@ -988,12 +1003,26 @@
 
 \def\ps@myheadings{%
   \let\@oddfoot\@empty\let\@evenfoot\@empty
-  \def\@evenhead{\thepage\hfil\slshape\leftmark}%
-  \def\@oddhead{{\slshape\rightmark}\hfil\thepage}%
+  \def\@evenhead{\thepage\hfil\evenheadfont\leftmark}%
+  \def\@oddhead{{\oddheadfont\rightmark}\hfil\thepage}%
   \let\@mkboth\@gobbletwo
   \let\chaptermark\@gobble
   \let\sectionmark\@gobble
 }
+\setlength\columnsep{10\p@}
+\setlength\columnseprule{0\p@}
+\pagestyle{plain}
+\pagenumbering{arabic}
+\if@twoside\else\raggedbottom\fi
+\if@twocolumn\twocolumn\sloppy\flushbottom
+\else\onecolumn\fi
+\newcommand\evenheadfont{\slshape}
+\newcommand\evenfootfont{}
+\newcommand\oddheadfont{\slshape}
+\newcommand\oddfootfont{}
+\newcommand\chaptermarkfont{\slshape}
+\newcommand\sectionmarkfont{\MakeUppercase}
+
 
 \newcommand\today{}
 
@@ -1104,10 +1133,10 @@
   \else
     \@restonecolfalse
   \fi
-  \thispagestyle{empty}
   \chapter*{\contentsname%
     \@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}
   }%
+  \thispagestyle{empty}
   \@starttoc{toc}%
   \if@restonecol\twocolumn\fi
   \clearpage
@@ -1206,7 +1235,9 @@
     \pdfcompresslevel = 9
   \fi
   \usepackage[pdftex]{graphicx}
-  \usepackage{cmap}
+  \IfFileExists{cmap.sty}{%
+    \usepackage{cmap}
+  }{}
 \else
   \ifhref\usepackage[hypertex,colorlinks=false,hyperfigures=true]{hyperref}\fi
   \usepackage{graphicx}
@@ -1214,11 +1245,9 @@
 \ifhref\usepackage{hypernat}\fi
 \usepackage[rflt]{floatflt}
 \ifsubf
-  \usepackage[normalsize]{subfigure}
-  \renewcommand*\@thesubfigure{\small\textit{\asbuk{subfigure}})}
-  \renewcommand*\@@thesubfigure{\textit{\asbuk{subfigure}})}
-  \renewcommand*\thesubfigure{,~\textit{\asbuk{subfigure}}}
-  \renewcommand*\@thesubfigure{\small\textit{\asbuk{subfigure}})}
+  \usepackage[config,font=small,labelsep=period]{caption,subfig}
+  \def\thesubfigure{\textit{\asbuk{subfigure}}}
+  \def\p@subfigure{\thefigure, }
 \fi
 
 \lccode `\-=`\-
diff --git a/Master/texmf-dist/tex/latex/disser/master.rtx b/Master/texmf-dist/tex/latex/disser/master.rtx
index 3c6d1940742..6c252ee2862 100644
--- a/Master/texmf-dist/tex/latex/disser/master.rtx
+++ b/Master/texmf-dist/tex/latex/disser/master.rtx
@@ -34,8 +34,8 @@
 \end{tabbing}
 \fifthskip
 \begin{tabbing}
-  \studentlabel\;\groupname\;\@group\hspace{2cm}\=
-  \makebox[8.5cm][l]{\hrulefill\;\@author}
+  \studentlabel\ \groupname\ \@group\hspace{2cm}\=
+  \makebox[8.5cm][l]{\hrulefill\ \@author}
 \\[9pt]
   \field{sa}
 \\[9pt]
diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
index a299171e582..682766b7303 100644
--- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx
+++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
@@ -98,22 +98,6 @@
 \newcommand\datefield[1][\number\year]{<<\rule[0pt]{1cm}{.5pt}\,>>%
 \rule[0pt]{3cm}{0.5pt}\ #1~\yearname}
 
-\def\newcontentsname{\cyr\CYRS\cyro\cyrd\cyre\cyrr\cyrzh\cyra\cyrn\cyri\cyre}
-
-\def\introname{{\cyr\CYRV\cyrv\cyre\cyrd\cyre\cyrn\cyri\cyre}}
-\newcommand\intro{\nchapter{\introname}}
-\def\conclusionname{%
-{\cyr\CYRZ\cyra\cyrk\cyrl\cyryu\cyrch\cyre\cyrn\cyri\cyre}
-}
-\newcommand\conclusion{\nchapter{\conclusionname}}
-\def\defsname{%
-{\cyr\CYRI\cyrs\cyrp\cyro\cyrl\cyrsftsn\cyrz\cyru\cyre\cyrm\cyrery\cyre\ %
-\cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri\cyrya}
-}
-\newcommand\defs{\nchapter{\defsname}}
-\def\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ %
-\cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery}
-\newcommand\review{\nchapter{\reviewname}}
 \endinput
 %%
 %% End of file `titledefs.rtx'.