memoir (2jun20)

git-svn-id: svn://tug.org/texlive/trunk@55388 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 28 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README
index f27ca28265b..d50c43f4746 100644
--- a/Master/texmf-dist/doc/latex/memoir/README
+++ b/Master/texmf-dist/doc/latex/memoir/README
@@ -28,6 +28,14 @@ o Backmatter:
     Bibliography, indexes                               ~  50 pages
 
 
+Changed (2020/06/02)
+
+o memoir v3.7l
+
+-- Minute change in preparation for october kernel update (several
+   amsmath spacing functions will be moved to the kernel, we made
+   versions of these also usable in the text, so will the kernel).
+
 
 Changed (2020/03/25)
 
diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf
index 4f0f3125698..17ba03ba7a7 100644
--- a/Master/texmf-dist/doc/latex/memoir/memman.pdf
+++ b/Master/texmf-dist/doc/latex/memoir/memman.pdf
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx
index 1d45b947278..be0f5d3651f 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{31149}
+% \CheckSum{31157}
 %
 % \changes{v0.1}{2001/05/20}{First public alpha release}
 % \changes{v0.2}{2001/06/03}{First beta release}
@@ -121,6 +121,7 @@
 % \changes{v3.7j}{2019/11/21}{Typo in embeded textcase, now that it is
 %                             inside \cs{IfFileExists} \# needs to be doubled}
 % \changes{v3.7k}{2020/03/25}{Maintenance} 
+% \changes{v3.7l}{2020/06/02}{Small preparation for october kernel update} 
 %                             
 % \def\dtxfile{memoir.dtx}
 %
@@ -180,6 +181,7 @@
 % \def\fileversion{v3.7i}          \def\filedate{2019/11/15} 
 % \def\fileversion{v3.7j}          \def\filedate{2019/11/21} 
 % \def\fileversion{v3.7k}          \def\filedate{2020/03/25} 
+% \def\fileversion{v3.7l}          \def\filedate{2020/06/02} 
 % \title{The LaTeX \Lpack{memoir} class for configurable book 
 %        typesetting: Source code\thanks{This
 %        file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -410,11 +412,11 @@
 %    Announce the name, option files and version for LaTeX2e files:
 %    \begin{macrocode}
 %<class>\ProvidesClass{memoir}%
-%<class>  [2020/03/25 v3.7k configurable book, report, article document class]
+%<class>  [2020/06/02 v3.7l 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.7k, 2020/03/25}
+%<class>\newcommand\memversion{v3.7l, 2020/06/02}
 %<9pt>\ProvidesFile{mem9.clo}%
 %<9pt>              [2008/01/30 v0.4 memoir class 9pt size option]
 %<10pt>\ProvidesFile{mem10.clo}%
@@ -34454,6 +34456,14 @@
 % the kernel's \\
 % \verb?\, (\thinspace) = 3/18 em?
 % \changes{v1.4}{2003/11/16}{Extra text spacing macros from patch v1.4}
+% \changes{v3.7l}{2020/06/02}{Added kernel wrapper}
+% As of the kernel/format update for october 2020, these will be moved
+% to the kernel, so we remove them of you are using that kernel.
+%    \begin{macrocode}
+\@ifl@t@r\fmtversion{2020-10-01}{
+  % nothing to do with newer kernel
+}{%
+%    \end{macrocode}
 % \begin{macro}{\medspace}
 % \begin{macro}{\:}
 % Medium space \verb?\: (\medspace) = 4/18 em?
@@ -34473,6 +34483,7 @@
 \DeclareRobustCommand{\!}{%
   \relax\ifmmode\mskip-\thinmuskip\else\negthinspace\fi}
 
+} % end kernel version wrapper
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index 5f8c4a9dcb4..65017bee089 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}%
-  [2020/03/25 v3.7k configurable book, report, article document class]
-\newcommand\memversion{v3.7k, 2020/03/25}
+  [2020/06/02 v3.7l configurable book, report, article document class]
+\newcommand\memversion{v3.7l, 2020/06/02}
 \newcommand*{\@ptsize}{}
 \newcommand*{\@memptsize}{}
 \newlength{\onelineskip}
@@ -12187,12 +12187,16 @@
   \vfuzz\hfuzz}
 \newenvironment{midsloppypar}{\par\midsloppy}{\par}
 
+\@ifl@t@r\fmtversion{2020-10-01}{
+  % nothing to do with newer kernel
+}{%
 \newcommand{\medspace}{\kern .22222em }
 \DeclareRobustCommand{\:}{%
   \relax\ifmmode\mskip\medmuskip\else\medspace\fi}
 \DeclareRobustCommand{\!}{%
   \relax\ifmmode\mskip-\thinmuskip\else\negthinspace\fi}
 
+} % end kernel version wrapper
 \DeclareRobustCommand*{\slashfracstyle}[1]{%
   {\m@th\ensuremath{\mbox{\fontsize\sf@size\z@\selectfont #1}}}}
 \DeclareRobustCommand*{\slashfrac}[2]{\leavevmode