summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/base
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-21 22:53:09 +0000
committerKarl Berry <karl@freefriends.org>2020-02-21 22:53:09 +0000
commitb93c984f421e506f8757182f49b0668b84e6c8ec (patch)
tree65244e41027a3b278aa2f36c8e0a8306282cb2ef /Master/texmf-dist/tex/latex/base
parent53d7010a7c614b77eba1cd00904c13f751af7efd (diff)
latex (20feb20)
git-svn-id: svn://tug.org/texlive/trunk@53857 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/base')
-rw-r--r--Master/texmf-dist/tex/latex/base/latex.ltx41
-rw-r--r--Master/texmf-dist/tex/latex/base/latexrelease.sty39
2 files changed, 45 insertions, 35 deletions
diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx
index 904aed16900..2d0947157f1 100644
--- a/Master/texmf-dist/tex/latex/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex/base/latex.ltx
@@ -710,7 +710,7 @@
\def\fmtname{LaTeX2e}
\edef\fmtversion
{2020-02-02}
-\def\patch@level{2}
+\def\patch@level{3}
\edef\development@branch@name{}
\iffalse
\def\reserved@a#1/#2/#3\@nil{%
@@ -3252,8 +3252,9 @@ Type H <return> for immediate help.}%
\DeclareFontSeriesChangeRule {x}{?m}{m}{}
-\DeclareRobustCommand\fontseriesforce[1]{\edef\f@series{#1}}
-\DeclareRobustCommand\fontseries[1]{\merge@font@series{#1}}
+\newif\if@forced@series
+\DeclareRobustCommand\fontseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}}
+\DeclareRobustCommand\fontseries[1]{\@forced@seriesfalse\merge@font@series{#1}}
\def\merge@font@series#1{%
\expandafter\expandafter\expandafter
@@ -4632,26 +4633,22 @@ Type H <return> for immediate help.}%
\DeclareRobustCommand\bfseries{%
\not@math@alphabet\bfseries\mathbf
\expand@font@defaults
- \fontseries{%
- \ifx\f@family\rmdef@ult \bfseries@rm
- \else\ifx\f@family\sfdef@ult \bfseries@sf
- \else\ifx\f@family\ttdef@ult \bfseries@tt
- \else \bfdefault
+ \ifx\f@family\rmdef@ult \fontseries\bfseries@rm
+ \else\ifx\f@family\sfdef@ult \fontseries\bfseries@sf
+ \else\ifx\f@family\ttdef@ult \fontseries\bfseries@tt
+ \else \fontseries\bfdefault
\fi\fi\fi
- }%
\selectfont
}
\DeclareRobustCommand\mdseries{%
\not@math@alphabet\mdseries\relax
\expand@font@defaults
- \fontseries{%
- \ifx\f@family\rmdef@ult \mdseries@rm
- \else\ifx\f@family\sfdef@ult \mdseries@sf
- \else\ifx\f@family\ttdef@ult \mdseries@tt
- \else \mddefault
+ \ifx\f@family\rmdef@ult \fontseries\mdseries@rm
+ \else\ifx\f@family\sfdef@ult \fontseries\mdseries@sf
+ \else\ifx\f@family\ttdef@ult \fontseries\mdseries@tt
+ \else \fontseries\mddefault
\fi\fi\fi
- }%
\selectfont
}
@@ -4673,21 +4670,29 @@ Type H <return> for immediate help.}%
\let\@rmfamilyhook\@empty
\let\@sffamilyhook\@empty
\let\@ttfamilyhook\@empty
-
\def\@meta@family@list{\@elt{rm}\@elt{sf}\@elt{tt}}
\def\prepare@family@series@update#1#2{%
+ \if@forced@series
+ \fontfamily#2%
+ \else
\expand@font@defaults
\let\target@series@value\@empty
\def\target@meta@family@value{#1}%
+ \expandafter\edef\csname ??def@ult\endcsname{\f@family}%
\let\@elt\update@series@target@value
\@meta@family@list
+ \@elt{??}%
\let\@elt\relax
\fontfamily#2%
\ifx\target@series@value\@empty
\else
- \maybe@load@fontshape
- \let\f@series\target@series@value
+ \ifx \f@series\target@series@value
+ \else
+ \maybe@load@fontshape
+ \let\f@series\target@series@value
+ \fi
\fi
+ \fi
}
\def\update@series@target@value#1{%
\def\reserved@a{#1}%
diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty
index 0b9a8f883c4..c91e4353ab6 100644
--- a/Master/texmf-dist/tex/latex/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty
@@ -3797,26 +3797,22 @@ of this package available from CTAN}
\DeclareRobustCommand\bfseries{%
\not@math@alphabet\bfseries\mathbf
\expand@font@defaults
- \fontseries{%
- \ifx\f@family\rmdef@ult \bfseries@rm
- \else\ifx\f@family\sfdef@ult \bfseries@sf
- \else\ifx\f@family\ttdef@ult \bfseries@tt
- \else \bfdefault
+ \ifx\f@family\rmdef@ult \fontseries\bfseries@rm
+ \else\ifx\f@family\sfdef@ult \fontseries\bfseries@sf
+ \else\ifx\f@family\ttdef@ult \fontseries\bfseries@tt
+ \else \fontseries\bfdefault
\fi\fi\fi
- }%
\selectfont
}
\DeclareRobustCommand\mdseries{%
\not@math@alphabet\mdseries\relax
\expand@font@defaults
- \fontseries{%
- \ifx\f@family\rmdef@ult \mdseries@rm
- \else\ifx\f@family\sfdef@ult \mdseries@sf
- \else\ifx\f@family\ttdef@ult \mdseries@tt
- \else \mddefault
+ \ifx\f@family\rmdef@ult \fontseries\mdseries@rm
+ \else\ifx\f@family\sfdef@ult \fontseries\mdseries@sf
+ \else\ifx\f@family\ttdef@ult \fontseries\mdseries@tt
+ \else \fontseries\mddefault
\fi\fi\fi
- }%
\selectfont
}
@@ -3838,21 +3834,29 @@ of this package available from CTAN}
\let\@rmfamilyhook\@empty
\let\@sffamilyhook\@empty
\let\@ttfamilyhook\@empty
-
\def\@meta@family@list{\@elt{rm}\@elt{sf}\@elt{tt}}
\def\prepare@family@series@update#1#2{%
+ \if@forced@series
+ \fontfamily#2%
+ \else
\expand@font@defaults
\let\target@series@value\@empty
\def\target@meta@family@value{#1}%
+ \expandafter\edef\csname ??def@ult\endcsname{\f@family}%
\let\@elt\update@series@target@value
\@meta@family@list
+ \@elt{??}%
\let\@elt\relax
\fontfamily#2%
\ifx\target@series@value\@empty
\else
- \maybe@load@fontshape
- \let\f@series\target@series@value
+ \ifx \f@series\target@series@value
+ \else
+ \maybe@load@fontshape
+ \let\f@series\target@series@value
+ \fi
\fi
+ \fi
}
\def\update@series@target@value#1{%
\def\reserved@a{#1}%
@@ -5448,8 +5452,9 @@ of this package available from CTAN}
\DeclareFontSeriesChangeRule {x}{?m}{m}{}
-\DeclareRobustCommand\fontseriesforce[1]{\edef\f@series{#1}}
-\DeclareRobustCommand\fontseries[1]{\merge@font@series{#1}}
+\newif\if@forced@series
+\DeclareRobustCommand\fontseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}}
+\DeclareRobustCommand\fontseries[1]{\@forced@seriesfalse\merge@font@series{#1}}
\def\merge@font@series#1{%
\expandafter\expandafter\expandafter