summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/memoir/README13
-rw-r--r--Master/texmf-dist/doc/latex/memoir/memman.pdfbin2787885 -> 2838243 bytes
-rw-r--r--Master/texmf-dist/source/latex/memoir/memoir.dtx25
-rw-r--r--Master/texmf-dist/source/latex/memoir/mempatch.dtx34
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memhfixc.sty14
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memoir.cls10
6 files changed, 45 insertions, 51 deletions
diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README
index 00ab227b2fa..42944d96b4d 100644
--- a/Master/texmf-dist/doc/latex/memoir/README
+++ b/Master/texmf-dist/doc/latex/memoir/README
@@ -27,6 +27,19 @@ o Backmatter:
Command glossary ~ 40 pages
Bibliography, indexes ~ 50 pages
+Changed (2021/06/16)
+
+o memoir v3.7p
+
+-- moved various \theHxxx definitions from memhfixc directly into
+ memoir. They are only relevant when hyperref is loaded, but do no
+ harm otherwise.
+
+o memhfixc v1.19
+
+-- moved several hyperref related additions from memhfixc to memoir
+
+
Changed (2021/03/23)
o memoir v3.7o
diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf
index 82de66876cd..67d9654a71f 100644
--- a/Master/texmf-dist/doc/latex/memoir/memman.pdf
+++ b/Master/texmf-dist/doc/latex/memoir/memman.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx
index f63ba259abf..074ee11e1a8 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.dtx
+++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx
@@ -20,7 +20,7 @@
% This work consists of the files listed in the README file.
%
% \fi
-% \CheckSum{30999}
+% \CheckSum{31013}
%
% \changes{v0.1}{2001/05/20}{First public alpha release}
% \changes{v0.2}{2001/06/03}{First beta release}
@@ -126,6 +126,7 @@
% \changes{v3.7n}{2020/10/04}{Foced # doubling in AtBegin/EndX macros
% to ensure backwards compatability}
% \changes{v3.7o}{2021/03/23}{Maintenance and a provide for the kernel}
+% \changes{v3.7p}{2021/06/16}{Small adjustments of memoir vs memhfixc}
%
% \def\dtxfile{memoir.dtx}
%
@@ -189,6 +190,7 @@
% \def\fileversion{v3.7m} \def\filedate{2020/09/10}
% \def\fileversion{v3.7n} \def\filedate{2020/10/04}
% \def\fileversion{v3.7o} \def\filedate{2021/03/23}
+% \def\fileversion{v3.7p} \def\filedate{2021/06/16}
% \title{The LaTeX \Lpack{memoir} class for configurable book
% typesetting: Source code\thanks{This
% file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -419,11 +421,11 @@
% Announce the name, option files and version for LaTeX2e files:
% \begin{macrocode}
%<class>\ProvidesClass{memoir}%
-%<class> [2021/03/23 v3.7o configurable book, report, article document class]
+%<class> [2021/06/16 v3.7p configurable book, report, article document class]
% \end{macrocode}
% In the manual it is useful to know the current version.
% \begin{macrocode}
-%<class>\newcommand\memversion{v3.7o, 2021/03/23}
+%<class>\newcommand\memversion{v3.7p, 2021/06/16}
%<9pt>\ProvidesFile{mem9.clo}%
%<9pt> [2008/01/30 v0.4 memoir class 9pt size option]
%<10pt>\ProvidesFile{mem10.clo}%
@@ -12085,11 +12087,12 @@
%
% \begin{macro}{\@resets@pp}
% Resets the appropriate sectioning counters and names. This does almost
-% exactly
-% what the default \cs{appendix} command does, except that it saves and
+% exactly what the default \cs{appendix} command does, except that it saves and
% restores sectional numbering. It saves the sectional number at the start
% and restores the appendix number at the end.
% \begin{macrocode}
+% \changes{v3.7p}{2021/06/16}{Moved \cs{theHchapter} def here from
+% \Lpack{memhfixc}. (discovered by Lars Hoemke, private email 20 Feb 2003)}
\newcommand{\@resets@pp}{%
\par
\@ppsavesec
@@ -12098,6 +12101,7 @@
\renewcommand\@chapapp{\appendixname}%
\renewcommand\thechapter{\@Alph\c@chapter}%
\restoreapp
+ \def\theHchapter{\Alph{chapter}}
}
% \end{macrocode}
@@ -12126,11 +12130,14 @@
% \begin{macro}{\@resets@ppsub}
% Similar to \cs{@resets@pp} except that it is for use within the
% \Lenv{subappendices} environment; as such, it is a bit simpler.
+% \changes{v3.7p}{2021/06/16}{Moved \cs{theHsection} def here instead
+% of in \Lpack{memhfixc}, Problem reported by Ignasi Furio, private email 13 May 2004}
% \begin{macrocode}
\newcommand{\@resets@ppsub}{
\par
\setcounter{section}{0}
\renewcommand{\thesection}{\setthesection}
+ \def\theHsection{\theHchapter.\Alph{section}}
}
% \end{macrocode}
@@ -12182,9 +12189,13 @@
\csname the##1\endcsname\quad}
\fi
% \end{macrocode}
-% That's it.
+% We end by redefining \cs{theHsection} introduced in \cs{@resets@ppsub}
+% \changes{v3.7p}{2021/06/16}{Moved redef of \cs{theHsection} here instead
+% of in \Lpack{memhfixc}}
% \begin{macrocode}
- }{}
+}{%
+ \def\theHsection{\theHchapter.\arabic{section}}
+}
% \end{macrocode}
% \end{environment}
diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.dtx b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
index 560af702e55..135166c33ef 100644
--- a/Master/texmf-dist/source/latex/memoir/mempatch.dtx
+++ b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
@@ -20,7 +20,7 @@
%
%
% \fi
-% \CheckSum{634}
+% \CheckSum{609}
%
% \def\dtxfile{\texttt{mempatch.dtx}}
% \def\fileversion{v1.0} \def\filedate{2003/10/04}
@@ -309,6 +309,7 @@
%% With thanks to Heiko Oberdiek, if you use hyperref dated 2006/11/15
%% or later, memhfixc will be automatically loaded after hyperref.
%%
+%% Version 1.19 2021/06/16
%% Version 1.18 2019/10/24
%% Version 1.17 2013/05/30
%% Version 1.16 2013/05/16
@@ -333,7 +334,7 @@
%
%
% \begin{macrocode}
-\ProvidesPackage{memhfixc}[2019/10/24 v1.18 nameref/hyperref package fixes for memoir class]
+\ProvidesPackage{memhfixc}[2021/06/16 v1.19 nameref/hyperref package fixes for memoir class]
% \end{macrocode}
%
% \begin{macro}{\M@hfixcfinish}
@@ -637,34 +638,9 @@
% \end{macrocode}
% \end{macro}
+% ^^A moved addition to \@resets@pp to memoir proper
%
-% \begin{macro}{\@resets@pp}
-% \Lpack{hyperref} fix for memoir's \texttt{appendices} environment
-% (discovered by Lars Hoemke, \url{hoemke@nikocity.de},
-% private email 20 Feb 2003)
-% \begin{macrocode}
-\let\MH@old@resets@pp\@resets@pp
-\renewcommand*{\@resets@pp}{%
- \MH@old@resets@pp
- \def\theHchapter{\Alph{chapter}}}
-
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@resets@ppsub}
-% \Lpack{hyperref} fix for memoir's \texttt{subappendices} environment
-% (Problem reported by Ignasi Furio, \url{ignasi.furio@uib.es},
-% private email 13 May 2004)
-% \changes{v1.6}{2004/05/13}{Added \cs{@resets@ppsub} to memhfixc}
-% \begin{macrocode}
-\let\MH@old@resets@ppsub\@resets@ppsub
-\renewcommand*{\@resets@ppsub}{%
- \MH@old@resets@ppsub
- \def\theHsection{\theHchapter.\Alph{section}}}
-\def\endsubappendices{\def\theHsection{\theHchapter.\arabic{section}}}
-
-% \end{macrocode}
-% \end{macro}
+% ^^A moved addition to \@resets@ppsub and \endsubappendices to memoir proper
%
% \begin{macro}{\cftaddtitleline}
% \begin{macro}{\cftaddnumtitleline}
diff --git a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
index e4e37f64f63..72a4e2590cf 100644
--- a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
+++ b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
@@ -41,6 +41,7 @@
%% With thanks to Heiko Oberdiek, if you use hyperref dated 2006/11/15
%% or later, memhfixc will be automatically loaded after hyperref.
%%
+%% Version 1.19 2021/06/16
%% Version 1.18 2019/10/24
%% Version 1.17 2013/05/30
%% Version 1.16 2013/05/16
@@ -61,7 +62,7 @@
%% Version 1.1 2003/01/22
%% Version 1.0 2002/10/22
%%
-\ProvidesPackage{memhfixc}[2019/10/24 v1.18 nameref/hyperref package fixes for memoir class]
+\ProvidesPackage{memhfixc}[2021/06/16 v1.19 nameref/hyperref package fixes for memoir class]
\let\M@hfixcfinish\relax
\@ifclassloaded{memoir}{}%
{\let\M@hfixcfinish\endinput
@@ -225,17 +226,6 @@
{% already fiddled \M@sect
}
-\let\MH@old@resets@pp\@resets@pp
-\renewcommand*{\@resets@pp}{%
- \MH@old@resets@pp
- \def\theHchapter{\Alph{chapter}}}
-
-\let\MH@old@resets@ppsub\@resets@ppsub
-\renewcommand*{\@resets@ppsub}{%
- \MH@old@resets@ppsub
- \def\theHsection{\theHchapter.\Alph{section}}}
-\def\endsubappendices{\def\theHsection{\theHchapter.\arabic{section}}}
-
\renewcommand{\cftaddtitleline}[4]{%
\addtocontents{#1}{\protect\contentsline{#2}{#3}{#4}{\@currentHref}}}
\renewcommand{\cftaddnumtitleline}[5]{\addtocontents{#1}{%
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index 6a97300b66f..7b174c9ff58 100644
--- a/Master/texmf-dist/tex/latex/memoir/memoir.cls
+++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls
@@ -28,8 +28,8 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{memoir}%
- [2021/03/23 v3.7o configurable book, report, article document class]
-\newcommand\memversion{v3.7o, 2021/03/23}
+ [2021/06/16 v3.7p configurable book, report, article document class]
+\newcommand\memversion{v3.7p, 2021/06/16}
\newcommand*{\@ptsize}{}
\newcommand*{\@memptsize}{}
\newlength{\onelineskip}
@@ -4258,6 +4258,7 @@
\renewcommand\@chapapp{\appendixname}%
\renewcommand\thechapter{\@Alph\c@chapter}%
\restoreapp
+ \def\theHchapter{\Alph{chapter}}
}
\newenvironment{appendices}%
@@ -4270,6 +4271,7 @@
\par
\setcounter{section}{0}
\renewcommand{\thesection}{\setthesection}
+ \def\theHsection{\theHchapter.\Alph{section}}
}
\newif\ifnamesubappendix
@@ -4287,7 +4289,9 @@
{}{\csname ##1name\endcsname\ }%
\csname the##1\endcsname\quad}
\fi
- }{}
+}{%
+ \def\theHsection{\theHchapter.\arabic{section}}
+}
\newcommand*{\leadpagetoclevel}{chapter}
\newcommand*{\newleadpage}[3][empty]{%