summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/base
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/base')
-rw-r--r--Master/texmf-dist/tex/latex/base/latex.ltx8
-rw-r--r--Master/texmf-dist/tex/latex/base/latexrelease.sty45
2 files changed, 49 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx
index 2d0947157f1..09f921e2795 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{3}
+\def\patch@level{4}
\edef\development@branch@name{}
\iffalse
\def\reserved@a#1/#2/#3\@nil{%
@@ -2394,7 +2394,9 @@ Type H <return> for immediate help.}%
\@latex@error{Font family `#1+#2' unknown}\@eha
\else
\expandafter
- \xdef\csname#1/#2/#3/#4\endcsname{\expandafter\noexpand
+ \xdef\csname#1/#2/%
+ \expandafter\series@drop@one@m #3mm\series@drop@one@m/%
+ #4\endcsname{\expandafter\noexpand
\csname #5\endcsname}%
\def\reserved@a{#6}%
\global
@@ -9551,7 +9553,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%
diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty
index c91e4353ab6..11e6ea016af 100644
--- a/Master/texmf-dist/tex/latex/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty
@@ -2841,7 +2841,7 @@ of this package available from CTAN}
\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%
@@ -4810,6 +4810,49 @@ 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
+ \expandafter
+ \xdef\csname#1/#2/%
+ \expandafter\series@drop@one@m #3mm\series@drop@one@m/%
+ #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{%