memoir (21nov19)

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

2 files changed, 29 insertions, 26 deletions

diff --git a/Master/texmf-dist/tex/latex/memoir/mem9.clo b/Master/texmf-dist/tex/latex/memoir/mem9.clo
index 65721556a60..7c63169eaac 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem9.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem9.clo
@@ -27,7 +27,7 @@
 %%   This work consists of the files listed in the README file.
 %% 
 \ProvidesFile{mem9.clo}%
-             [2008/01/30 v0.4 memoir class 9pt size option]
+              [2008/01/30 v0.4 memoir class 9pt size option]
 \renewcommand{\normalsize}{%
    \@setfontsize\normalsize\@ixpt\@xpt
    \abovedisplayskip 9\p@ \@plus 2\p@ \@minus 4.5\p@
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index ca0603a7bc7..c351805fbc4 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}%
-  [2019/11/15 v3.7i configurable book, report, article document class]
-\newcommand\memversion{v3.7i, 2019/11/15}
+  [2019/11/21 v3.7j configurable book, report, article document class]
+\newcommand\memversion{v3.7j, 2019/11/21}
 \newcommand*{\@ptsize}{}
 \newcommand*{\@memptsize}{}
 \newlength{\onelineskip}
@@ -12929,43 +12929,46 @@
 \IfFileExists{textcase.sty}{
   \RequirePackage[overload]{textcase}
   }{% resort to the
-%%%% Nearly a carbon copy from textcase.dtx by David Carlisle
-\def\@uclcnotmath#1#2#3#4{\begingroup
-      #1%
+  \@memwarn{Haven't found the textcase package,\MessageBreak resorting to embedded
+   copy of v0.07 (2004/10/07),\MessageBreak consider installing the textcase package}
+%%%%      Nearly a carbon copy from textcase.dtx by David Carlisle
+%%%% Since we are inside a \IfFileExists we need to double the #/daleif
+\def\@uclcnotmath##1##2##3##4{\begingroup
+      ##1%
       \def\({$}\let\)\(% $ for emacs :-)
-      \def\NoCaseChange##1{\noexpand\NoCaseChange{\noexpand##1}}%
+      \def\NoCaseChange####1{\noexpand\NoCaseChange{\noexpand####1}}%
       \@nonchangecase\label
       \@nonchangecase\ref
       \@nonchangecase\ensuremath
-      \def\cite##1##{\toks@{\noexpand\cite##1}\@citex}%
-      \def\@citex##1{\NoCaseChange{\the\toks@{##1}}}%
-      \def\reserved@a##1##2{\let#2\reserved@a}%
+      \def\cite####1####{\toks@{\noexpand\cite####1}\@citex}%
+      \def\@citex####1{\NoCaseChange{\the\toks@{####1}}}%
+      \def\reserved@a####1####2{\let##2\reserved@a}%
       \expandafter\reserved@a\@uclclist\reserved@b{\reserved@b\@gobble}%
       \protected@edef\reserved@a{\endgroup
-          \noexpand\@skipmath#3#4$\valign$}%
+          \noexpand\@skipmath##3##4$\valign$}%
       \reserved@a}
-\def\@nonchangecase#1{\def#1##1{\NoCaseChange{#1{##1}}}}
+\def\@nonchangecase##1{\def##1####1{\NoCaseChange{##1{####1}}}}
 \let\NoCaseChange\@firstofone
-\def\@skipmath#1#2$#3${%
-  \@skip@nonchangecase#1#2\NoCaseChange\valign
-  \ifx\valign#3%
+\def\@skipmath##1##2$##3${%
+  \@skip@nonchangecase##1##2\NoCaseChange\valign
+  \ifx\valign##3%
   \else
-    $#3$%
-    \expandafter\@skipmath\expandafter#1%
+    $##3$%
+    \expandafter\@skipmath\expandafter##1%
   \fi}
-\def\@skip@nonchangecase#1#2\NoCaseChange#3{%
-  #1{#2}%
-  \ifx\valign#3%
+\def\@skip@nonchangecase##1##2\NoCaseChange##3{%
+  ##1{##2}%
+  \ifx\valign##3%
   \else
-    #3%
-    \expandafter\@skip@nonchangecase\expandafter#1%
+    ##3%
+    \expandafter\@skip@nonchangecase\expandafter##1%
   \fi}
 \DeclareRobustCommand\MakeTextUppercase{%
-  \@uclcnotmath{\def\i{I}\def\j{J}}{##1##2}\uppercase}
-\protected@edef\MakeTextUppercase#1{\MakeTextUppercase{#1}}
+  \@uclcnotmath{\def\i{I}\def\j{J}}{####1####2}\uppercase}
+\protected@edef\MakeTextUppercase##1{\MakeTextUppercase{##1}}
 \DeclareRobustCommand\MakeTextLowercase{%
-  \@uclcnotmath{}{##2##1}\lowercase}
-\protected@edef\MakeTextLowercase#1{\MakeTextLowercase{#1}}
+  \@uclcnotmath{}{####2####1}\lowercase}
+\protected@edef\MakeTextLowercase##1{\MakeTextLowercase{##1}}
 %%%% End copy from textcase.dtx
 } % end of \IfFileExists
 \newcommand*{\abstractname}{Abstract}