mwcls update (28sep09)

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

2 files changed, 44 insertions, 27 deletions

diff --git a/Master/texmf-dist/source/latex/mwcls/mwcls.dtx b/Master/texmf-dist/source/latex/mwcls/mwcls.dtx
index 50257f0fae1..9e45e931167 100644
--- a/Master/texmf-dist/source/latex/mwcls/mwcls.dtx
+++ b/Master/texmf-dist/source/latex/mwcls/mwcls.dtx
@@ -12,7 +12,7 @@
 % version 1999/12/01 or later.
 % 
 % \fi
-% \CheckSum{3707}
+% \CheckSum{3725}
 %
 % \iffalse
 % \section{Identification}
@@ -38,7 +38,7 @@
 %<*driver>
 \ProvidesFile{mwcls.drv}
 %</driver>
-              [2009/08/30 v0.72
+              [2009/09/27 v0.74
 %<article|report|book> A LaTeX document class (MW)]
 %<10pt|11pt|12pt>      A document class size option (MW)]
 %<article|report|book>\typeout{*** Beta version.  Formatting may change}
@@ -448,30 +448,32 @@
 % \subsection*{Krój pisma tytulariów}
 %    Następne opcje służą do wyboru kroju (rodziny fontów), którym
 %    składane będą nagłówki rozdziałów.
+%    \changes{0.74}{2009/09/27}{Zmiana nazw poleceń \cs{...setup} na
+%    \cs{...settings} dla kompatydebilności z caption.sty}
 %    \begin{macrocode}
-\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}%
   }
 %    \end{macrocode}
 %
 % \subsection*{Stopień pisma w~środowiskach przemieszczalnych}
 %    
 %    \begin{macrocode}
-\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}%
   }
 %    \end{macrocode}
 %
@@ -1812,7 +1814,7 @@
 %    \cs{if@authorfirst}.
 %    \begin{macrocode}
   \begin{center}%
-  \titlesetup
+  \titlesettings
   {\large
     \if@authorfirst\else
     {\LARGE \@title \par}%
@@ -1937,7 +1939,7 @@
   \vskip 2\baselineskip
   \begin{center}%
   \let \footnote \thanks
-    \titlesetup\large
+    \titlesettings\large
     \if@authorfirst\else
     {\LARGE \@title \par}%
     \vskip\baselineskip \fi
@@ -1989,7 +1991,7 @@
   \@tempskipa #5\relax
   \ifdim \@tempskipa>\z@
     \begingroup
-      \normalfont\sectsetup#6{%
+      \normalfont\sectsettings#6{%
         \language\l@nohyphenation \raggedright
         \interlinepenalty \@M 
         \leftskip #3\noindent
@@ -2004,7 +2006,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}{%
@@ -2024,14 +2026,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}}
 %    \end{macrocode}
@@ -2304,7 +2306,7 @@
 %  \end{macro}
 %
 %  \begin{macro}{\mw@section}
-%    Argument: nazwa
+%    Argument: nazwa poziomu podziału
 %    \begin{macrocode}
 \newcommand*\mw@section[1]{%
   \mw@getflags{#1}%
@@ -2368,6 +2370,7 @@
     \protected@edef\HeadingNumber{\expandafter\noexpand
 	\csname the#1\endcsname\relax}%
   \else
+    \mw@hyperref@phantom{#1}%
     \let\HeadingNumber\@empty
   \fi
   \def\HeadingRHeadText{#2}%
@@ -2453,7 +2456,7 @@
   \bgroup\language\l@nohyphenation
    \raggedright
    \interlinepenalty\@M
-   \normalfont\sectsetup
+   \normalfont\sectsettings
    \csname \mw@HeadingType @head\endcsname
    \@@par
   \egroup
@@ -2493,7 +2496,7 @@
        {\setbox\z@\lastbox}%
         \clubpenalty\@M
         \bgroup\language\l@nohyphenation
-           \normalfont\sectsetup
+           \normalfont\sectsettings
            \csname \mw@HeadingType @head\endcsname
         \egroup
         \mw@markandtoc
@@ -3451,7 +3454,7 @@
   \reset@font
   \normalsize
   \@setminipage
-  \csname\@captype setup\endcsname
+  \csname\@captype settings\endcsname
 }
 %    \end{macrocode}
 %  \end{macro}
@@ -3615,7 +3618,7 @@
     \if@minipage
       \@setminipage
     \fi
-    \captionsetup
+    \captionsettings
     \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
   \endgroup}
 %    \end{macrocode}
@@ -4404,9 +4407,23 @@
 %<report|book>\renewcommand\bibsection{\chapter*{\bibname}%
 %<report|book>  \@mkboth{\bibname}{\bibname}}%
 }{}}
-%</article|report|book>
 %    \end{macrocode}
 %
+%\subsection{hyperref}
+%
+%    Przeciwkorby dla kompatybilności z~hyperrefem.  Na razie dbamy
+%    o~odsyłacze do nienumerowanych poleceń podziału, ale znając
+%    hyperref, coś pewnie jeszcze wyskoczy.
+%    \begin{macrocode}
+\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}%
+    }%
+}{}}
+%    \end{macrocode}
 %
 % \subsection{\cs{clubpenalty}}
 % \changes{0.70}{2009/03/07}{przeciwkorba dla \cs{clubpenalty}}
@@ -4424,6 +4441,7 @@
   \def\par{\@restorepar\everypar{}\par\@endpefalse}%
   \everypar{{\setbox\z@\lastbox}\everypar{}\@endpefalse}%
 }
+%</article|report|book>
 %    \end{macrocode}
 % \Finale
 %
@@ -4443,4 +4461,3 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \endinput
-
diff --git a/Master/texmf-dist/source/latex/mwcls/mwcls.ins b/Master/texmf-dist/source/latex/mwcls/mwcls.ins
index 5215ab801af..22e2740a7ab 100644
--- a/Master/texmf-dist/source/latex/mwcls/mwcls.ins
+++ b/Master/texmf-dist/source/latex/mwcls/mwcls.ins
@@ -15,7 +15,7 @@
 
 This is a generated file.
 
-Copyright 2000-2002 by Marcin Woli\string\'nski <wolinski@gust.org.pl>
+Copyright 2000-2009 by Marcin Woli\string\'nski <wolinski@gust.org.pl>
 
 
 This work may be distributed and/or modified under the