latex-base-dev (6mar20)

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

3 files changed, 180 insertions, 49 deletions

diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
index a772c09e7ff..716c9e21c85 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
@@ -710,7 +710,7 @@
 \def\fmtname{LaTeX2e}
 \edef\fmtversion
    {2020-10-01}
-\def\patch@level{-4}
+\def\patch@level{-5}
 \edef\development@branch@name{develop \the\year-\the\month-\the\day}
 \iffalse
 \def\reserved@a#1/#2/#3\@nil{%
@@ -991,6 +991,7 @@
 \@onlypreamble\@check@eq
 \long\def \@gobble #1{}
 \long\def \@gobbletwo #1#2{}
+\long\def \@gobblethree #1#2#3{}
 \long\def \@gobblefour #1#2#3#4{}
 \long\def\@firstofone#1{#1}
 \long\def\@firstoftwo#1#2{#1}
@@ -2393,9 +2394,16 @@ Type  H <return>  for immediate help.}%
    \expandafter\ifx\csname #1+#2\endcsname\relax
      \@latex@error{Font family `#1+#2' unknown}\@eha
    \else
+     \edef\reserved@a{#3}%
+     \series@maybe@drop@one@m\reserved@a\reserved@b
+     \ifx\reserved@a\reserved@b\else
+       \@latex@warning{Font shape declaration has incorrect series
+         value `#3'.\MessageBreak It should not contain an `m'!
+         Please correct it.\MessageBreak Found}%
+     \fi
      \expandafter
-       \xdef\csname#1/#2/#3/#4\endcsname{\expandafter\noexpand
-                                   \csname #5\endcsname}%
+       \xdef\csname#1/#2/\reserved@b/#4\endcsname
+                 {\expandafter\noexpand\csname #5\endcsname}%
      \def\reserved@a{#6}%
      \global
      \expandafter\let\csname#5\expandafter\endcsname
@@ -3295,10 +3303,25 @@ Type  H <return>  for immediate help.}%
 \DeclareFontSeriesChangeRule {m}{sc}{msc}{mc}
 \def\set@target@series#1{%
     \edef\f@series{#1}%
-    \edef\f@series{\expandafter\series@drop@one@m\f@series mm\series@drop@one@m}%
+    \series@maybe@drop@one@m\f@series\f@series
+}
+\def\series@maybe@drop@one@m#1{%
+  \expandafter\series@maybe@drop@one@m@x\expandafter{#1}}
+
+\def\series@maybe@drop@one@m@x#1#2{%
+  \def\in@@##1,#1,{}%
+  \series@check@toks\expandafter{\in@@
+    ,ulm,elm,lm,slm,mm,sbm,bm,ebm,ubm,muc,mec,mc,msc,msx,mx,mex,mux,{}{},#1,}%
+  \edef\in@@{\the\series@check@toks}%
+  \ifx\in@@\@empty
+    \def#2{#1}%
+  \else
+    \edef#2{\expandafter\series@drop@one@m #1m\series@drop@one@m}%
+  \fi
 }
+\newtoks\series@check@toks
 \def\series@drop@one@m#1m#2m#3\series@drop@one@m{%
-  \ifx\relax#1#2\relax m\else#1#2\fi
+   #1#2%
 }
 
 \def\DeclareFontShapeChangeRule #1#2#3#4{%
@@ -3306,14 +3329,17 @@ Type  H <return>  for immediate help.}%
 \DeclareRobustCommand\ulcshape
         {\not@math@alphabet\ulcshape\relax
          \fontshape\ulcdefault\selectfont}
+\let\ulcdefault\@undefined      % for rollback
 \newcommand\ulcdefault{ulc}
 \DeclareRobustCommand\swshape
         {\not@math@alphabet\swshape\relax
          \fontshape\swdefault\selectfont}
+\let\swdefault\@undefined      % for rollback
 \newcommand\swdefault{sw}
 \DeclareRobustCommand\sscshape
         {\not@math@alphabet\sscshape\relax
          \fontshape\sscdefault\selectfont}
+\let\sscdefault\@undefined      % for rollback
 \newcommand\sscdefault{ssc}
 \DeclareFontShapeChangeRule {n}{it}  {it}  {sl}
 \DeclareFontShapeChangeRule {n}{sl}  {sl}  {it}
@@ -4585,6 +4611,7 @@ Type  H <return>  for immediate help.}%
 \DeclareRobustCommand\itshape
         {\not@math@alphabet\itshape\mathit
          \fontshape\itdefault\selectfont}
