mwcls update (28sep09)

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

1 files changed, 32 insertions, 23 deletions

diff --git a/Master/texmf-dist/tex/latex/mwcls/mwbk.cls b/Master/texmf-dist/tex/latex/mwcls/mwbk.cls
index 15009a02852..2bb0db32ed6 100644
--- a/Master/texmf-dist/tex/latex/mwcls/mwbk.cls
+++ b/Master/texmf-dist/tex/latex/mwcls/mwbk.cls
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 2000-2002 by Marcin Woli\'nski <wolinski@gust.org.pl>
+%% Copyright 2000-2009 by Marcin Woli\'nski <wolinski@gust.org.pl>
 %% 
 %% 
 %% This work may be distributed and/or modified under the
@@ -21,7 +21,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{mwbk}
-              [2009/08/30 v0.72
+              [2009/09/27 v0.74
  A LaTeX document class (MW)]
 \typeout{*** Beta version.  Formatting may change}
 \typeout{*** in future versions of this class.}
@@ -115,24 +115,24 @@
       }%
    \renewcommand\newblock{\par}}%
 }
-\newcommand*\sectsetup{\bfseries}
-\newcommand*\titlesetup{}
+\newcommand*\sectsettings{\bfseries}
+\newcommand*\titlesettings{}
 \DeclareOption{rmheadings}{%
-  \def\sectsetup{\rmfamily\bfseries}%
-  \def\titlesetup{\rmfamily}%
+  \def\sectsettings{\rmfamily\bfseries}%
+  \def\titlesettings{\rmfamily}%
   }
 \DeclareOption{sfheadings}{%
-  \def\sectsetup{\sffamily\bfseries}%
-  \def\titlesetup{\sffamily}%
+  \def\sectsettings{\sffamily\bfseries}%
+  \def\titlesettings{\sffamily}%
   }
-\newcommand*\captionsetup{\small}
+\newcommand*\captionsettings{\small}
 \DeclareOption{floatssmall}{%
-  \def\figuresetup{\small}%
-  \def\tablesetup{\small}%
+  \def\figuresettings{\small}%
+  \def\tablesettings{\small}%
   }
 \DeclareOption{floatsnormalsize}{%
-  \def\figuresetup{\normalsize}%
-  \def\tablesetup{\normalsize}%
+  \def\figuresettings{\normalsize}%
+  \def\tablesettings{\normalsize}%
   }
 \newif\if@authorfirst
 \DeclareOption{authortitle}{\@authorfirsttrue}
@@ -353,7 +353,7 @@
   \let \footnote \thanks
   \null\vfill
   \begin{center}%
-  \titlesetup
+  \titlesettings
   {\large
     \if@authorfirst\else
     {\LARGE \@title \par}%
@@ -423,7 +423,7 @@
   \vskip 2\baselineskip
   \begin{center}%
   \let \footnote \thanks
-    \titlesetup\large
+    \titlesettings\large
     \if@authorfirst\else
     {\LARGE \@title \par}%
     \vskip\baselineskip \fi
@@ -457,7 +457,7 @@
   \@tempskipa #5\relax
   \ifdim \@tempskipa>\z@
     \begingroup
-      \normalfont\sectsetup#6{%
+      \normalfont\sectsettings#6{%
         \language\l@nohyphenation \raggedright
         \interlinepenalty \@M
         \leftskip #3\noindent
@@ -472,7 +472,7 @@
       #8}%
   \else
     \def\@svsechd{%
-      \normalfont\sectsetup#6{\hskip #3\relax
+      \normalfont\sectsettings#6{\hskip #3\relax
       \@svsec\ignorespaces #8}%
       \csname #1mark\endcsname{#7}%
       \addcontentsline{toc}{#1}{%
@@ -486,14 +486,14 @@
   \@tempskipa #3\relax
   \ifdim \@tempskipa>\z@
     \begingroup
-      \normalfont\sectsetup#4{%
+      \normalfont\sectsettings#4{%
         \language\l@nohyphenation \raggedright
         \interlinepenalty \@M
         \leftskip #1\noindent\ignorespaces
         #5\@@par}%
     \endgroup
   \else
-    \def\@svsechd{\normalfont\sectsetup#4{\hskip #1\relax #5}}%
+    \def\@svsechd{\normalfont\sectsettings#4{\hskip #1\relax #5}}%
   \fi
   \@xsect{#3}}
 \newcommand*\partmark[1]{\markboth{}{}}
@@ -593,6 +593,7 @@
     \protected@edef\HeadingNumber{\expandafter\noexpand
 \csname the#1\endcsname\relax}%
   \else
+    \mw@hyperref@phantom{#1}%
     \let\HeadingNumber\@empty
   \fi
   \def\HeadingRHeadText{#2}%
@@ -649,7 +650,7 @@
   \bgroup\language\l@nohyphenation
    \raggedright
    \interlinepenalty\@M
-   \normalfont\sectsetup
+   \normalfont\sectsettings
    \csname \mw@HeadingType @head\endcsname
    \@@par
   \egroup
@@ -672,7 +673,7 @@
        {\setbox\z@\lastbox}%
         \clubpenalty\@M
         \bgroup\language\l@nohyphenation
-           \normalfont\sectsetup
+           \normalfont\sectsettings
            \csname \mw@HeadingType @head\endcsname
         \egroup
         \mw@markandtoc
@@ -958,7 +959,7 @@
   \reset@font
   \normalsize
   \@setminipage
-  \csname\@captype setup\endcsname
+  \csname\@captype settings\endcsname
 }
 \newcounter{figure}[chapter]
 \renewcommand \thefigure
@@ -1006,7 +1007,7 @@
     \if@minipage
       \@setminipage
     \fi
-    \captionsetup
+    \captionsettings
     \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
   \endgroup}
 \long\def\@makecaption#1#2{%
@@ -1218,6 +1219,14 @@
 \renewcommand\bibsection{\chapter*{\bibname}%
   \@mkboth{\bibname}{\bibname}}%
 }{}}
+\let\mw@hyperref@phantom\@gobble
+\AtBeginDocument{\@ifpackageloaded{hyperref}{%
+    \def\mw@hyperref@phantom#1{%
+      \Hy@GlobalStepCount\Hy@linkcounter
+      \xdef\@currentHref{#1*.\the\Hy@linkcounter}%
+      \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
+    }%
+}{}}
 \def\@doendpe{\@endpetrue
   \clubpenalty\@clubpenalty
   \def\par{\@restorepar\everypar{}\par\@endpefalse}%