disser update (30may10)

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

1 files changed, 24 insertions, 47 deletions

diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls
index 64fb2370b9f..120972cdcf5 100644
--- a/Master/texmf-dist/tex/latex/disser/disser.cls
+++ b/Master/texmf-dist/tex/latex/disser/disser.cls
@@ -18,7 +18,7 @@
 %% toc.dtx  (with options: `toc')
 %% custom.dtx  (with options: `custom')
 %% 
-%% Copyright (c) 2004-2009 Stanislav Kruchinin.
+%% Copyright (c) 2004-2010 Stanislav Kruchinin.
 %% All rights reserved.
 %% 
 %% This file is part of the disser package.
@@ -27,7 +27,7 @@
 %%
 %% disser -- LaTeX document class for dissertations.
 %%
-%% Copyright (c) 2004-2009 Stanislav Kruchinin
+%% Copyright (c) 2004-2010 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}[2009/03/23 1.1.5 Document class for dissertations]
+\ProvidesClass{disser}[2010/05/22 1.1.6 Document class for dissertations]
 
 \RequirePackage{kvoptions}
 
@@ -177,29 +177,23 @@
 
 \DeclareBoolOption[true]{fixint}
 \DeclareBoolOption[false]{colorlinks}
-\DeclareStringOption{titlepagefile}
+\DeclareStringOption{substylefile}
 
 \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
+\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
 \fi
 
-\DeclareRobustCommand\MakeTextUppercase{%
-  \@uclcnotmath{\def\i{I}\def\j{J}}{##1##2}\uppercase}
+\AtEndOfClass{\input{\Dis@substylefile}}
 
-\protected@edef\MakeTextUppercase#1{\MakeTextUppercase{#1}}
-
-\DeclareRobustCommand\MakeTextLowercase{%
-  \@uclcnotmath{}{##2##1}\lowercase}
-
-\protected@edef\MakeTextLowercase#1{\MakeTextLowercase{#1}}
+\RequirePackage[overload]{textcase}
 
 \def\EC@family#1#2#3#4#5{%
   \DeclareFontShape{#1}{#2}{#3}{#4}%
@@ -301,6 +295,7 @@
 
 \lccode`\-=`\-
 \defaulthyphenchar=127
+\newcommand\today{}
 
 
 %%% From File: counters.dtx
@@ -340,7 +335,7 @@
 \newcommand\toctheparagraph{\theparagraph}
 \newcommand\tocthesubparagraph{\thesubparagraph}
 
-\newcommand\bachelor@the{%
+\newcommand\default@the{%
   \@addtoreset{footnote}{chapter}
   \@addtoreset{equation}{chapter}
 
@@ -354,16 +349,6 @@
     \ifnum \c@chapter>\z@\thechapter.\fi%
     \@arabic\c@figure}
 }
-\newcommand\master@the   \bachelor@the
-\newcommand\candidate@the\bachelor@the
-\newcommand\doctor@the   \candidate@the
-\newcommand\autoref@the  \candidate@the
-
-\ifDis@bachelor \bachelor@the  \fi
-\ifDis@master   \master@the    \fi
-\ifDis@candidate\candidate@the \fi
-\ifDis@doctor   \doctor@the    \fi
-\ifDis@autoref  \autoref@the   \fi
 
 %%% From File: part.dtx
 
@@ -505,9 +490,9 @@
 \def\@chapter[#1]#2{
   \ifnum \c@secnumdepth >\m@ne
     \refstepcounter{chapter}%
-    {\def\\{ }\addcontentsline{toc}{chapter}{\@tocseccntformat{chapter} #1}}%
+    {\addcontentsline{toc}{chapter}{\@tocseccntformat{chapter} #1}}%
   \else
-    {\def\\{ }\addcontentsline{toc}{chapter}{#1}}%
+    {\addcontentsline{toc}{chapter}{#1}}%
   \fi
   \chaptermark{#1}%
   \addtocontents{lof}{\protect\addvspace{10\p@}}%
@@ -1208,8 +1193,6 @@
 \fi
 
 
-\newcommand\today{}
-
 \input{titledefs.rtx}
 
 \if@titlepage
@@ -1218,14 +1201,9 @@
   \newcommand\topicfont{\large\bfseries}
   \newcommand\instfont{\normalfont}
   \newcommand\cdsep{~-- }
-
-  \newcommand\maketitle{
-    \makeatletter
-    \input{\Dis@titlepagefile}
-    \normalfont\clearpage
-  } % \newcommand\maketitle
+  \newcommand\maketitle{}
   \setcounter{footnote}{0}
-\else %\if@titlepage
+\else
   \newcommand\maketitle{%
     \global\let\thanks\relax
     \global\let\maketitle\relax
@@ -1426,7 +1404,6 @@
   \let\citeN\cite
   \let\shortcite\cite
   \let\citeasnoun\cite
-  \ifDis@autoref\setlength\bibsep{0pt}\fi
 }{%
   \def\@noitemerr{\PackageWarning{natbib}{Empty `thebibliography' environment}}
   \endlist\vskip-\lastskip%
@@ -1473,7 +1450,7 @@
   \fi
 \fi
 
-\providecommand\metaphantom[1]{%
+\providecommand\hrefphantom[1]{%
   \ifDis@href
     \Hy@GlobalStepCount\Hy@linkcounter
     \xdef\@currentHref{#1*.\the\Hy@linkcounter}%
@@ -1489,23 +1466,23 @@
   \fi
   \thispagestyle{\@chapterpagestyle}%
   \global\@topnum\z@
-  \metaphantom{chapter}
-  {\def\\{ }\addcontentsline{toc}{chapter}{#1}}%
+  \hrefphantom{chapter}
+  \addcontentsline{toc}{chapter}{#1}%
   \@afterindentfalse
   \@schapter{#1}
 }
 \newcommand\nsection[1]{%
-  \metaphantom{section}%
+  \hrefphantom{section}%
   \addcontentsline{toc}{section}{#1}
   \section*{#1}
 }
 \newcommand\nsubsection[1]{%
-  \metaphantom{subsection}%
+  \hrefphantom{subsection}%
   \addcontentsline{toc}{subsection}{#1}
   \subsection*{#1}
 }
 \newcommand\nsubsubsection[1]{%
-  \metaphantom{subsubsection}%
+  \hrefphantom{subsubsection}%
   \addcontentsline{toc}{subsubsection}{#1}
   \subsubsection*{#1}
 }