+\let\DeclareFontSeriesDefault\@undefined      % for rollback
 \newcommand\DeclareFontSeriesDefault[3][]{%
   \def\reserved@a{#1}%
   \ifx\reserved@a\@empty
@@ -4625,8 +4652,8 @@ Type  H <return>  for immediate help.}%
   \edef\rmdef@ult{\rmdefault}%
   \edef\sfdef@ult{\sfdefault}%
   \edef\ttdef@ult{\ttdefault}%
-  \edef\bfdef@ult{\bfdefault}%
-  \edef\mddef@ult{\mddefault}%
+  \series@maybe@drop@one@m\bfdefault\bfdef@ult
+  \series@maybe@drop@one@m\mddefault\mddef@ult
   \edef\famdef@ult{\familydefault}%
 }
 
@@ -4689,7 +4716,7 @@ Type  H <return>  for immediate help.}%
      \ifx \f@series\target@series@value
      \else
        \maybe@load@fontshape
-       \let\f@series\target@series@value
+       \series@maybe@drop@one@m\target@series@value\f@series
      \fi
    \fi
  \fi
@@ -4704,9 +4731,14 @@ Type  H <return>  for immediate help.}%
                       \csname mdseries@\target@meta@family@value\endcsname
       \expandafter\let\expandafter\reserved@c
                       \csname bfseries@\target@meta@family@value\endcsname
-      \expandafter\ifx\csname mdseries@#1\endcsname\f@series
+      \expandafter\series@maybe@drop@one@m
+          \csname mdseries@#1\endcsname\reserved@d
+      \ifx\reserved@d\f@series
                                       \let\target@series@value\reserved@b
-      \else\expandafter\ifx\csname bfseries@#1\endcsname\f@series
+      \else
+        \expandafter\series@maybe@drop@one@m
+           \csname bfseries@#1\endcsname\reserved@d
+        \ifx\reserved@d\f@series
                                       \let\target@series@value\reserved@c
       \else\ifx\f@series\mddef@ult    \let\target@series@value\reserved@b
       \else\ifx\f@series\bfdef@ult    \let\target@series@value\reserved@c
diff --git a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
index 7bcc348b57c..3f688abfcec 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
@@ -3749,6 +3749,7 @@ of this package available from CTAN}
 %% all rights reserved.
 \IncludeInRelease{2020/02/02}%
                  {\DeclareFontSeriesDefault}{Custom series}%
+\let\DeclareFontSeriesDefault\@undefined      % for rollback
 \newcommand\DeclareFontSeriesDefault[3][]{%
   \def\reserved@a{#1}%
   \ifx\reserved@a\@empty
@@ -3789,8 +3790,8 @@ of this package available from CTAN}
   \edef\rmdef@ult{\rmdefault}%
   \edef\sfdef@ult{\sfdefault}%
   \edef\ttdef@ult{\ttdefault}%
-  \edef\bfdef@ult{\bfdefault}%
-  \edef\mddef@ult{\mddefault}%
+  \series@maybe@drop@one@m\bfdefault\bfdef@ult
+  \series@maybe@drop@one@m\mddefault\mddef@ult
   \edef\famdef@ult{\familydefault}%
 }
 
@@ -3853,7 +3854,7 @@ of this package available from CTAN}
      \ifx \f@series\target@series@value
      \else
        \maybe@load@fontshape
-       \let\f@series\target@series@value
+       \series@maybe@drop@one@m\target@series@value\f@series
      \fi
    \fi
  \fi
@@ -3868,9 +3869,14 @@ of this package available from CTAN}
                       \csname mdseries@\target@meta@family@value\endcsname
       \expandafter\let\expandafter\reserved@c
                       \csname bfseries@\target@meta@family@value\endcsname
-      \expandafter\ifx\csname mdseries@#1\endcsname\f@series
+      \expandafter\series@maybe@drop@one@m
+          \csname mdseries@#1\endcsname\reserved@d
+      \ifx\reserved@d\f@series
                                       \let\target@series@value\reserved@b
-      \else\expandafter\ifx\csname bfseries@#1\endcsname\f@series
+      \else
+        \expandafter\series@maybe@drop@one@m
+           \csname bfseries@#1\endcsname\reserved@d
+        \ifx\reserved@d\f@series
                                       \let\target@series@value\reserved@c
       \else\ifx\f@series\mddef@ult    \let\target@series@value\reserved@b
       \else\ifx\f@series\bfdef@ult    \let\target@series@value\reserved@c
