summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex-dev/base/latex.ltx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-24 14:24:44 +0000
committerKarl Berry <karl@freefriends.org>2020-02-24 14:24:44 +0000
commit294bedbdf9c5683f570db4670f5b5d54e4b3fbcb (patch)
treea090ea734880e8726c54c8d42d3fc5b7b5fd203e /Master/texmf-dist/tex/latex-dev/base/latex.ltx
parent06b48ae1e077c886a68fba11d3b936eea1760303 (diff)
latex-base-dev (23feb20)
git-svn-id: svn://tug.org/texlive/trunk@53885 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.ltx45
1 files changed, 25 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
index 47da4e3c4c6..a772c09e7ff 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{-2}
+\def\patch@level{-4}
\edef\development@branch@name{develop \the\year-\the\month-\the\day}
\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}%
@@ -6964,7 +6969,7 @@ Type H <return> for immediate help.}%
\DeclareRobustCommand\thicklines{\let\@linefnt\tenlnw \let\@circlefnt\tencircw
\@wholewidth\fontdimen8\tenlnw \@halfwidth .5\@wholewidth}
\DeclareRobustCommand\linethickness[1]
- {\@wholewidth #1\relax \@halfwidth .5\@wholewidth}
+ {\@wholewidth #1\relax \@halfwidth .5\@wholewidth \ignorespaces}
\def\shortstack{\@ifnextchar[\@shortstack{\@shortstack[c]}}
\def\@shortstack[#1]{%
\leavevmode
@@ -9550,7 +9555,7 @@ Type H <return> for immediate help.}%
\else%
\@latex@warning@no@line%
{Writing or overwriting file `\@currdir\@curr@file'}%
- \immediate\openout\reserved@c#1\relax%
+ \immediate\openout\reserved@c\q@curr@file\relax%
\fi%
\fi%
\fi%