summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-05-14 22:41:11 +0000
committerKarl Berry <karl@freefriends.org>2017-05-14 22:41:11 +0000
commite8a3bbca0649c257c934e198600a4547ca453b1d (patch)
tree7ef502f4fe58f30a5b867dfc7583d0b4f5be3d5f
parente0c5d6d38a1f285f20a66692e46d2e607d6ff1dd (diff)
mwcls (14may17)
git-svn-id: svn://tug.org/texlive/trunk@44352 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/mwcls/CZYTAJ29
-rw-r--r--Master/texmf-dist/doc/latex/mwcls/ChangeLog15
-rw-r--r--Master/texmf-dist/doc/latex/mwcls/README3
-rw-r--r--Master/texmf-dist/doc/latex/mwcls/mwclsdoc.pdfbin143495 -> 155674 bytes
-rw-r--r--Master/texmf-dist/source/latex/mwcls/mwcls.dtx94
-rw-r--r--Master/texmf-dist/source/latex/mwcls/mwcls.ins3
-rw-r--r--Master/texmf-dist/tex/latex/mwcls/mw10.clo5
-rw-r--r--Master/texmf-dist/tex/latex/mwcls/mw11.clo5
-rw-r--r--Master/texmf-dist/tex/latex/mwcls/mw12.clo5
-rw-r--r--Master/texmf-dist/tex/latex/mwcls/mwart.cls74
-rw-r--r--Master/texmf-dist/tex/latex/mwcls/mwbk.cls74
-rw-r--r--Master/texmf-dist/tex/latex/mwcls/mwbk10.clo5
-rw-r--r--Master/texmf-dist/tex/latex/mwcls/mwbk11.clo5
-rw-r--r--Master/texmf-dist/tex/latex/mwcls/mwbk12.clo5
-rw-r--r--Master/texmf-dist/tex/latex/mwcls/mwrep.cls74
15 files changed, 321 insertions, 75 deletions
diff --git a/Master/texmf-dist/doc/latex/mwcls/CZYTAJ b/Master/texmf-dist/doc/latex/mwcls/CZYTAJ
index d7fd3360ff6..4185397916e 100644
--- a/Master/texmf-dist/doc/latex/mwcls/CZYTAJ
+++ b/Master/texmf-dist/doc/latex/mwcls/CZYTAJ
@@ -1,34 +1,35 @@
------------------------------------------------------------------------
-Moje Własne KLaSy dokumentów dla LaTeXa 2e
+Moje WĹ‚asne KLaSy dokumentĂłw dla LaTeXa 2e
==========================================
-Copyright 2000-2009 by Marcin Woli\'nski <wolinski@gust.org.pl>
+Copyright © 2000-2003, 2008-2009, 2017 by Marcin Woliński
+<wolinski@gust.org.pl>
-Pliki w tej paczce mog± być dystrybuowane i/lub modyfikowane na
-zasadach okre¶lonych w LaTeX Project Public License, wersja 1.2
-lub (wedle preferencji Użytkownika) dowolna póĽniejsza.
-Bież±ca wersja tej licencji jest dostępna pod adresem
+Pliki w tej paczce mogą być dystrybuowane i/lub modyfikowane na
+zasadach określonych w LaTeX Project Public License, wersja 1.2
+lub (wedle preferencji Użytkownika) dowolna późniejsza.
+Bieżąca wersja tej licencji jest dostępna pod adresem
http://www.latex-project.org/lppl.txt
-natomiast wersja 1.2 lub jaka¶ póĽniejsza jest czę¶ci± dystrybucji
-LaTeXa w wersji 1999/12/01 i wszystkich póĽniejszych.
+natomiast wersja 1.2 lub jakaś późniejsza jest częścią dystrybucji
+LaTeXa w wersji 1999/12/01 i wszystkich późniejszych.
-Aby zainstalować moje klasy należy wykonać polecenie
+Aby zainstalować moje klasy należy wykonać polecenie
latex mwcls.ins
-a następnie przenie¶ć wygenerowane pliki (mwart.cls, mwrep.cls,
+a następnie przenieść wygenerowane pliki (mwart.cls, mwrep.cls,
mwbk.cls, mw10.clo, mw11.clo, mw12.clo, mwbk10.clo, mwbk11.clo,
-mwbk12.clo) do jakiego¶ katalogu przeszukiwanego przez TeXa (w typowej
+mwbk12.clo) do jakiegoĹ› katalogu przeszukiwanego przez TeXa (w typowej
instalacji np. ${TEXMF}/tex/latex/mwcls/, gdzie ${TEXMF} jest
-korzeniem drzewa zawieraj±cego pliki TeXowe). W typowych instalacjach
-trzeba też uaktualnić bazę danych o dostępnych plikach (zwykle
+korzeniem drzewa zawierajÄ…cego pliki TeXowe). W typowych instalacjach
+trzeba też uaktualnić bazę danych o dostępnych plikach (zwykle
polecenie texhash).
-Dokumentacja znajduje się w pliku mwclsdoc.pdf.
+Dokumentacja znajduje siÄ™ w pliku mwclsdoc.pdf.
------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/mwcls/ChangeLog b/Master/texmf-dist/doc/latex/mwcls/ChangeLog
index b35bbdae69e..c46b920cdc0 100644
--- a/Master/texmf-dist/doc/latex/mwcls/ChangeLog
+++ b/Master/texmf-dist/doc/latex/mwcls/ChangeLog
@@ -1,3 +1,18 @@
+2017-05-13 Marcin Woliński <marcin@no-body>
+
+ * mwcls.dtx: Summary: Ulepszona współpraca z hyperref
+
+ -- linki ze spisu tre¶ci nie trafiały, je¶li podpunkt zaczynał się na
+ górze strony
+ -- hyperref nadpisywał ustawienia podpisów tabel i rysunków
+
+2009-09-27 Marcin Woliński <marcin@no-body>
+
+ * mwcls.dtx:
+ Nazwy poleceń \sectsetup, \titlesetup, \captionsetup, \figuresetup,
+ \tablesetup zostały zmienione na \...settings, żeby się nie gryzło z
+ caption.sty.
+
2009-09-27 marcin@encek <marcin@encek>
* mwcls.dtx:
diff --git a/Master/texmf-dist/doc/latex/mwcls/README b/Master/texmf-dist/doc/latex/mwcls/README
index 984e4524612..749943bbee3 100644
--- a/Master/texmf-dist/doc/latex/mwcls/README
+++ b/Master/texmf-dist/doc/latex/mwcls/README
@@ -3,7 +3,8 @@
My oWn document CLaSses for LaTeX 2e
====================================
-Copyright 2000-2009 by Marcin Woli\'nski <wolinski@gust.org.pl>
+Copyright © 2000-2003, 2008-2009, 2017 by Marcin Woliński
+<wolinski@gust.org.pl>
Files in this bundle may be distributed and/or modified under the
diff --git a/Master/texmf-dist/doc/latex/mwcls/mwclsdoc.pdf b/Master/texmf-dist/doc/latex/mwcls/mwclsdoc.pdf
index 27fff872981..c0d3cc62a35 100644
--- a/Master/texmf-dist/doc/latex/mwcls/mwclsdoc.pdf
+++ b/Master/texmf-dist/doc/latex/mwcls/mwclsdoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/mwcls/mwcls.dtx b/Master/texmf-dist/source/latex/mwcls/mwcls.dtx
index 9e45e931167..d5c451d3e6a 100644
--- a/Master/texmf-dist/source/latex/mwcls/mwcls.dtx
+++ b/Master/texmf-dist/source/latex/mwcls/mwcls.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment -*- doctex -*-
%
-% Copyright 2000-2003,2008-2009 by Marcin Woli\'nski
+% Copyright 2000-2003,2008-2009,2017 by Marcin Woli\'nski
%
%
% This work may be distributed and/or modified under the
@@ -12,7 +12,7 @@
% version 1999/12/01 or later.
%
% \fi
-% \CheckSum{3725}
+% \CheckSum{3809}
%
% \iffalse
% \section{Identification}
@@ -38,7 +38,7 @@
%<*driver>
\ProvidesFile{mwcls.drv}
%</driver>
- [2009/09/27 v0.74
+ [2017/05/13 v0.75
%<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}
@@ -59,6 +59,7 @@
\usepackage{doc}
\usepackage{polski}
\usepackage[utf8]{inputenc}
+\usepackage[hidelinks]{hyperref}
% \end{macrocode}
%
% We don't want everything to appear in the index
@@ -531,7 +532,7 @@
% przechowywana była rozwinięta postać argumentów (chcemy bowiem
% pewne wartości wprowadzać przez chwilowo definiowane nazwy
% symboliczne). Nie narusza to kompatybilności, bo argumenty i~tak były
-% rozwijane w~momencie wykonania \cs{mark}'a.
+% rozwijane w~momencie wykonania \cs{mark}a.
%
% W~jądrze \LaTeX a z~datą 2000/06/01 nastąpiły pożądane przez nas
% zmiany. Można by więc wyrzucić nasze definicje. Aby jednak
@@ -2324,7 +2325,24 @@
{\HeadingNumberedtrue\@dblarg{\mw@sectionx{#1}}}}
% \end{macrocode}
% \end{macro}
-%
+% \begin{macro}{\mw@step@sectioning@counter}
+% This macro advances sectioning counter used for numbered
+% headings. Hyperref hijacks \cs{refstepcounter} to add a link to the
+% title, so we have to be extra careful to avoid pagebreaks between
+% this and the heading.
+% \begin{macrocode}
+\def\mw@step@sectioning@counter{%
+ \ifHeadingNumbered
+ \refstepcounter{\mw@HeadingType}%
+ \protected@edef\HeadingNumber{\expandafter\noexpand
+ \csname the\mw@HeadingType\endcsname\relax}%
+ \else
+ \mw@hyperref@phantom{\mw@HeadingType}%
+ \let\HeadingNumber\@empty
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\mw@sectionx}
%
@@ -2365,14 +2383,6 @@
\ifnum \mw@HeadingLevel>\c@secnumdepth \HeadingNumberedfalse \fi
%<book> \if@mainmatter\else \HeadingNumberedfalse \fi
\fi
- \ifHeadingNumbered
- \refstepcounter{#1}%
- \protected@edef\HeadingNumber{\expandafter\noexpand
- \csname the#1\endcsname\relax}%
- \else
- \mw@hyperref@phantom{#1}%
- \let\HeadingNumber\@empty
- \fi
\def\HeadingRHeadText{#2}%
\def\HeadingTOCText{#3}%
\def\HeadingText{#4}%
@@ -2453,6 +2463,7 @@
\if\mw@HeadingBreakBefore \hrule\@height\z@\nobreak
\else \addpenalty\@secpenalty \fi
\addvspace{\csname \mw@HeadingType @preskip\endcsname}%
+ \mw@step@sectioning@counter
\bgroup\language\l@nohyphenation
\raggedright
\interlinepenalty\@M
@@ -2495,6 +2506,7 @@
\global\@noskipsecfalse
{\setbox\z@\lastbox}%
\clubpenalty\@M
+ \mw@step@sectioning@counter
\bgroup\language\l@nohyphenation
\normalfont\sectsettings
\csname \mw@HeadingType @head\endcsname
@@ -3624,6 +3636,56 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\mw@caption@hyperref}
+% Niestety pakiet hyperref przedefiniowuje caption dlatego musimy
+% zasłonić jego redefinicję kolejną redefinicją zawierającą wersję
+% hyperrefowÄ… z dodanÄ… kropkÄ… i z \cs{captionsettings}.
+% \begin{macrocode}
+\long\def\mw@caption@hyperref#1[#2]#3{%
+ \expandafter\ifx\csname if@capstart\expandafter\endcsname
+ \csname iftrue\endcsname
+ \global\let\@currentHref\hc@currentHref
+ \else
+ \hyper@makecurrent{\@captype}%
+ \fi
+ \@ifundefined{NR@gettitle}{%
+ \def\@currentlabelname{#2}%
+ }{%
+ \NR@gettitle{#2}%
+ }%
+ \par\addcontentsline{\csname ext@#1\endcsname}{#1}{%
+ \protect\numberline{\csname the#1\endcsname.}{\ignorespaces #2}%
+ }%
+ \begingroup
+ \@parboxrestore
+ \if@minipage
+ \@setminipage
+ \fi
+ \captionsettings
+ \expandafter\ifx\csname if@capstart\expandafter\endcsname
+ \csname iftrue\endcsname
+ \global\@capstartfalse
+ \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces#3}%
+ \else
+ \@makecaption{\csname fnum@#1\endcsname}{%
+ \ignorespaces
+ \ifHy@nesting
+ \expandafter\hyper@@anchor\expandafter{\@currentHref}{#3}%
+ \else
+ \Hy@raisedlink{%
+ \expandafter\hyper@@anchor\expandafter{%
+ \@currentHref
+ }{\relax}%
+ }%
+ #3%
+ \fi
+ }%
+ \fi
+ \par
+ \endgroup
+}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\@makecaption}
% The definition of this macro is |\long| in order to allow more
% then one paragraph in a caption.
@@ -4422,7 +4484,11 @@
\xdef\@currentHref{#1*.\the\Hy@linkcounter}%
\Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
}%
-}{}}
+ \let\@caption\mw@caption@hyperref
+ }{%
+ \let\mw@caption@hyperref\@undefined
+ }%
+}
% \end{macrocode}
%
% \subsection{\cs{clubpenalty}}
diff --git a/Master/texmf-dist/source/latex/mwcls/mwcls.ins b/Master/texmf-dist/source/latex/mwcls/mwcls.ins
index 22e2740a7ab..a080c474a6c 100644
--- a/Master/texmf-dist/source/latex/mwcls/mwcls.ins
+++ b/Master/texmf-dist/source/latex/mwcls/mwcls.ins
@@ -15,7 +15,8 @@
This is a generated file.
-Copyright 2000-2009 by Marcin Woli\string\'nski <wolinski@gust.org.pl>
+Copyright 2000-2003, 2008-2009, 2017 by Woli\string\'nski
+<wolinski@gust.org.pl>
This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/mwcls/mw10.clo b/Master/texmf-dist/tex/latex/mwcls/mw10.clo
index c58ef5e38b5..d2d1aac9aa1 100644
--- a/Master/texmf-dist/tex/latex/mwcls/mw10.clo
+++ b/Master/texmf-dist/tex/latex/mwcls/mw10.clo
@@ -8,7 +8,8 @@
%%
%% This is a generated file.
%%
-%% Copyright 2000-2009 by Marcin Woli\'nski <wolinski@gust.org.pl>
+%% Copyright 2000-2003, 2008-2009, 2017 by Woli\'nski
+%% <wolinski@gust.org.pl>
%%
%%
%% This work may be distributed and/or modified under the
@@ -20,7 +21,7 @@
%% version 1999/12/01 or later.
%%
\ProvidesFile{mw10.clo}
- [2009/09/27 v0.74
+ [2017/05/13 v0.75
A document class size option (MW)]
\renewcommand\normalsize{%
\@setfontsize\normalsize\@xpt\@xiipt
diff --git a/Master/texmf-dist/tex/latex/mwcls/mw11.clo b/Master/texmf-dist/tex/latex/mwcls/mw11.clo
index 302d9e98d8a..f04709e921c 100644
--- a/Master/texmf-dist/tex/latex/mwcls/mw11.clo
+++ b/Master/texmf-dist/tex/latex/mwcls/mw11.clo
@@ -8,7 +8,8 @@
%%
%% This is a generated file.
%%
-%% Copyright 2000-2009 by Marcin Woli\'nski <wolinski@gust.org.pl>
+%% Copyright 2000-2003, 2008-2009, 2017 by Woli\'nski
+%% <wolinski@gust.org.pl>
%%
%%
%% This work may be distributed and/or modified under the
@@ -20,7 +21,7 @@
%% version 1999/12/01 or later.
%%
\ProvidesFile{mw11.clo}
- [2009/09/27 v0.74
+ [2017/05/13 v0.75
A document class size option (MW)]
\renewcommand\normalsize{%
\@setfontsize\normalsize\@xipt{13.6}%
diff --git a/Master/texmf-dist/tex/latex/mwcls/mw12.clo b/Master/texmf-dist/tex/latex/mwcls/mw12.clo
index 5b561f97e2d..acdaaeeff31 100644
--- a/Master/texmf-dist/tex/latex/mwcls/mw12.clo
+++ b/Master/texmf-dist/tex/latex/mwcls/mw12.clo
@@ -8,7 +8,8 @@
%%
%% This is a generated file.
%%
-%% Copyright 2000-2009 by Marcin Woli\'nski <wolinski@gust.org.pl>
+%% Copyright 2000-2003, 2008-2009, 2017 by Woli\'nski
+%% <wolinski@gust.org.pl>
%%
%%
%% This work may be distributed and/or modified under the
@@ -20,7 +21,7 @@
%% version 1999/12/01 or later.
%%
\ProvidesFile{mw12.clo}
- [2009/09/27 v0.74
+ [2017/05/13 v0.75
A document class size option (MW)]
\renewcommand\normalsize{%
\@setfontsize\normalsize\@xiipt{14.5}%
diff --git a/Master/texmf-dist/tex/latex/mwcls/mwart.cls b/Master/texmf-dist/tex/latex/mwcls/mwart.cls
index 09cb75dc3ce..d41e05dcb45 100644
--- a/Master/texmf-dist/tex/latex/mwcls/mwart.cls
+++ b/Master/texmf-dist/tex/latex/mwcls/mwart.cls
@@ -8,7 +8,8 @@
%%
%% This is a generated file.
%%
-%% Copyright 2000-2009 by Marcin Woli\'nski <wolinski@gust.org.pl>
+%% Copyright 2000-2003, 2008-2009, 2017 by Woli\'nski
+%% <wolinski@gust.org.pl>
%%
%%
%% This work may be distributed and/or modified under the
@@ -21,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{mwart}
- [2009/09/27 v0.74
+ [2017/05/13 v0.75
A LaTeX document class (MW)]
\typeout{*** Beta version. Formatting may change}
\typeout{*** in future versions of this class.}
@@ -524,6 +525,16 @@
\@ifstar
{\HeadingNumberedfalse\@dblarg{\mw@sectionx{#1}}}%
{\HeadingNumberedtrue\@dblarg{\mw@sectionx{#1}}}}
+\def\mw@step@sectioning@counter{%
+ \ifHeadingNumbered
+ \refstepcounter{\mw@HeadingType}%
+ \protected@edef\HeadingNumber{\expandafter\noexpand
+\csname the\mw@HeadingType\endcsname\relax}%
+ \else
+ \mw@hyperref@phantom{\mw@HeadingType}%
+ \let\HeadingNumber\@empty
+ \fi
+}
\def\mw@sectionx#1[#2]{%
\@dblarg{\mw@sectionxx{#1}{#2}}}
\def\mw@sectionxx#1#2[#3]#4{%
@@ -540,14 +551,6 @@
\ifHeadingNumbered
\ifnum \mw@HeadingLevel>\c@secnumdepth \HeadingNumberedfalse \fi
\fi
- \ifHeadingNumbered
- \refstepcounter{#1}%
- \protected@edef\HeadingNumber{\expandafter\noexpand
-\csname the#1\endcsname\relax}%
- \else
- \mw@hyperref@phantom{#1}%
- \let\HeadingNumber\@empty
- \fi
\def\HeadingRHeadText{#2}%
\def\HeadingTOCText{#3}%
\def\HeadingText{#4}%
@@ -599,6 +602,7 @@
\if\mw@HeadingBreakBefore \hrule\@height\z@\nobreak
\else \addpenalty\@secpenalty \fi
\addvspace{\csname \mw@HeadingType @preskip\endcsname}%
+ \mw@step@sectioning@counter
\bgroup\language\l@nohyphenation
\raggedright
\interlinepenalty\@M
@@ -624,6 +628,7 @@
\global\@noskipsecfalse
{\setbox\z@\lastbox}%
\clubpenalty\@M
+ \mw@step@sectioning@counter
\bgroup\language\l@nohyphenation
\normalfont\sectsettings
\csname \mw@HeadingType @head\endcsname
@@ -972,6 +977,49 @@
\captionsettings
\@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
\endgroup}
+\long\def\mw@caption@hyperref#1[#2]#3{%
+ \expandafter\ifx\csname if@capstart\expandafter\endcsname
+ \csname iftrue\endcsname
+ \global\let\@currentHref\hc@currentHref
+ \else
+ \hyper@makecurrent{\@captype}%
+ \fi
+ \@ifundefined{NR@gettitle}{%
+ \def\@currentlabelname{#2}%
+ }{%
+ \NR@gettitle{#2}%
+ }%
+ \par\addcontentsline{\csname ext@#1\endcsname}{#1}{%
+ \protect\numberline{\csname the#1\endcsname.}{\ignorespaces #2}%
+ }%
+ \begingroup
+ \@parboxrestore
+ \if@minipage
+ \@setminipage
+ \fi
+ \captionsettings
+ \expandafter\ifx\csname if@capstart\expandafter\endcsname
+ \csname iftrue\endcsname
+ \global\@capstartfalse
+ \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces#3}%
+ \else
+ \@makecaption{\csname fnum@#1\endcsname}{%
+ \ignorespaces
+ \ifHy@nesting
+ \expandafter\hyper@@anchor\expandafter{\@currentHref}{#3}%
+ \else
+ \Hy@raisedlink{%
+ \expandafter\hyper@@anchor\expandafter{%
+ \@currentHref
+ }{\relax}%
+ }%
+ #3%
+ \fi
+ }%
+ \fi
+ \par
+ \endgroup
+}
\long\def\@makecaption#1#2{%
\addvspace\abovecaptionskip
\bgroup\centeredlast
@@ -1167,7 +1215,11 @@
\xdef\@currentHref{#1*.\the\Hy@linkcounter}%
\Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
}%
-}{}}
+ \let\@caption\mw@caption@hyperref
+ }{%
+ \let\mw@caption@hyperref\@undefined
+ }%
+}
\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 2bb0db32ed6..302819d5056 100644
--- a/Master/texmf-dist/tex/latex/mwcls/mwbk.cls
+++ b/Master/texmf-dist/tex/latex/mwcls/mwbk.cls
@@ -8,7 +8,8 @@
%%
%% This is a generated file.
%%
-%% Copyright 2000-2009 by Marcin Woli\'nski <wolinski@gust.org.pl>
+%% Copyright 2000-2003, 2008-2009, 2017 by Woli\'nski
+%% <wolinski@gust.org.pl>
%%
%%
%% This work may be distributed and/or modified under the
@@ -21,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{mwbk}
- [2009/09/27 v0.74
+ [2017/05/13 v0.75
A LaTeX document class (MW)]
\typeout{*** Beta version. Formatting may change}
\typeout{*** in future versions of this class.}
@@ -569,6 +570,16 @@
\@ifstar
{\HeadingNumberedfalse\@dblarg{\mw@sectionx{#1}}}%
{\HeadingNumberedtrue\@dblarg{\mw@sectionx{#1}}}}
+\def\mw@step@sectioning@counter{%
+ \ifHeadingNumbered
+ \refstepcounter{\mw@HeadingType}%
+ \protected@edef\HeadingNumber{\expandafter\noexpand
+\csname the\mw@HeadingType\endcsname\relax}%
+ \else
+ \mw@hyperref@phantom{\mw@HeadingType}%
+ \let\HeadingNumber\@empty
+ \fi
+}
\def\mw@sectionx#1[#2]{%
\@dblarg{\mw@sectionxx{#1}{#2}}}
\def\mw@sectionxx#1#2[#3]#4{%
@@ -588,14 +599,6 @@
\ifnum \mw@HeadingLevel>\c@secnumdepth \HeadingNumberedfalse \fi
\if@mainmatter\else \HeadingNumberedfalse \fi
\fi
- \ifHeadingNumbered
- \refstepcounter{#1}%
- \protected@edef\HeadingNumber{\expandafter\noexpand
-\csname the#1\endcsname\relax}%
- \else
- \mw@hyperref@phantom{#1}%
- \let\HeadingNumber\@empty
- \fi
\def\HeadingRHeadText{#2}%
\def\HeadingTOCText{#3}%
\def\HeadingText{#4}%
@@ -647,6 +650,7 @@
\if\mw@HeadingBreakBefore \hrule\@height\z@\nobreak
\else \addpenalty\@secpenalty \fi
\addvspace{\csname \mw@HeadingType @preskip\endcsname}%
+ \mw@step@sectioning@counter
\bgroup\language\l@nohyphenation
\raggedright
\interlinepenalty\@M
@@ -672,6 +676,7 @@
\global\@noskipsecfalse
{\setbox\z@\lastbox}%
\clubpenalty\@M
+ \mw@step@sectioning@counter
\bgroup\language\l@nohyphenation
\normalfont\sectsettings
\csname \mw@HeadingType @head\endcsname
@@ -1010,6 +1015,49 @@
\captionsettings
\@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
\endgroup}
+\long\def\mw@caption@hyperref#1[#2]#3{%
+ \expandafter\ifx\csname if@capstart\expandafter\endcsname
+ \csname iftrue\endcsname
+ \global\let\@currentHref\hc@currentHref
+ \else
+ \hyper@makecurrent{\@captype}%
+ \fi
+ \@ifundefined{NR@gettitle}{%
+ \def\@currentlabelname{#2}%
+ }{%
+ \NR@gettitle{#2}%
+ }%
+ \par\addcontentsline{\csname ext@#1\endcsname}{#1}{%
+ \protect\numberline{\csname the#1\endcsname.}{\ignorespaces #2}%
+ }%
+ \begingroup
+ \@parboxrestore
+ \if@minipage
+ \@setminipage
+ \fi
+ \captionsettings
+ \expandafter\ifx\csname if@capstart\expandafter\endcsname
+ \csname iftrue\endcsname
+ \global\@capstartfalse
+ \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces#3}%
+ \else
+ \@makecaption{\csname fnum@#1\endcsname}{%
+ \ignorespaces
+ \ifHy@nesting
+ \expandafter\hyper@@anchor\expandafter{\@currentHref}{#3}%
+ \else
+ \Hy@raisedlink{%
+ \expandafter\hyper@@anchor\expandafter{%
+ \@currentHref
+ }{\relax}%
+ }%
+ #3%
+ \fi
+ }%
+ \fi
+ \par
+ \endgroup
+}
\long\def\@makecaption#1#2{%
\addvspace\abovecaptionskip
\bgroup\centeredlast
@@ -1226,7 +1274,11 @@
\xdef\@currentHref{#1*.\the\Hy@linkcounter}%
\Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
}%
-}{}}
+ \let\@caption\mw@caption@hyperref
+ }{%
+ \let\mw@caption@hyperref\@undefined
+ }%
+}
\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 251fe13c9ef..8d9083f9f66 100644
--- a/Master/texmf-dist/tex/latex/mwcls/mwbk10.clo
+++ b/Master/texmf-dist/tex/latex/mwcls/mwbk10.clo
@@ -8,7 +8,8 @@
%%
%% This is a generated file.
%%
-%% Copyright 2000-2009 by Marcin Woli\'nski <wolinski@gust.org.pl>
+%% Copyright 2000-2003, 2008-2009, 2017 by Woli\'nski
+%% <wolinski@gust.org.pl>
%%
%%
%% This work may be distributed and/or modified under the
@@ -20,7 +21,7 @@
%% version 1999/12/01 or later.
%%
\ProvidesFile{mwbk10.clo}
- [2009/09/27 v0.74
+ [2017/05/13 v0.75
A document class size option (MW)]
\renewcommand\normalsize{%
\@setfontsize\normalsize\@xpt\@xiipt
diff --git a/Master/texmf-dist/tex/latex/mwcls/mwbk11.clo b/Master/texmf-dist/tex/latex/mwcls/mwbk11.clo
index c636fb7e2a4..dccef7e5dac 100644
--- a/Master/texmf-dist/tex/latex/mwcls/mwbk11.clo
+++ b/Master/texmf-dist/tex/latex/mwcls/mwbk11.clo
@@ -8,7 +8,8 @@
%%
%% This is a generated file.
%%
-%% Copyright 2000-2009 by Marcin Woli\'nski <wolinski@gust.org.pl>
+%% Copyright 2000-2003, 2008-2009, 2017 by Woli\'nski
+%% <wolinski@gust.org.pl>
%%
%%
%% This work may be distributed and/or modified under the
@@ -20,7 +21,7 @@
%% version 1999/12/01 or later.
%%
\ProvidesFile{mwbk11.clo}
- [2009/09/27 v0.74
+ [2017/05/13 v0.75
A document class size option (MW)]
\renewcommand\normalsize{%
\@setfontsize\normalsize\@xipt{13.6}%
diff --git a/Master/texmf-dist/tex/latex/mwcls/mwbk12.clo b/Master/texmf-dist/tex/latex/mwcls/mwbk12.clo
index fa9b3cc708a..2430810b4e4 100644
--- a/Master/texmf-dist/tex/latex/mwcls/mwbk12.clo
+++ b/Master/texmf-dist/tex/latex/mwcls/mwbk12.clo
@@ -8,7 +8,8 @@
%%
%% This is a generated file.
%%
-%% Copyright 2000-2009 by Marcin Woli\'nski <wolinski@gust.org.pl>
+%% Copyright 2000-2003, 2008-2009, 2017 by Woli\'nski
+%% <wolinski@gust.org.pl>
%%
%%
%% This work may be distributed and/or modified under the
@@ -20,7 +21,7 @@
%% version 1999/12/01 or later.
%%
\ProvidesFile{mwbk12.clo}
- [2009/09/27 v0.74
+ [2017/05/13 v0.75
A document class size option (MW)]
\renewcommand\normalsize{%
\@setfontsize\normalsize\@xiipt{14.5}%
diff --git a/Master/texmf-dist/tex/latex/mwcls/mwrep.cls b/Master/texmf-dist/tex/latex/mwcls/mwrep.cls
index 218eb7cb8eb..6ec210f5435 100644
--- a/Master/texmf-dist/tex/latex/mwcls/mwrep.cls
+++ b/Master/texmf-dist/tex/latex/mwcls/mwrep.cls
@@ -8,7 +8,8 @@
%%
%% This is a generated file.
%%
-%% Copyright 2000-2009 by Marcin Woli\'nski <wolinski@gust.org.pl>
+%% Copyright 2000-2003, 2008-2009, 2017 by Woli\'nski
+%% <wolinski@gust.org.pl>
%%
%%
%% This work may be distributed and/or modified under the
@@ -21,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{mwrep}
- [2009/09/27 v0.74
+ [2017/05/13 v0.75
A LaTeX document class (MW)]
\typeout{*** Beta version. Formatting may change}
\typeout{*** in future versions of this class.}
@@ -540,6 +541,16 @@
\@ifstar
{\HeadingNumberedfalse\@dblarg{\mw@sectionx{#1}}}%
{\HeadingNumberedtrue\@dblarg{\mw@sectionx{#1}}}}
+\def\mw@step@sectioning@counter{%
+ \ifHeadingNumbered
+ \refstepcounter{\mw@HeadingType}%
+ \protected@edef\HeadingNumber{\expandafter\noexpand
+\csname the\mw@HeadingType\endcsname\relax}%
+ \else
+ \mw@hyperref@phantom{\mw@HeadingType}%
+ \let\HeadingNumber\@empty
+ \fi
+}
\def\mw@sectionx#1[#2]{%
\@dblarg{\mw@sectionxx{#1}{#2}}}
\def\mw@sectionxx#1#2[#3]#4{%
@@ -558,14 +569,6 @@
\ifHeadingNumbered
\ifnum \mw@HeadingLevel>\c@secnumdepth \HeadingNumberedfalse \fi
\fi
- \ifHeadingNumbered
- \refstepcounter{#1}%
- \protected@edef\HeadingNumber{\expandafter\noexpand
-\csname the#1\endcsname\relax}%
- \else
- \mw@hyperref@phantom{#1}%
- \let\HeadingNumber\@empty
- \fi
\def\HeadingRHeadText{#2}%
\def\HeadingTOCText{#3}%
\def\HeadingText{#4}%
@@ -617,6 +620,7 @@
\if\mw@HeadingBreakBefore \hrule\@height\z@\nobreak
\else \addpenalty\@secpenalty \fi
\addvspace{\csname \mw@HeadingType @preskip\endcsname}%
+ \mw@step@sectioning@counter
\bgroup\language\l@nohyphenation
\raggedright
\interlinepenalty\@M
@@ -642,6 +646,7 @@
\global\@noskipsecfalse
{\setbox\z@\lastbox}%
\clubpenalty\@M
+ \mw@step@sectioning@counter
\bgroup\language\l@nohyphenation
\normalfont\sectsettings
\csname \mw@HeadingType @head\endcsname
@@ -1001,6 +1006,49 @@
\captionsettings
\@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
\endgroup}
+\long\def\mw@caption@hyperref#1[#2]#3{%
+ \expandafter\ifx\csname if@capstart\expandafter\endcsname
+ \csname iftrue\endcsname
+ \global\let\@currentHref\hc@currentHref
+ \else
+ \hyper@makecurrent{\@captype}%
+ \fi
+ \@ifundefined{NR@gettitle}{%
+ \def\@currentlabelname{#2}%
+ }{%
+ \NR@gettitle{#2}%
+ }%
+ \par\addcontentsline{\csname ext@#1\endcsname}{#1}{%
+ \protect\numberline{\csname the#1\endcsname.}{\ignorespaces #2}%
+ }%
+ \begingroup
+ \@parboxrestore
+ \if@minipage
+ \@setminipage
+ \fi
+ \captionsettings
+ \expandafter\ifx\csname if@capstart\expandafter\endcsname
+ \csname iftrue\endcsname
+ \global\@capstartfalse
+ \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces#3}%
+ \else
+ \@makecaption{\csname fnum@#1\endcsname}{%
+ \ignorespaces
+ \ifHy@nesting
+ \expandafter\hyper@@anchor\expandafter{\@currentHref}{#3}%
+ \else
+ \Hy@raisedlink{%
+ \expandafter\hyper@@anchor\expandafter{%
+ \@currentHref
+ }{\relax}%
+ }%
+ #3%
+ \fi
+ }%
+ \fi
+ \par
+ \endgroup
+}
\long\def\@makecaption#1#2{%
\addvspace\abovecaptionskip
\bgroup\centeredlast
@@ -1218,7 +1266,11 @@
\xdef\@currentHref{#1*.\the\Hy@linkcounter}%
\Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
}%
-}{}}
+ \let\@caption\mw@caption@hyperref
+ }{%
+ \let\mw@caption@hyperref\@undefined
+ }%
+}
\def\@doendpe{\@endpetrue
\clubpenalty\@clubpenalty
\def\par{\@restorepar\everypar{}\par\@endpefalse}%