diff options
author | Karl Berry <karl@freefriends.org> | 2020-03-06 21:30:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-03-06 21:30:29 +0000 |
commit | 42ae3845f0172233885a1e6895a92093a68c2711 (patch) | |
tree | d60870f6d24352167dc84504cfc459c144f4fc44 /Master/texmf-dist/tex/latex-dev/base/latex.ltx | |
parent | 79c7361836cfe04ef5ad28226f59da581b8484dd (diff) |
latex-base-dev (6mar20)
git-svn-id: svn://tug.org/texlive/trunk@54129 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex-dev/base/latex.ltx')
-rw-r--r-- | Master/texmf-dist/tex/latex-dev/base/latex.ltx | 52 |
1 files changed, 42 insertions, 10 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 |