summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/memoir
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-06-16 20:43:39 +0000
committerKarl Berry <karl@freefriends.org>2021-06-16 20:43:39 +0000
commitd252fce9052c8967a66a0e29e9e600dbeedbee31 (patch)
treecbf3f311fcd7dc4890cc7bfa9a98089134a9f01b /Master/texmf-dist/tex/latex/memoir
parent38ff5bfc6797433b09363c3e187b6395f9bb09da (diff)
memoir (16jun21)
git-svn-id: svn://tug.org/texlive/trunk@59610 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/memoir')
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memhfixc.sty14
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memoir.cls10
2 files changed, 9 insertions, 15 deletions
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]{%