From 615d7d2e594eeede6ea0ab38f8817012eb239bb9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 28 Sep 2009 22:25:13 +0000 Subject: mwcls update (28sep09) git-svn-id: svn://tug.org/texlive/trunk@15536 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/mwcls/mw10.clo | 9 +---- Master/texmf-dist/tex/latex/mwcls/mw11.clo | 9 +---- Master/texmf-dist/tex/latex/mwcls/mw12.clo | 9 +---- Master/texmf-dist/tex/latex/mwcls/mwart.cls | 55 ++++++++++++++++------------ Master/texmf-dist/tex/latex/mwcls/mwbk.cls | 55 ++++++++++++++++------------ Master/texmf-dist/tex/latex/mwcls/mwbk10.clo | 9 +---- Master/texmf-dist/tex/latex/mwcls/mwbk11.clo | 9 +---- Master/texmf-dist/tex/latex/mwcls/mwbk12.clo | 9 +---- Master/texmf-dist/tex/latex/mwcls/mwrep.cls | 55 ++++++++++++++++------------ 9 files changed, 108 insertions(+), 111 deletions(-) (limited to 'Master/texmf-dist/tex/latex/mwcls') diff --git a/Master/texmf-dist/tex/latex/mwcls/mw10.clo b/Master/texmf-dist/tex/latex/mwcls/mw10.clo index e2700cb87f7..c58ef5e38b5 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mw10.clo +++ b/Master/texmf-dist/tex/latex/mwcls/mw10.clo @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright 2000-2002 by Marcin Woli\'nski +%% Copyright 2000-2009 by Marcin Woli\'nski %% %% %% This work may be distributed and/or modified under the @@ -20,7 +20,7 @@ %% version 1999/12/01 or later. %% \ProvidesFile{mw10.clo} - [2009/08/30 v0.72 + [2009/09/27 v0.74 A document class size option (MW)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt @@ -138,11 +138,6 @@ \setlength\@dblfptop{0\p@ \@plus 1fil} \setlength\@dblfpsep{8\p@ \@plus 2fil} \setlength\@dblfpbot{0\p@ \@plus 1fil} -\def\@doendpe{\@endpetrue - \clubpenalty\@clubpenalty - \def\par{\@restorepar\everypar{}\par\@endpefalse}% - \everypar{{\setbox\z@\lastbox}\everypar{}\@endpefalse}% -} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/latex/mwcls/mw11.clo b/Master/texmf-dist/tex/latex/mwcls/mw11.clo index 416d17f1cb5..302d9e98d8a 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mw11.clo +++ b/Master/texmf-dist/tex/latex/mwcls/mw11.clo @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright 2000-2002 by Marcin Woli\'nski +%% Copyright 2000-2009 by Marcin Woli\'nski %% %% %% This work may be distributed and/or modified under the @@ -20,7 +20,7 @@ %% version 1999/12/01 or later. %% \ProvidesFile{mw11.clo} - [2009/08/30 v0.72 + [2009/09/27 v0.74 A document class size option (MW)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xipt{13.6}% @@ -138,11 +138,6 @@ \setlength\@dblfptop{0\p@ \@plus 1fil} \setlength\@dblfpsep{8\p@ \@plus 2fil} \setlength\@dblfpbot{0\p@ \@plus 1fil} -\def\@doendpe{\@endpetrue - \clubpenalty\@clubpenalty - \def\par{\@restorepar\everypar{}\par\@endpefalse}% - \everypar{{\setbox\z@\lastbox}\everypar{}\@endpefalse}% -} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/latex/mwcls/mw12.clo b/Master/texmf-dist/tex/latex/mwcls/mw12.clo index 93573b6f268..5b561f97e2d 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mw12.clo +++ b/Master/texmf-dist/tex/latex/mwcls/mw12.clo @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright 2000-2002 by Marcin Woli\'nski +%% Copyright 2000-2009 by Marcin Woli\'nski %% %% %% This work may be distributed and/or modified under the @@ -20,7 +20,7 @@ %% version 1999/12/01 or later. %% \ProvidesFile{mw12.clo} - [2009/08/30 v0.72 + [2009/09/27 v0.74 A document class size option (MW)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xiipt{14.5}% @@ -138,11 +138,6 @@ \setlength\@dblfptop{0\p@ \@plus 1fil} \setlength\@dblfpsep{10\p@ \@plus 2fil} \setlength\@dblfpbot{0\p@ \@plus 1fil} -\def\@doendpe{\@endpetrue - \clubpenalty\@clubpenalty - \def\par{\@restorepar\everypar{}\par\@endpefalse}% - \everypar{{\setbox\z@\lastbox}\everypar{}\@endpefalse}% -} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/latex/mwcls/mwart.cls b/Master/texmf-dist/tex/latex/mwcls/mwart.cls index 4c03519d0a8..09cb75dc3ce 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mwart.cls +++ b/Master/texmf-dist/tex/latex/mwcls/mwart.cls @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright 2000-2002 by Marcin Woli\'nski +%% Copyright 2000-2009 by Marcin Woli\'nski %% %% %% This work may be distributed and/or modified under the @@ -21,7 +21,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{mwart} - [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.} @@ -110,24 +110,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} @@ -328,7 +328,7 @@ \let \footnote \thanks \null\vfill \begin{center}% - \titlesetup + \titlesettings {\large \if@authorfirst\else {\LARGE \@title \par}% @@ -398,7 +398,7 @@ \vskip 2\baselineskip \begin{center}% \let \footnote \thanks - \titlesetup\large + \titlesettings\large \if@authorfirst\else {\LARGE \@title \par}% \vskip\baselineskip \fi @@ -432,7 +432,7 @@ \@tempskipa #5\relax \ifdim \@tempskipa>\z@ \begingroup - \normalfont\sectsetup#6{% + \normalfont\sectsettings#6{% \language\l@nohyphenation \raggedright \interlinepenalty \@M \leftskip #3\noindent @@ -447,7 +447,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}{% @@ -461,14 +461,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{}{}} @@ -545,6 +545,7 @@ \protected@edef\HeadingNumber{\expandafter\noexpand \csname the#1\endcsname\relax}% \else + \mw@hyperref@phantom{#1}% \let\HeadingNumber\@empty \fi \def\HeadingRHeadText{#2}% @@ -601,7 +602,7 @@ \bgroup\language\l@nohyphenation \raggedright \interlinepenalty\@M - \normalfont\sectsetup + \normalfont\sectsettings \csname \mw@HeadingType @head\endcsname \@@par \egroup @@ -624,7 +625,7 @@ {\setbox\z@\lastbox}% \clubpenalty\@M \bgroup\language\l@nohyphenation - \normalfont\sectsetup + \normalfont\sectsettings \csname \mw@HeadingType @head\endcsname \egroup \mw@markandtoc @@ -922,7 +923,7 @@ \reset@font \normalsize \@setminipage - \csname\@captype setup\endcsname + \csname\@captype settings\endcsname } \newcounter{figure} \renewcommand \thefigure {\@arabic\c@figure} @@ -968,7 +969,7 @@ \if@minipage \@setminipage \fi - \captionsetup + \captionsettings \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par \endgroup} \long\def\@makecaption#1#2{% @@ -1159,6 +1160,14 @@ \AtBeginDocument{\@ifpackageloaded{natbib}{% \renewcommand\bibsection{\section*{\refname}}% }{}} +\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}% 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 +%% Copyright 2000-2009 by Marcin Woli\'nski %% %% %% 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}% diff --git a/Master/texmf-dist/tex/latex/mwcls/mwbk10.clo b/Master/texmf-dist/tex/latex/mwcls/mwbk10.clo index 0eb8fd3236e..251fe13c9ef 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mwbk10.clo +++ b/Master/texmf-dist/tex/latex/mwcls/mwbk10.clo @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright 2000-2002 by Marcin Woli\'nski +%% Copyright 2000-2009 by Marcin Woli\'nski %% %% %% This work may be distributed and/or modified under the @@ -20,7 +20,7 @@ %% version 1999/12/01 or later. %% \ProvidesFile{mwbk10.clo} - [2009/08/30 v0.72 + [2009/09/27 v0.74 A document class size option (MW)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt @@ -138,11 +138,6 @@ \setlength\@dblfptop{0\p@ \@plus 1fil} \setlength\@dblfpsep{8\p@ \@plus 2fil} \setlength\@dblfpbot{0\p@ \@plus 1fil} -\def\@doendpe{\@endpetrue - \clubpenalty\@clubpenalty - \def\par{\@restorepar\everypar{}\par\@endpefalse}% - \everypar{{\setbox\z@\lastbox}\everypar{}\@endpefalse}% -} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/latex/mwcls/mwbk11.clo b/Master/texmf-dist/tex/latex/mwcls/mwbk11.clo index b6de85d736f..c636fb7e2a4 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mwbk11.clo +++ b/Master/texmf-dist/tex/latex/mwcls/mwbk11.clo @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright 2000-2002 by Marcin Woli\'nski +%% Copyright 2000-2009 by Marcin Woli\'nski %% %% %% This work may be distributed and/or modified under the @@ -20,7 +20,7 @@ %% version 1999/12/01 or later. %% \ProvidesFile{mwbk11.clo} - [2009/08/30 v0.72 + [2009/09/27 v0.74 A document class size option (MW)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xipt{13.6}% @@ -138,11 +138,6 @@ \setlength\@dblfptop{0\p@ \@plus 1fil} \setlength\@dblfpsep{8\p@ \@plus 2fil} \setlength\@dblfpbot{0\p@ \@plus 1fil} -\def\@doendpe{\@endpetrue - \clubpenalty\@clubpenalty - \def\par{\@restorepar\everypar{}\par\@endpefalse}% - \everypar{{\setbox\z@\lastbox}\everypar{}\@endpefalse}% -} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/latex/mwcls/mwbk12.clo b/Master/texmf-dist/tex/latex/mwcls/mwbk12.clo index 49e5f4edb2f..fa9b3cc708a 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mwbk12.clo +++ b/Master/texmf-dist/tex/latex/mwcls/mwbk12.clo @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright 2000-2002 by Marcin Woli\'nski +%% Copyright 2000-2009 by Marcin Woli\'nski %% %% %% This work may be distributed and/or modified under the @@ -20,7 +20,7 @@ %% version 1999/12/01 or later. %% \ProvidesFile{mwbk12.clo} - [2009/08/30 v0.72 + [2009/09/27 v0.74 A document class size option (MW)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xiipt{14.5}% @@ -138,11 +138,6 @@ \setlength\@dblfptop{0\p@ \@plus 1fil} \setlength\@dblfpsep{10\p@ \@plus 2fil} \setlength\@dblfpbot{0\p@ \@plus 1fil} -\def\@doendpe{\@endpetrue - \clubpenalty\@clubpenalty - \def\par{\@restorepar\everypar{}\par\@endpefalse}% - \everypar{{\setbox\z@\lastbox}\everypar{}\@endpefalse}% -} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff --git a/Master/texmf-dist/tex/latex/mwcls/mwrep.cls b/Master/texmf-dist/tex/latex/mwcls/mwrep.cls index 68bfa20d5c6..218eb7cb8eb 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mwrep.cls +++ b/Master/texmf-dist/tex/latex/mwcls/mwrep.cls @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright 2000-2002 by Marcin Woli\'nski +%% Copyright 2000-2009 by Marcin Woli\'nski %% %% %% This work may be distributed and/or modified under the @@ -21,7 +21,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{mwrep} - [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.} @@ -113,24 +113,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} @@ -339,7 +339,7 @@ \let \footnote \thanks \null\vfill \begin{center}% - \titlesetup + \titlesettings {\large \if@authorfirst\else {\LARGE \@title \par}% @@ -409,7 +409,7 @@ \vskip 2\baselineskip \begin{center}% \let \footnote \thanks - \titlesetup\large + \titlesettings\large \if@authorfirst\else {\LARGE \@title \par}% \vskip\baselineskip \fi @@ -443,7 +443,7 @@ \@tempskipa #5\relax \ifdim \@tempskipa>\z@ \begingroup - \normalfont\sectsetup#6{% + \normalfont\sectsettings#6{% \language\l@nohyphenation \raggedright \interlinepenalty \@M \leftskip #3\noindent @@ -458,7 +458,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}{% @@ -472,14 +472,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{}{}} @@ -563,6 +563,7 @@ \protected@edef\HeadingNumber{\expandafter\noexpand \csname the#1\endcsname\relax}% \else + \mw@hyperref@phantom{#1}% \let\HeadingNumber\@empty \fi \def\HeadingRHeadText{#2}% @@ -619,7 +620,7 @@ \bgroup\language\l@nohyphenation \raggedright \interlinepenalty\@M - \normalfont\sectsetup + \normalfont\sectsettings \csname \mw@HeadingType @head\endcsname \@@par \egroup @@ -642,7 +643,7 @@ {\setbox\z@\lastbox}% \clubpenalty\@M \bgroup\language\l@nohyphenation - \normalfont\sectsetup + \normalfont\sectsettings \csname \mw@HeadingType @head\endcsname \egroup \mw@markandtoc @@ -949,7 +950,7 @@ \reset@font \normalsize \@setminipage - \csname\@captype setup\endcsname + \csname\@captype settings\endcsname } \newcounter{figure}[chapter] \renewcommand \thefigure @@ -997,7 +998,7 @@ \if@minipage \@setminipage \fi - \captionsetup + \captionsettings \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par \endgroup} \long\def\@makecaption#1#2{% @@ -1210,6 +1211,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}% -- cgit v1.2.3