@@ -4824,6 +4830,54 @@ of this package available from CTAN}
 
 %%% From File: ltfssbas.dtx
 %% Copyright (C) 1989-2002 Frank Mittelbach and Rainer Sch\"opf
+\IncludeInRelease{2020/02/02}%
+                 {\DeclareFontShape@}{Maybe drop one m}%
+\def\DeclareFontShape@#1#2#3#4#5#6{%
+   \expandafter\ifx\csname #1+#2\endcsname\relax
+     \@latex@error{Font family `#1+#2' unknown}\@eha
+   \else
+     \edef\reserved@a{#3}%
+     \series@maybe@drop@one@m\reserved@a\reserved@b
+     \ifx\reserved@a\reserved@b\else
+       \@latex@warning{Font shape declaration has incorrect series
+         value `#3'.\MessageBreak It should not contain an `m'!
+         Please correct it.\MessageBreak Found}%
+     \fi
+     \expandafter
+       \xdef\csname#1/#2/\reserved@b/#4\endcsname
+                 {\expandafter\noexpand\csname #5\endcsname}%
+     \def\reserved@a{#6}%
+     \global
+     \expandafter\let\csname#5\expandafter\endcsname
+        \ifx\reserved@a\@empty
+          \@empty
+        \else
+          \reserved@a
+        \fi
+   \fi
+  }
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+                 {\DeclareFontShape@}{Maybe drop one m}%
+
+\def\DeclareFontShape@#1#2#3#4#5#6{%
+   \expandafter\ifx\csname #1+#2\endcsname\relax
+     \@latex@error{Font family `#1+#2' unknown}\@eha
+   \else
+     \expandafter
+       \xdef\csname#1/#2/#3/#4\endcsname{\expandafter\noexpand
+                                   \csname #5\endcsname}%
+     \def\reserved@a{#6}%
+     \global
+     \expandafter\let\csname#5\expandafter\endcsname
+        \ifx\reserved@a\@empty
+          \@empty
+        \else
+          \reserved@a
+        \fi
+   \fi
+  }
+\EndIncludeInRelease
 \IncludeInRelease{2015/01/01}{\@DeclareMathSizes}%
                  {Arbitrary units in \DeclareMathSizes}%
 \def\@DeclareMathSizes #1#2#3#4#5{%
@@ -5509,10 +5563,25 @@ of this package available from CTAN}
 \DeclareFontSeriesChangeRule {m}{sc}{msc}{mc}
 \def\set@target@series#1{%
     \edef\f@series{#1}%
-    \edef\f@series{\expandafter\series@drop@one@m\f@series mm\series@drop@one@m}%
+    \series@maybe@drop@one@m\f@series\f@series
+}
+\def\series@maybe@drop@one@m#1{%
+  \expandafter\series@maybe@drop@one@m@x\expandafter{#1}}
+
+\def\series@maybe@drop@one@m@x#1#2{%
+  \def\in@@##1,#1,{}%
+  \series@check@toks\expandafter{\in@@
+    ,ulm,elm,lm,slm,mm,sbm,bm,ebm,ubm,muc,mec,mc,msc,msx,mx,mex,mux,{}{},#1,}%
+  \edef\in@@{\the\series@check@toks}%
+  \ifx\in@@\@empty
+    \def#2{#1}%
+  \else
+    \edef#2{\expandafter\series@drop@one@m #1m\series@drop@one@m}%
+  \fi
 }
+\newtoks\series@check@toks
 \def\series@drop@one@m#1m#2m#3\series@drop@one@m{%
-  \ifx\relax#1#2\relax m\else#1#2\fi
+   #1#2%
 }
 
 \def\DeclareFontShapeChangeRule #1#2#3#4{%
@@ -5520,14 +5589,17 @@ of this package available from CTAN}
 \DeclareRobustCommand\ulcshape
         {\not@math@alphabet\ulcshape\relax
          \fontshape\ulcdefault\selectfont}
+\let\ulcdefault\@undefined      % for rollback
 \newcommand\ulcdefault{ulc}
 \DeclareRobustCommand\swshape
         {\not@math@alphabet\swshape\relax
          \fontshape\swdefault\selectfont}
+\let\swdefault\@undefined      % for rollback
 \newcommand\swdefault{sw}
 \DeclareRobustCommand\sscshape
         {\not@math@alphabet\sscshape\relax
          \fontshape\sscdefault\selectfont}
+\let\sscdefault\@undefined      % for rollback
 \newcommand\sscdefault{ssc}
 \DeclareFontShapeChangeRule {n}{it}  {it}  {sl}
 \DeclareFontShapeChangeRule {n}{sl}  {sl}  {it}
@@ -5638,6 +5710,7 @@ of this package available from CTAN}
 \let\@font@shape@subst@warning\@undefined
 \let\maybe@load@fontshape\@undefined
 \let\set@target@series\@undefined
+\let\series@maybe@drop@one@m\@undefined
 \let\series@drop@one@m\@undefined
 \let\DeclareFontShapeChangeRule\@undefined
 \let\merge@font@shape\@undefined
@@ -6271,23 +6344,36 @@ of this package available from CTAN}
 %%% From File: ltexpl.dtx
 \IncludeInRelease{2020/02/02}%
                  {expl3}{Pre-load expl3}%
-\IfFileExists{expl3.ltx}
-  {%
-    \ifnum0%
-      \ifdefined\pdffilesize 1\fi
-      \ifdefined\filesize 1\fi
-      \ifdefined\luatexversion\ifnum\luatexversion>94 1\fi\fi
-      >0 %
-    \else
-      \message{Skipping expl3-dependent extensions}
-      \expandafter\@gobbletwo
-    \fi
-  }
-  {%
-    \message{Skipping expl3-dependent extensions}%
-    \@gobbletwo
-  }%
-\input{expl3.ltx}
+\expandafter\ifx\csname tex\string _let:D\endcsname\relax
+  \IfFileExists{expl3.ltx}
+    {%
+      \ifnum0%
+        \ifdefined\pdffilesize 1\fi
+        \ifdefined\filesize 1\fi
+        \ifdefined\luatexversion\ifnum\luatexversion>94 1\fi\fi
+        >0 %
+        \expandafter\@firstofone
+      \else
+        \message{Skipping expl3-dependent extensions}
+      \expandafter\@gobble
+      \fi
+    }
+    {%
+      \message{Skipping expl3-dependent extensions}%
+    \@gobble
+    }%
+    {%
+      \input{expl3.ltx}
+      \ifdefined\NewDocumentCommand
+      \else
+        \IfFileExists{xparse.ltx}
+          {\input{xparse.ltx}}
+          {}%
+       \fi
+    }%
+\else
+  \GenericInfo{}{Skipping: expl3 code already part of the format}
+\fi
 \EndIncludeInRelease
 %%% From File: ltfinal.dtx
 \IncludeInRelease{2015/01/01}%
diff --git a/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx b/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx
index cc67093fdbb..10d06c1f529 100644
--- a/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx
@@ -42,23 +42,36 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension .ins) which are part of the distribution.
 %%% From File: ltexpl.dtx
-\IfFileExists{expl3.ltx}
-  {%
-    \ifnum0%
-      \ifdefined\pdffilesize 1\fi
-      \ifdefined\filesize 1\fi
-      \ifdefined\luatexversion\ifnum\luatexversion>94 1\fi\fi
-      >0 %
-    \else
-      \message{Skipping expl3-dependent extensions}
+\expandafter\ifx\csname tex\string _let:D\endcsname\relax
+  \IfFileExists{expl3.ltx}
+    {%
+      \ifnum0%
+        \ifdefined\pdffilesize 1\fi
+        \ifdefined\filesize 1\fi
+        \ifdefined\luatexversion\ifnum\luatexversion>94 1\fi\fi
+        >0 %
+        \expandafter\@firstofone
+      \else
+        \message{Skipping expl3-dependent extensions}
       \expandafter\endinput
-    \fi
-  }
-  {%
-    \message{Skipping expl3-dependent extensions}%
+      \fi
+    }
+    {%
+      \message{Skipping expl3-dependent extensions}%
     \endinput
-  }%
-\input{expl3.ltx}
+    }%
+    {%
+      \input{expl3.ltx}
+      \ifdefined\NewDocumentCommand
+      \else
+        \IfFileExists{xparse.ltx}
+          {\input{xparse.ltx}}
+          {}%
+       \fi
+    }%
+\else
+  \GenericInfo{}{Skipping: expl3 code already part of the format}
+\fi
 \endinput
 %%
 %% End of file `ltexpl.ltx'.