From 6fc6b33771dcc310a66db1b577203a8db6ff3388 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 3 Sep 2009 18:07:32 +0000 Subject: mwcls 0.72 (30aug09) git-svn-id: svn://tug.org/texlive/trunk@15030 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/mwcls/mw10.clo | 7 ++++- Master/texmf-dist/tex/latex/mwcls/mw11.clo | 7 ++++- Master/texmf-dist/tex/latex/mwcls/mw12.clo | 7 ++++- Master/texmf-dist/tex/latex/mwcls/mwart.cls | 40 ++++++++++++++++-------- Master/texmf-dist/tex/latex/mwcls/mwbk.cls | 46 +++++++++++++++++++--------- Master/texmf-dist/tex/latex/mwcls/mwbk10.clo | 7 ++++- Master/texmf-dist/tex/latex/mwcls/mwbk11.clo | 7 ++++- Master/texmf-dist/tex/latex/mwcls/mwbk12.clo | 7 ++++- Master/texmf-dist/tex/latex/mwcls/mwrep.cls | 46 +++++++++++++++++++--------- 9 files changed, 125 insertions(+), 49 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 f84fda56404..e2700cb87f7 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mw10.clo +++ b/Master/texmf-dist/tex/latex/mwcls/mw10.clo @@ -20,7 +20,7 @@ %% version 1999/12/01 or later. %% \ProvidesFile{mw10.clo} - [2003/05/09 v0.65 + [2009/08/30 v0.72 A document class size option (MW)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt @@ -138,6 +138,11 @@ \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 910156628fe..416d17f1cb5 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mw11.clo +++ b/Master/texmf-dist/tex/latex/mwcls/mw11.clo @@ -20,7 +20,7 @@ %% version 1999/12/01 or later. %% \ProvidesFile{mw11.clo} - [2003/05/09 v0.65 + [2009/08/30 v0.72 A document class size option (MW)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xipt{13.6}% @@ -138,6 +138,11 @@ \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 63026f0c908..93573b6f268 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mw12.clo +++ b/Master/texmf-dist/tex/latex/mwcls/mw12.clo @@ -20,7 +20,7 @@ %% version 1999/12/01 or later. %% \ProvidesFile{mw12.clo} - [2003/05/09 v0.65 + [2009/08/30 v0.72 A document class size option (MW)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xiipt{14.5}% @@ -138,6 +138,11 @@ \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 f5ccd9504e3..4c03519d0a8 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mwart.cls +++ b/Master/texmf-dist/tex/latex/mwcls/mwart.cls @@ -21,7 +21,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{mwart} - [2003/05/09 v0.65 + [2009/08/30 v0.72 A LaTeX document class (MW)] \typeout{*** Beta version. Formatting may change} \typeout{*** in future versions of this class.} @@ -167,7 +167,7 @@ \setlength\parindent{1.5em} \fi \newdimen\@parindent -%%\parindent32pt % wartość testowa. Wyrzucić! +%%\parindent32pt % wartość testowa. Wyrzucic! \@parindent\parindent \@lowpenalty 51 \@medpenalty 151 @@ -527,6 +527,14 @@ \def\mw@sectionx#1[#2]{% \@dblarg{\mw@sectionxx{#1}{#2}}} \def\mw@sectionxx#1#2[#3]#4{% + \if\mw@HeadingBreakBefore + \if@specialpage\else\thispagestyle{closing}\fi + \clearpage + \if\mw@HeadingBreakAfter + \thispagestyle{blank}\else + \thispagestyle{opening}\fi + \global\@topnum\z@ + \fi \edef\mw@HeadingLevel{\csname #1@level\endcsname \space}% space delimits level number! \ifHeadingNumbered @@ -534,7 +542,8 @@ \fi \ifHeadingNumbered \refstepcounter{#1}% - \protected@edef\HeadingNumber{\csname the#1\endcsname\relax}% + \protected@edef\HeadingNumber{\expandafter\noexpand +\csname the#1\endcsname\relax}% \else \let\HeadingNumber\@empty \fi @@ -542,14 +551,6 @@ \def\HeadingTOCText{#3}% \def\HeadingText{#4}% \def\mw@HeadingType{#1}% - \if\mw@HeadingBreakBefore - \if@specialpage\else\thispagestyle{closing}\fi - \clearpage - \if\mw@HeadingBreakAfter - \thispagestyle{blank}\else - \thispagestyle{opening}\fi - \global\@topnum\z@ - \fi %% \if\mw@HeadingRunIn \mw@runinheading @@ -568,6 +569,7 @@ \twocolumn \else \@topnewpage[\mw@normalheading]% + \mw@markandtoc \fi \else \mw@normalheading @@ -603,7 +605,11 @@ \csname \mw@HeadingType @head\endcsname \@@par \egroup - \mw@markandtoc + \ifnum0<% + \if@twocolumn0\else1\fi + \if\mw@HeadingWholeWidth0\else1\fi + \if\mw@HeadingBreakAfter1 \else0 \fi + \mw@markandtoc\fi \nobreak \vskip\csname\mw@HeadingType @postskip\endcsname \@afterheading @@ -999,7 +1005,7 @@ \ifnum#1>\previous@toc@level \nobreak \else\ifnum#1<\previous@toc@level - \addpenalty\@secpenalty % czy to dobra wartość? + \addpenalty\@secpenalty % czy to dobra wartosc? \fi\fi \gdef\previous@toc@level{#1}% \vskip #2\relax @@ -1150,6 +1156,14 @@ \else \onecolumn \fi +\AtBeginDocument{\@ifpackageloaded{natbib}{% +\renewcommand\bibsection{\section*{\refname}}% +}{}} +\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/mwbk.cls b/Master/texmf-dist/tex/latex/mwcls/mwbk.cls index ed3321f1fb3..15009a02852 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mwbk.cls +++ b/Master/texmf-dist/tex/latex/mwcls/mwbk.cls @@ -21,7 +21,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{mwbk} - [2003/05/09 v0.65 + [2009/08/30 v0.72 A LaTeX document class (MW)] \typeout{*** Beta version. Formatting may change} \typeout{*** in future versions of this class.} @@ -172,7 +172,7 @@ \setlength\parindent{1.5em} \fi \newdimen\@parindent -%%\parindent32pt % wartość testowa. Wyrzucić! +%%\parindent32pt % wartość testowa. Wyrzucic! \@parindent\parindent \@lowpenalty 51 \@medpenalty 151 @@ -572,6 +572,16 @@ \def\mw@sectionx#1[#2]{% \@dblarg{\mw@sectionxx{#1}{#2}}} \def\mw@sectionxx#1#2[#3]#4{% + \if\mw@HeadingBreakBefore + \if@specialpage\else\thispagestyle{closing}\fi + \if@openright\cleardoublepage\else + \clearpage + \fi + \if\mw@HeadingBreakAfter + \thispagestyle{blank}\else + \thispagestyle{opening}\fi + \global\@topnum\z@ + \fi \edef\mw@HeadingLevel{\csname #1@level\endcsname \space}% space delimits level number! \ifHeadingNumbered @@ -580,7 +590,8 @@ \fi \ifHeadingNumbered \refstepcounter{#1}% - \protected@edef\HeadingNumber{\csname the#1\endcsname\relax}% + \protected@edef\HeadingNumber{\expandafter\noexpand +\csname the#1\endcsname\relax}% \else \let\HeadingNumber\@empty \fi @@ -588,16 +599,6 @@ \def\HeadingTOCText{#3}% \def\HeadingText{#4}% \def\mw@HeadingType{#1}% - \if\mw@HeadingBreakBefore - \if@specialpage\else\thispagestyle{closing}\fi - \if@openright\cleardoublepage\else - \clearpage - \fi - \if\mw@HeadingBreakAfter - \thispagestyle{blank}\else - \thispagestyle{opening}\fi - \global\@topnum\z@ - \fi %% \if\mw@HeadingRunIn \mw@runinheading @@ -616,6 +617,7 @@ \twocolumn \else \@topnewpage[\mw@normalheading]% + \mw@markandtoc \fi \else \mw@normalheading @@ -651,7 +653,11 @@ \csname \mw@HeadingType @head\endcsname \@@par \egroup - \mw@markandtoc + \ifnum0<% + \if@twocolumn0\else1\fi + \if\mw@HeadingWholeWidth0\else1\fi + \if\mw@HeadingBreakAfter1 \else0 \fi + \mw@markandtoc\fi \nobreak \vskip\csname\mw@HeadingType @postskip\endcsname \@afterheading @@ -1043,7 +1049,7 @@ \ifnum#1>\previous@toc@level \nobreak \else\ifnum#1<\previous@toc@level - \addpenalty\@secpenalty % czy to dobra wartość? + \addpenalty\@secpenalty % czy to dobra wartosc? \fi\fi \gdef\previous@toc@level{#1}% \vskip #2\relax @@ -1165,6 +1171,7 @@ \columnsep 35\p@ \twocolumn \chapter*{\indexname}% + \@mkboth{\indexname}{\indexname}% \thispagestyle{opening}\parindent\z@ \parskip\z@ \@plus .3\p@\relax \let\item\@idxitem @@ -1207,6 +1214,15 @@ \else \onecolumn \fi +\AtBeginDocument{\@ifpackageloaded{natbib}{% +\renewcommand\bibsection{\chapter*{\bibname}% + \@mkboth{\bibname}{\bibname}}% +}{}} +\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/mwbk10.clo b/Master/texmf-dist/tex/latex/mwcls/mwbk10.clo index 297799933dc..0eb8fd3236e 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mwbk10.clo +++ b/Master/texmf-dist/tex/latex/mwcls/mwbk10.clo @@ -20,7 +20,7 @@ %% version 1999/12/01 or later. %% \ProvidesFile{mwbk10.clo} - [2003/05/09 v0.65 + [2009/08/30 v0.72 A document class size option (MW)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt @@ -138,6 +138,11 @@ \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 4e8d46461ad..b6de85d736f 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mwbk11.clo +++ b/Master/texmf-dist/tex/latex/mwcls/mwbk11.clo @@ -20,7 +20,7 @@ %% version 1999/12/01 or later. %% \ProvidesFile{mwbk11.clo} - [2003/05/09 v0.65 + [2009/08/30 v0.72 A document class size option (MW)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xipt{13.6}% @@ -138,6 +138,11 @@ \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 feb0939f393..49e5f4edb2f 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mwbk12.clo +++ b/Master/texmf-dist/tex/latex/mwcls/mwbk12.clo @@ -20,7 +20,7 @@ %% version 1999/12/01 or later. %% \ProvidesFile{mwbk12.clo} - [2003/05/09 v0.65 + [2009/08/30 v0.72 A document class size option (MW)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xiipt{14.5}% @@ -138,6 +138,11 @@ \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 e2cf06c752a..68bfa20d5c6 100644 --- a/Master/texmf-dist/tex/latex/mwcls/mwrep.cls +++ b/Master/texmf-dist/tex/latex/mwcls/mwrep.cls @@ -21,7 +21,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{mwrep} - [2003/05/09 v0.65 + [2009/08/30 v0.72 A LaTeX document class (MW)] \typeout{*** Beta version. Formatting may change} \typeout{*** in future versions of this class.} @@ -170,7 +170,7 @@ \setlength\parindent{1.5em} \fi \newdimen\@parindent -%%\parindent32pt % wartość testowa. Wyrzucić! +%%\parindent32pt % wartość testowa. Wyrzucic! \@parindent\parindent \@lowpenalty 51 \@medpenalty 151 @@ -543,6 +543,16 @@ \def\mw@sectionx#1[#2]{% \@dblarg{\mw@sectionxx{#1}{#2}}} \def\mw@sectionxx#1#2[#3]#4{% + \if\mw@HeadingBreakBefore + \if@specialpage\else\thispagestyle{closing}\fi + \if@openright\cleardoublepage\else + \clearpage + \fi + \if\mw@HeadingBreakAfter + \thispagestyle{blank}\else + \thispagestyle{opening}\fi + \global\@topnum\z@ + \fi \edef\mw@HeadingLevel{\csname #1@level\endcsname \space}% space delimits level number! \ifHeadingNumbered @@ -550,7 +560,8 @@ \fi \ifHeadingNumbered \refstepcounter{#1}% - \protected@edef\HeadingNumber{\csname the#1\endcsname\relax}% + \protected@edef\HeadingNumber{\expandafter\noexpand +\csname the#1\endcsname\relax}% \else \let\HeadingNumber\@empty \fi @@ -558,16 +569,6 @@ \def\HeadingTOCText{#3}% \def\HeadingText{#4}% \def\mw@HeadingType{#1}% - \if\mw@HeadingBreakBefore - \if@specialpage\else\thispagestyle{closing}\fi - \if@openright\cleardoublepage\else - \clearpage - \fi - \if\mw@HeadingBreakAfter - \thispagestyle{blank}\else - \thispagestyle{opening}\fi - \global\@topnum\z@ - \fi %% \if\mw@HeadingRunIn \mw@runinheading @@ -586,6 +587,7 @@ \twocolumn \else \@topnewpage[\mw@normalheading]% + \mw@markandtoc \fi \else \mw@normalheading @@ -621,7 +623,11 @@ \csname \mw@HeadingType @head\endcsname \@@par \egroup - \mw@markandtoc + \ifnum0<% + \if@twocolumn0\else1\fi + \if\mw@HeadingWholeWidth0\else1\fi + \if\mw@HeadingBreakAfter1 \else0 \fi + \mw@markandtoc\fi \nobreak \vskip\csname\mw@HeadingType @postskip\endcsname \@afterheading @@ -1034,7 +1040,7 @@ \ifnum#1>\previous@toc@level \nobreak \else\ifnum#1<\previous@toc@level - \addpenalty\@secpenalty % czy to dobra wartość? + \addpenalty\@secpenalty % czy to dobra wartosc? \fi\fi \gdef\previous@toc@level{#1}% \vskip #2\relax @@ -1156,6 +1162,7 @@ \columnsep 35\p@ \twocolumn \chapter*{\indexname}% + \@mkboth{\indexname}{\indexname}% \thispagestyle{opening}\parindent\z@ \parskip\z@ \@plus .3\p@\relax \let\item\@idxitem @@ -1199,6 +1206,15 @@ \else \onecolumn \fi +\AtBeginDocument{\@ifpackageloaded{natbib}{% +\renewcommand\bibsection{\chapter*{\bibname}% + \@mkboth{\bibname}{\bibname}}% +}{}} +\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 -- cgit v1.2.3