diff options
author | Karl Berry <karl@freefriends.org> | 2020-02-25 01:18:28 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-02-25 01:18:28 +0000 |
commit | 32a9c69b94accb39cfceebe78b4793af26540399 (patch) | |
tree | e5873118dc42aadff6c18faee4bd537c64da2e00 /Master/texmf-dist/source/latex/base | |
parent | 8df469c2d12aacda16ebd15fc2aefd9c075878d1 (diff) |
latex(2e) (25feb20)
git-svn-id: svn://tug.org/texlive/trunk@53898 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/base')
-rw-r--r-- | Master/texmf-dist/source/latex/base/ltclass.dtx | 5 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/base/ltfssbas.dtx | 52 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/base/ltvers.dtx | 2 |
3 files changed, 51 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltclass.dtx b/Master/texmf-dist/source/latex/base/ltclass.dtx index 96daa3aa30f..578443921b8 100644 --- a/Master/texmf-dist/source/latex/base/ltclass.dtx +++ b/Master/texmf-dist/source/latex/base/ltclass.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltclass.dtx} - [2020/02/05 v1.3i LaTeX Kernel (Class & Package Interface)] + [2020/02/20 v1.3j LaTeX Kernel (Class & Package Interface)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltclass.dtx} @@ -1911,6 +1911,7 @@ % (hopefully) safe. If not opened that means we are going to write % on the terminal. % \changes{v1.3g}{2020/01/27}{Fix typo in error message} +% \changes{v1.3j}{2020/02/20}{Fix missing quotes around file name (gh/284)} % \begin{macrocode} \ch@ck7\reserved@c\write\relax% \if@filesw% % Foul ... trying to overwrite \jobname! @@ -1920,7 +1921,7 @@ \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/source/latex/base/ltfssbas.dtx b/Master/texmf-dist/source/latex/base/ltfssbas.dtx index b59b0fafdd6..fedfcb68ec8 100644 --- a/Master/texmf-dist/source/latex/base/ltfssbas.dtx +++ b/Master/texmf-dist/source/latex/base/ltfssbas.dtx @@ -35,7 +35,7 @@ % % \ProvidesFile{ltfssbas.dtx} - [2019/12/17 v3.2e LaTeX Kernel (NFSS Basic Macros)] + [2020/02/24 v3.2f LaTeX Kernel (NFSS Basic Macros)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -245,23 +245,38 @@ % We use |\expandafter| |\endgroup| to restore catcode in case % something goes wrong with the argument parsing (suggested by Tim % Van Zandt) +% \begin{macrocode} + \expandafter\endgroup + \DeclareFontShape@} +% \end{macrocode} % \end{macro} % % % -% \begin{macro}{\DeclareFontShape} +% \begin{macro}{\DeclareFontShape@} % \changes{v2.1c}{1994/02/07}{revert catcode settings earlier} % \changes{v3.0m}{1995/11/01} % {(DPC) Test for \cs{relax} not \cs{undefined}, internal/1933} % \begin{macrocode} - \expandafter\endgroup - \DeclareFontShape@} +%</2ekernel> +%<*2ekernel|latexrelease> +%<latexrelease>\IncludeInRelease{2020/02/02}% +%<latexrelease> {\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 + \xdef\csname#1/#2/% +% \end{macrocode} +% If the series value is incorrectly specified with an extra ``m'', +% e.g., ``mc'' instead of just ``c'', drop the surplus ``m'' but +% keep the ``m'' if it is by its own. +% \changes{v3.2f}{2020/12/24}{Drop surplus ``m'' in series when +% defining fontshape (gh/289)} +% \begin{macrocode} + \expandafter\series@drop@one@m #3mm\series@drop@one@m/% + #4\endcsname{\expandafter\noexpand \csname #5\endcsname}% \def\reserved@a{#6}% \global @@ -274,6 +289,33 @@ \fi } % \end{macrocode} +% +% \begin{macrocode} +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\DeclareFontShape@}{Maybe drop one m}% +%<latexrelease> +%<latexrelease>\def\DeclareFontShape@#1#2#3#4#5#6{% +%<latexrelease> \expandafter\ifx\csname #1+#2\endcsname\relax +%<latexrelease> \@latex@error{Font family `#1+#2' unknown}\@eha +%<latexrelease> \else +%<latexrelease> \expandafter +%<latexrelease> \xdef\csname#1/#2/#3/#4\endcsname{\expandafter\noexpand +%<latexrelease> \csname #5\endcsname}% +%<latexrelease> \def\reserved@a{#6}% +%<latexrelease> \global +%<latexrelease> \expandafter\let\csname#5\expandafter\endcsname +%<latexrelease> \ifx\reserved@a\@empty +%<latexrelease> \@empty +%<latexrelease> \else +%<latexrelease> \reserved@a +%<latexrelease> \fi +%<latexrelease> \fi +%<latexrelease> } +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> +% \end{macrocode} % \end{macro} % % diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx index ce7a5d49d3b..b38dee39c89 100644 --- a/Master/texmf-dist/source/latex/base/ltvers.dtx +++ b/Master/texmf-dist/source/latex/base/ltvers.dtx @@ -115,7 +115,7 @@ {2020-02-02} %</2ekernel|latexrelease> %<*2ekernel> -\def\patch@level{3} +\def\patch@level{4} % \end{macrocode} % % \begin{macro}{\development@branch@name} |