texlive[65040] Master/texmf-dist: memoir (17nov22)

commits+karl at tug.org commits+karl at tug.org
Thu Nov 17 22:01:02 CET 2022


Revision: 65040
          http://tug.org/svn/texlive?view=revision&revision=65040
Author:   karl
Date:     2022-11-17 22:01:02 +0100 (Thu, 17 Nov 2022)
Log Message:
-----------
memoir (17nov22)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/memoir/README
    trunk/Master/texmf-dist/doc/latex/memoir/memman.pdf
    trunk/Master/texmf-dist/source/latex/memoir/memoir.dtx
    trunk/Master/texmf-dist/source/latex/memoir/mempatch.dtx
    trunk/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
    trunk/Master/texmf-dist/tex/latex/memoir/memoir.cls

Modified: trunk/Master/texmf-dist/doc/latex/memoir/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/memoir/README	2022-11-17 21:00:25 UTC (rev 65039)
+++ trunk/Master/texmf-dist/doc/latex/memoir/README	2022-11-17 21:01:02 UTC (rev 65040)
@@ -27,6 +27,32 @@
     Command glossary                                    ~  40 pages
     Bibliography, indexes                               ~  50 pages
 
+Changes (2022/11/17)
+
+o memoir v3.7.19
+
+-- changed version numbering to v3.7.<num> (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 at ... 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 at 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

Modified: trunk/Master/texmf-dist/doc/latex/memoir/memman.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/memoir/memoir.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/memoir/memoir.dtx	2022-11-17 21:00:25 UTC (rev 65039)
+++ trunk/Master/texmf-dist/source/latex/memoir/memoir.dtx	2022-11-17 21:01:02 UTC (rev 65040)
@@ -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}
 %<class>\ProvidesClass{memoir}%
-%<class>  [2022/07/29 v3.7r configurable book, report, article document class]
+%<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}
-%<class>\newcommand\memversion{v3.7r, 2022/07/29}
+%<class>\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 at 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 at book}{-2}
+\def\theHbook{\arabic{book}}
+\def\toclevel at 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 at part}
 % Needed if the \Lpack{hyperref} package is used.
 % \changes{v1.61803}{2008/01/30}{Added \cs{toclevel at part} (mempatch v4.9)}
+% \changes{v3.7.19}{2022/10/25}{Changing \cs{toclevel at part} definition to
+% \cs{def} for better compability with future hyperref}
 %    \begin{macrocode}
 \newcommand*{\toclevel at part}{-1}
 
@@ -23843,8 +23854,10 @@
 % \begin{macro}{\toclevel at chapter}
 % Needed if the \Lpack{hyperref} package is used.
 % \changes{v1.61803}{2008/01/30}{Added \cs{toclevel at chapter} (mempatch v4.9)}
+% \changes{v3.7.19}{2022/10/25}{Changing \cs{toclevel at chapter} definitions to
+% \cs{def} for better compability with future hyperref}
 %    \begin{macrocode}
-\newcommand*{\toclevel at chapter}{0}
+\def\toclevel at chapter{0}
 
 %    \end{macrocode}
 % \end{macro}
@@ -23865,10 +23878,12 @@
 % \begin{macro}{\toclevel at appendix}
 % Similar to \cs{l at chapter} but for an appendix.
 % \changes{v1.618}{2005/09/03}{Added \cs{l at apendix} (mempatch v3.12)}
