From 8141bb63ac908014fe5b6bc7ebed4d2889c014d4 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 18 Nov 2022 03:04:57 +0000 Subject: CTAN sync 202211180304 --- macros/latex/contrib/memoir/README | 26 ++++++++++++ macros/latex/contrib/memoir/memman.pdf | Bin 2837551 -> 2837566 bytes macros/latex/contrib/memoir/memoir.dtx | 41 +++++++++++++------ macros/latex/contrib/memoir/mempatch.dtx | 68 +++++++++++++++++-------------- 4 files changed, 92 insertions(+), 43 deletions(-) (limited to 'macros/latex/contrib/memoir') diff --git a/macros/latex/contrib/memoir/README b/macros/latex/contrib/memoir/README index 81d34511ab..b2581abbb8 100644 --- a/macros/latex/contrib/memoir/README +++ b/macros/latex/contrib/memoir/README @@ -27,6 +27,32 @@ o Backmatter: Command glossary ~ 40 pages Bibliography, indexes ~ 50 pages +Changes (2022/11/17) + +o memoir v3.7.19 + +-- changed version numbering to v3.7. (no plans to switch to 3.8 + anytime soon) +-- changed several \theH... definitions to \def to work better with + coming hyperref/tagging changes +-- similar for \toclevel@... macros +-- only declare \stockwidth and \stockheight if the kernel hadn't done + so already + +o memhfixc v1.20 + +-- removed patch for \@starttoc and thus \Hy@AtBeginDocument is no + longer used in memhfixc + + +WORD OF ADVISE: It is not recommended to manually update memoir into +an old LaTeX installation. Not all changes are compatible with older +un-updated LaTeX systems and we often make no attempt to be backwards +compatible. Instead we assume that users use updated memoir with an +updated LaTeX installation. + + + Changes (2022/07/29) o memoir v3.7r diff --git a/macros/latex/contrib/memoir/memman.pdf b/macros/latex/contrib/memoir/memman.pdf index 92cc612001..4b27d2a696 100644 Binary files a/macros/latex/contrib/memoir/memman.pdf and b/macros/latex/contrib/memoir/memman.pdf differ diff --git a/macros/latex/contrib/memoir/memoir.dtx b/macros/latex/contrib/memoir/memoir.dtx index fc65ffc581..ba5162db9d 100644 --- a/macros/latex/contrib/memoir/memoir.dtx +++ b/macros/latex/contrib/memoir/memoir.dtx @@ -20,7 +20,7 @@ % This work consists of the files listed in the README file. % % \fi -% \CheckSum{31043} +% \CheckSum{31045} % % \changes{v0.1}{2001/05/20}{First public alpha release} % \changes{v0.2}{2001/06/03}{First beta release} @@ -128,6 +128,8 @@ % \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} % \changes{v3.7q}{2022/02/20}{Maintenance} +% \changes{v3.7r}{2022/07/29}{Maintenance} +% \changes{v3.7.19}{2022/11/17}{Maintenance} % % \def\dtxfile{memoir.dtx} % @@ -194,6 +196,7 @@ % \def\fileversion{v3.7p} \def\filedate{2021/06/16} % \def\fileversion{v3.7q} \def\filedate{2022/02/20} % \def\fileversion{v3.7r} \def\filedate{2022/07/29} +% \def\fileversion{v3.7.19} \def\filedate{2022/11/17} % \title{The LaTeX \Lpack{memoir} class for configurable book % typesetting: Source code\thanks{This % file (\texttt{\dtxfile}) has version number \fileversion, last revised @@ -424,11 +427,11 @@ % Announce the name, option files and version for LaTeX2e files: % \begin{macrocode} %\ProvidesClass{memoir}% -% [2022/07/29 v3.7r configurable book, report, article document class] +% [2022/11/17 v3.7.19 configurable book, report, article document class] % \end{macrocode} % In the manual it is useful to know the current version. % \begin{macrocode} -%\newcommand\memversion{v3.7r, 2022/07/29} +%\newcommand\memversion{v3.7.19, 2022/11/17} %<9pt>\ProvidesFile{mem9.clo}% %<9pt> [2022/07/29 v0.5 memoir class 9pt size option] %<10pt>\ProvidesFile{mem10.clo}% @@ -1922,9 +1925,11 @@ % same as the physical sheet. In other words the \cs{paper...} and \cs{stock...} % sizes are the same and the trims are zero. This class assumes that this % is the normal case. +% \changes{v3.7.19}{2022/10/28}{\cs{stockheight} and \cs{stockwidth} +% may now be defined in the kernel, so we test for that} % \begin{macrocode} -\newlength{\stockheight} -\newlength{\stockwidth} +\@ifundefined{stockwidth}{\newdimen{\stockheight}}{} +\@ifundefined{stockwidth}{\newdimen{\stockwidth}}{} \newlength{\trimtop} \newlength{\trimedge} @@ -8916,9 +8921,11 @@ % \begin{macro}{\theHbook} % \begin{macro}{\toclevel@book} % These are needed if the \Lpack{hyperref} is used. +% \changes{v3.7.19}{2022/10/25}{Changing \cs{theH...} definitions to +% \cs{def} for better compability with future hyperref} % \begin{macrocode} -\newcommand*{\theHbook}{\arabic{book}} -\newcommand*{\toclevel@book}{-2} +\def\theHbook{\arabic{book}} +\def\toclevel@book{-2} % \end{macrocode} % \end{macro} @@ -14291,10 +14298,12 @@ % lines of a poem. See the thread \textit{PDFTEX/Hyperef hates memoir verse % environment?} on \ctt{} October 2002. % \changes{v1.3}{2002/11/14}{Added verse counter and \cs{theHpoemline}} +% \changes{v3.7.19}{2022/10/25}{Changing \cs{theH...} definitions to +% \cs{def} for better compability with future hyperref} % \begin{macrocode} \newcounter{verse} \setcounter{verse}{0} -\newcommand{\theHpoemline}{\theverse.\thepoemline} +\def\theHpoemline{\theverse.\thepoemline} % \end{macrocode} % \end{macro} @@ -23683,6 +23692,8 @@ % \begin{macro}{\toclevel@part} % Needed if the \Lpack{hyperref} package is used. % \changes{v1.61803}{2008/01/30}{Added \cs{toclevel@part} (mempatch v4.9)} +% \changes{v3.7.19}{2022/10/25}{Changing \cs{toclevel@part} definition to +% \cs{def} for better compability with future hyperref} % \begin{macrocode} \newcommand*{\toclevel@part}{-1} @@ -23843,8 +23854,10 @@ % \begin{macro}{\toclevel@chapter} % Needed if the \Lpack{hyperref} package is used. % \changes{v1.61803}{2008/01/30}{Added \cs{toclevel@chapter} (mempatch v4.9)} +% \changes{v3.7.19}{2022/10/25}{Changing \cs{toclevel@chapter} definitions to +% \cs{def} for better compability with future hyperref} % \begin{macrocode} -\newcommand*{\toclevel@chapter}{0} +\def\toclevel@chapter{0} % \end{macrocode} % \end{macro} @@ -23865,10 +23878,12 @@ % \begin{macro}{\toclevel@appendix} % Similar to \cs{l@chapter} but for an appendix. % \changes{v1.618}{2005/09/03}{Added \cs{l@apendix} (mempatch v3.12)} +% \changes{v3.7.19}{2022/10/25}{Changing \cs{toclevel@appendix} definitions to +% \cs{def} for better compability with future hyperref} % \begin{macrocode} \newcommand*{\l@appendix}[2]{% \l@chapapp{#1}{#2}{\cftappendixname}} -\newcommand{\toclevel@appendix}{0} +\def\toclevel@appendix{0} % \end{macrocode} % \end{macro} @@ -24441,9 +24456,11 @@ % as `division levels'. % \changes{v1.61803}{2008/01/30}{Added \cs{toclevel@none} and \cs{toclevel@all} % (mempatch v4.4)} +% \changes{v3.7.19}{2022/10/25}{Changing \cs{toclevel@...} definitions to +% \cs{def} for better compability with future hyperref} % \begin{macrocode} -\newcommand*{\toclevel@none}{-10} -\newcommand*{\toclevel@all}{50} +\def\toclevel@none{-10} +\def\toclevel@all{50} % \end{macrocode} % \end{macro} diff --git a/macros/latex/contrib/memoir/mempatch.dtx b/macros/latex/contrib/memoir/mempatch.dtx index 135166c33e..540bc678cb 100644 --- a/macros/latex/contrib/memoir/mempatch.dtx +++ b/macros/latex/contrib/memoir/mempatch.dtx @@ -20,7 +20,7 @@ % % % \fi -% \CheckSum{609} +% \CheckSum{610} % % \def\dtxfile{\texttt{mempatch.dtx}} % \def\fileversion{v1.0} \def\filedate{2003/10/04} @@ -309,6 +309,10 @@ %% With thanks to Heiko Oberdiek, if you use hyperref dated 2006/11/15 %% or later, memhfixc will be automatically loaded after hyperref. %% +%% With the new hooking system from 2020+ memhfixc is automatically +%% added after loading hyperref with the memoir class +%% +%% Version 1.20 2022/11/17 %% Version 1.19 2021/06/16 %% Version 1.18 2019/10/24 %% Version 1.17 2013/05/30 @@ -334,7 +338,7 @@ % % % \begin{macrocode} -\ProvidesPackage{memhfixc}[2021/06/16 v1.19 nameref/hyperref package fixes for memoir class] +\ProvidesPackage{memhfixc}[2022/11/17 v1.20 nameref/hyperref package fixes for memoir class] % \end{macrocode} % % \begin{macro}{\M@hfixcfinish} @@ -821,40 +825,42 @@ % \end{macro} % % \changes{v1.16}{2013/05/14}{Added fix for \cs{@starttoc}} -% \begin{macro}{\@starttoc} -% In memoir we altered \cs{@starttoc} such that \cs{tableofcontents} -% could be used multiple times. \Lpack{hyperref} resets this. So here -% is our reset of that reset. +% \changes{v1.20}{2022/11/17}{Patch removed, by 2022 hyperref no longer change \cs{@starttoc}} +% ^^A \begin{macro}{\@starttoc} +% ^^A In memoir we altered \cs{@starttoc} such that \cs{tableofcontents} +% ^^A could be used multiple times. \Lpack{hyperref} resets this. So here +% ^^A is our reset of that reset. % \begin{macrocode} -\Hy@AtBeginDocument{% - \ifx\hyper@last\@undefined - \def\@starttoc#1{% - \begingroup\makeatletter - \IfFileExists{\jobname.#1}{% - \Hy@WarningNoLine{% - old #1 file detected, not used; run LaTeX again% - }% - }{}% - \if@filesw + % patch removed as per 2022 hyperref does not touch \@starttoc + % \Hy@AtBeginDocument{% + % \ifx\hyper@last\@undefined + % \def\@starttoc#1{% + % \begingroup\makeatletter + % \IfFileExists{\jobname.#1}{% + % \Hy@WarningNoLine{% + % old #1 file detected, not used; run LaTeX again% + % }% + % }{}% + % \if@filesw % \end{macrocode} -% We rewrite this part to match our definition. The rest is a copy -% from \texttt{hyperref.sty}. +% ^^A We rewrite this part to match our definition. The rest is a copy +% ^^A from \texttt{hyperref.sty}. % \begin{macrocode} - \AtEndDocument{% - \expandafter\ifx\csname tf@#1\endcsname\relax - \expandafter\newwrite\csname tf@#1\endcsname - \immediate\openout \csname tf@#1\endcsname \jobname.#1\relax - \fi - } - \fi - \@nobreakfalse - \endgroup - }% - \fi -} + % \AtEndDocument{% + % \expandafter\ifx\csname tf@#1\endcsname\relax + % \expandafter\newwrite\csname tf@#1\endcsname + % \immediate\openout \csname tf@#1\endcsname \jobname.#1\relax + % \fi + % } + % \fi + % \@nobreakfalse + % \endgroup + % }% + % \fi + % } % \end{macrocode} -% \end{macro} +% ^^A \end{macro} % % \changes{v3.6k}{2013/05/16}{Added hyperref support for page notes} % In order to enable hyperlinks for page notes, we need a few extra -- cgit v1.2.3