+% \changes{v3.7.19}{2022/10/25}{Changing \cs{toclevel at appendix} definitions to
+% \cs{def} for better compability with future hyperref}
 %    \begin{macrocode}
 \newcommand*{\l at appendix}[2]{%
   \l at chapapp{#1}{#2}{\cftappendixname}}
-\newcommand{\toclevel at appendix}{0}
+\def\toclevel at appendix{0}
 
 %    \end{macrocode}
 % \end{macro}
@@ -24441,9 +24456,11 @@
 % as `division levels'.
 % \changes{v1.61803}{2008/01/30}{Added \cs{toclevel at none} and \cs{toclevel at all}
 %         (mempatch v4.4)}
+% \changes{v3.7.19}{2022/10/25}{Changing \cs{toclevel at ...} definitions to
+% \cs{def} for better compability with future hyperref}
 %    \begin{macrocode}
-\newcommand*{\toclevel at none}{-10}
-\newcommand*{\toclevel at all}{50}
+\def\toclevel at none{-10}
+\def\toclevel at all{50}
 
 %    \end{macrocode}
 % \end{macro}

Modified: trunk/Master/texmf-dist/source/latex/memoir/mempatch.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/memoir/mempatch.dtx	2022-11-17 21:00:25 UTC (rev 65039)
+++ trunk/Master/texmf-dist/source/latex/memoir/mempatch.dtx	2022-11-17 21:01:02 UTC (rev 65040)
@@ -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 at 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 at AtBeginDocument{%
-  \ifx\hyper at last\@undefined
-    \def\@starttoc#1{%
-      \begingroup\makeatletter
-        \IfFileExists{\jobname.#1}{%
-          \Hy at WarningNoLine{%
-            old #1 file detected, not used; run LaTeX again%
-          }%
-        }{}%
-        \if at filesw
+ % patch removed as per 2022 hyperref does not touch \@starttoc
+ % \Hy at AtBeginDocument{%
+ %   \ifx\hyper at last\@undefined
+ %    \def\@starttoc#1{%
+ %      \begingroup\makeatletter
+ %        \IfFileExists{\jobname.#1}{%
+ %          \Hy at WarningNoLine{%
+ %            old #1 file detected, not used; run LaTeX again%
+ %          }%
+ %        }{}%
+ %        \if at 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

Modified: trunk/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/memoir/memhfixc.sty	2022-11-17 21:00:25 UTC (rev 65039)
+++ trunk/Master/texmf-dist/tex/latex/memoir/memhfixc.sty	2022-11-17 21:01:02 UTC (rev 65040)
@@ -41,6 +41,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
@@ -62,7 +66,7 @@
 %% Version 1.1  2003/01/22
 %% Version 1.0  2002/10/22
 %%
-\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]
 \let\M at hfixcfinish\relax
 \@ifclassloaded{memoir}{}%
                        {\let\M at hfixcfinish\endinput
@@ -304,28 +308,29 @@
   }%
 \fi
 
-\Hy at AtBeginDocument{%
-  \ifx\hyper at last\@undefined
-    \def\@starttoc#1{%
-      \begingroup\makeatletter
-        \IfFileExists{\jobname.#1}{%
-          \Hy at WarningNoLine{%
-            old #1 file detected, not used; run LaTeX again%
-          }%
-        }{}%
-        \if at filesw
-        \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
-}
+ % patch removed as per 2022 hyperref does not touch \@starttoc
+ % \Hy at AtBeginDocument{%
+ %   \ifx\hyper at last\@undefined
+ %    \def\@starttoc#1{%
+ %      \begingroup\makeatletter
+ %        \IfFileExists{\jobname.#1}{%
+ %          \Hy at WarningNoLine{%
+ %            old #1 file detected, not used; run LaTeX again%
+ %          }%
+ %        }{}%
+ %        \if at filesw
+ %        \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
+ % }
 
 \ifHy at hyperfootnotes
   \let\m at m@pnwrite at fourtharg\m at m@pnwrite at fourtharg@hyperref

Modified: trunk/Master/texmf-dist/tex/latex/memoir/memoir.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/memoir/memoir.cls	2022-11-17 21:00:25 UTC (rev 65039)
+++ trunk/Master/texmf-dist/tex/latex/memoir/memoir.cls	2022-11-17 21:01:02 UTC (rev 65040)
@@ -28,8 +28,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{memoir}%
-  [2022/07/29 v3.7r configurable book, report, article document class]
-\newcommand\memversion{v3.7r, 2022/07/29}
+  [2022/11/17 v3.7.19 configurable book, report, article document class]
+\newcommand\memversion{v3.7.19, 2022/11/17}
 \RequirePackage{etoolbox}
 \newcommand*{\@ptsize}{}
 \newcommand*{\@memptsize}{}
@@ -406,8 +406,8 @@
 \newcommand*{\memRTLmainraggedright}{\raggedright}
 \newcommand*{\memRTLmainraggedleft}{\raggedleft}
 
-\newlength{\stockheight}
-\newlength{\stockwidth}
+\@ifundefined{stockwidth}{\newdimen{\stockheight}}{}
+\@ifundefined{stockwidth}{\newdimen{\stockwidth}}{}
 \newlength{\trimtop}
 \newlength{\trimedge}
 
@@ -2745,8 +2745,8 @@
     \@memback at floats
   \fi}
 
-\newcommand*{\theHbook}{\arabic{book}}
-\newcommand*{\toclevel at book}{-2}
+\def\theHbook{\arabic{book}}
+\def\toclevel at book{-2}
 
 \newcommand*{\book}{%
   \@setupbook
@@ -4995,7 +4995,7 @@
 
 \newcounter{verse}
 \setcounter{verse}{0}
-\newcommand{\theHpoemline}{\theverse.\thepoemline}
+\def\theHpoemline{\theverse.\thepoemline}
 
 \newenvironment{verse}[1][\linewidth]{%
   \refstepcounter{verse}%
@@ -8073,13 +8073,13 @@
 \newcommand*{\l at chapter}[2]{%
   \l at chapapp{#1}{#2}{\cftchaptername}}
 
-\newcommand*{\toclevel at chapter}{0}
+\def\toclevel at chapter{0}
 
 \newcommand*{\cftappendixname}{}
 
 \newcommand*{\l at appendix}[2]{%
   \l at chapapp{#1}{#2}{\cftappendixname}}
-\newcommand{\toclevel at appendix}{0}
+\def\toclevel at appendix{0}
 
 \newcommand*\chapternumberlinehook[1]{}
 \newcommand{\chapternumberline}[1]{%
@@ -8318,8 +8318,8 @@
      Type \space <return> and I'll continue.}%
   \fi}
 
-\newcommand*{\toclevel at none}{-10}
-\newcommand*{\toclevel at all}{50}
+\def\toclevel at none{-10}
+\def\toclevel at all{50}
 
 \DeclareRobustCommand{\changetocdepth}[1]{\setcounter{tocdepth}{#1}}
 



More information about the tex-live-commits mailing list.