From f230bae8f263f753df0d1f04a2d57a5ef1fd9b80 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 28 Feb 2020 22:28:01 +0000 Subject: latex (28feb20) git-svn-id: svn://tug.org/texlive/trunk@53958 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/base/README.md | 2 +- Master/texmf-dist/doc/latex/base/alltt.pdf | Bin 173077 -> 173077 bytes Master/texmf-dist/doc/latex/base/cfgguide.pdf | Bin 220211 -> 220211 bytes Master/texmf-dist/doc/latex/base/changes.txt | 18 +++++++ Master/texmf-dist/doc/latex/base/classes.pdf | Bin 521080 -> 521080 bytes Master/texmf-dist/doc/latex/base/clsguide.pdf | Bin 372505 -> 372505 bytes Master/texmf-dist/doc/latex/base/cmfonts.pdf | Bin 264453 -> 264453 bytes Master/texmf-dist/doc/latex/base/cyrguide.pdf | Bin 216976 -> 216976 bytes Master/texmf-dist/doc/latex/base/doc.pdf | Bin 629695 -> 629693 bytes Master/texmf-dist/doc/latex/base/docstrip.pdf | Bin 469433 -> 469438 bytes Master/texmf-dist/doc/latex/base/encguide.pdf | Bin 1532114 -> 1532114 bytes Master/texmf-dist/doc/latex/base/exscale.pdf | Bin 195880 -> 195880 bytes Master/texmf-dist/doc/latex/base/fix-cm.pdf | Bin 262051 -> 262051 bytes Master/texmf-dist/doc/latex/base/fntguide.pdf | Bin 360915 -> 361835 bytes Master/texmf-dist/doc/latex/base/fntguide.tex | 22 ++++++++- Master/texmf-dist/doc/latex/base/graphpap.pdf | Bin 156280 -> 156280 bytes Master/texmf-dist/doc/latex/base/ifthen.pdf | Bin 205205 -> 205205 bytes Master/texmf-dist/doc/latex/base/inputenc.pdf | Bin 294824 -> 294824 bytes Master/texmf-dist/doc/latex/base/latexchanges.pdf | Bin 231199 -> 232376 bytes Master/texmf-dist/doc/latex/base/latexchanges.tex | 16 +++++++ Master/texmf-dist/doc/latex/base/latexrelease.pdf | Bin 246174 -> 246174 bytes Master/texmf-dist/doc/latex/base/latexsym.pdf | Bin 192289 -> 192289 bytes Master/texmf-dist/doc/latex/base/lb2.pdf | Bin 138223 -> 138223 bytes Master/texmf-dist/doc/latex/base/letter.pdf | Bin 305150 -> 305154 bytes Master/texmf-dist/doc/latex/base/lgc2.pdf | Bin 101344 -> 101344 bytes Master/texmf-dist/doc/latex/base/ltluatex.pdf | Bin 304104 -> 304104 bytes Master/texmf-dist/doc/latex/base/ltnews.pdf | Bin 950041 -> 950041 bytes Master/texmf-dist/doc/latex/base/ltnews01.pdf | Bin 150020 -> 150020 bytes Master/texmf-dist/doc/latex/base/ltnews02.pdf | Bin 134750 -> 134750 bytes Master/texmf-dist/doc/latex/base/ltnews03.pdf | Bin 134730 -> 134730 bytes Master/texmf-dist/doc/latex/base/ltnews04.pdf | Bin 128768 -> 128768 bytes Master/texmf-dist/doc/latex/base/ltnews05.pdf | Bin 157174 -> 157174 bytes Master/texmf-dist/doc/latex/base/ltnews06.pdf | Bin 133132 -> 133132 bytes Master/texmf-dist/doc/latex/base/ltnews07.pdf | Bin 124028 -> 124028 bytes Master/texmf-dist/doc/latex/base/ltnews08.pdf | Bin 144471 -> 144471 bytes Master/texmf-dist/doc/latex/base/ltnews09.pdf | Bin 120208 -> 120208 bytes Master/texmf-dist/doc/latex/base/ltnews10.pdf | Bin 147941 -> 147941 bytes Master/texmf-dist/doc/latex/base/ltnews11.pdf | Bin 104942 -> 104942 bytes Master/texmf-dist/doc/latex/base/ltnews12.pdf | Bin 137918 -> 137918 bytes Master/texmf-dist/doc/latex/base/ltnews13.pdf | Bin 161066 -> 161066 bytes Master/texmf-dist/doc/latex/base/ltnews14.pdf | Bin 150920 -> 150920 bytes Master/texmf-dist/doc/latex/base/ltnews15.pdf | Bin 122088 -> 122088 bytes Master/texmf-dist/doc/latex/base/ltnews16.pdf | Bin 130688 -> 130688 bytes Master/texmf-dist/doc/latex/base/ltnews17.pdf | Bin 149835 -> 149835 bytes Master/texmf-dist/doc/latex/base/ltnews18.pdf | Bin 36003 -> 36003 bytes Master/texmf-dist/doc/latex/base/ltnews19.pdf | Bin 235068 -> 235068 bytes Master/texmf-dist/doc/latex/base/ltnews20.pdf | Bin 283323 -> 283323 bytes Master/texmf-dist/doc/latex/base/ltnews21.pdf | Bin 233491 -> 233491 bytes Master/texmf-dist/doc/latex/base/ltnews22.pdf | Bin 302835 -> 302835 bytes Master/texmf-dist/doc/latex/base/ltnews23.pdf | Bin 274453 -> 274453 bytes Master/texmf-dist/doc/latex/base/ltnews24.pdf | Bin 252641 -> 252641 bytes Master/texmf-dist/doc/latex/base/ltnews25.pdf | Bin 196325 -> 196325 bytes Master/texmf-dist/doc/latex/base/ltnews26.pdf | Bin 362836 -> 362836 bytes Master/texmf-dist/doc/latex/base/ltnews27.pdf | Bin 239755 -> 239755 bytes Master/texmf-dist/doc/latex/base/ltnews28.pdf | Bin 368228 -> 368228 bytes Master/texmf-dist/doc/latex/base/ltnews29.pdf | Bin 433006 -> 433006 bytes Master/texmf-dist/doc/latex/base/ltnews30.pdf | Bin 491245 -> 491245 bytes Master/texmf-dist/doc/latex/base/ltnews31.pdf | Bin 500186 -> 500186 bytes Master/texmf-dist/doc/latex/base/ltx3info.pdf | Bin 191528 -> 191528 bytes Master/texmf-dist/doc/latex/base/ltxdoc.pdf | Bin 215600 -> 215600 bytes Master/texmf-dist/doc/latex/base/makeindx.pdf | Bin 160673 -> 160673 bytes Master/texmf-dist/doc/latex/base/manual.pdf | Bin 151354 -> 151354 bytes Master/texmf-dist/doc/latex/base/modguide.pdf | Bin 220384 -> 220384 bytes Master/texmf-dist/doc/latex/base/nfssfont.pdf | Bin 202429 -> 202429 bytes Master/texmf-dist/doc/latex/base/proc.pdf | Bin 216899 -> 216899 bytes Master/texmf-dist/doc/latex/base/slides.pdf | Bin 352152 -> 352152 bytes Master/texmf-dist/doc/latex/base/slifonts.pdf | Bin 214708 -> 214708 bytes Master/texmf-dist/doc/latex/base/source2e.pdf | Bin 3108642 -> 3111674 bytes Master/texmf-dist/doc/latex/base/syntonly.pdf | Bin 181539 -> 181552 bytes Master/texmf-dist/doc/latex/base/tlc2.pdf | Bin 164949 -> 164949 bytes Master/texmf-dist/doc/latex/base/tulm.pdf | Bin 156534 -> 156534 bytes Master/texmf-dist/doc/latex/base/usrguide.pdf | Bin 398281 -> 398281 bytes Master/texmf-dist/doc/latex/base/utf8ienc.pdf | Bin 330720 -> 330893 bytes Master/texmf-dist/doc/latex/base/webcomp.pdf | Bin 136153 -> 136153 bytes Master/texmf-dist/source/latex/base/ltdefns.dtx | 6 ++- Master/texmf-dist/source/latex/base/ltfssaxes.dtx | 56 +++++++++++++++++++--- Master/texmf-dist/source/latex/base/ltfssbas.dtx | 36 ++++++++++---- Master/texmf-dist/source/latex/base/ltvers.dtx | 2 +- Master/texmf-dist/tex/latex/base/latex.ltx | 32 ++++++++++--- Master/texmf-dist/tex/latex/base/latexrelease.sty | 30 +++++++++--- 80 files changed, 188 insertions(+), 32 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/base/README.md b/Master/texmf-dist/doc/latex/base/README.md index c5ac5153116..6589e48ec23 100644 --- a/Master/texmf-dist/doc/latex/base/README.md +++ b/Master/texmf-dist/doc/latex/base/README.md @@ -1,7 +1,7 @@ The LaTeX kernel ================ -Release 2020-02-02 patch level 4 +Release 2020-02-02 patch level 5 Overview -------- diff --git a/Master/texmf-dist/doc/latex/base/alltt.pdf b/Master/texmf-dist/doc/latex/base/alltt.pdf index a5e5e91ef4e..781d001cca6 100644 Binary files a/Master/texmf-dist/doc/latex/base/alltt.pdf and b/Master/texmf-dist/doc/latex/base/alltt.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/cfgguide.pdf b/Master/texmf-dist/doc/latex/base/cfgguide.pdf index 450972786d2..2e6d623588a 100644 Binary files a/Master/texmf-dist/doc/latex/base/cfgguide.pdf and b/Master/texmf-dist/doc/latex/base/cfgguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/changes.txt b/Master/texmf-dist/doc/latex/base/changes.txt index 002ffef1724..ac32b7c7958 100644 --- a/Master/texmf-dist/doc/latex/base/changes.txt +++ b/Master/texmf-dist/doc/latex/base/changes.txt @@ -7,6 +7,24 @@ are not part of the distribution. ================================================================================ +######################### +# 2020-02-02 PL 5 Release +######################### + +2020-02-27 Frank Mittelbach + + * ltfssaxes.dtx (subsection{Changing to a new series}): + Drop ``m'' in a fixed set of series values, + otherwise assume that the series + value is a long name such as "semibold" and leave it alone (gh/293)} + + * ltfssbas.dtx (section{Macros for setting up the tables}): + Drop one ``m'' in the series values in \DeclareFontShape if it is + on of a fixed sets of values and if so issue warning (gh/293) + + * ltdefns.dtx (subsection{Command definitions}): + Added \@gobblethree + ######################### # 2020-02-02 PL 4 Release ######################### diff --git a/Master/texmf-dist/doc/latex/base/classes.pdf b/Master/texmf-dist/doc/latex/base/classes.pdf index 5fe2ec614c7..3ae02039f98 100644 Binary files a/Master/texmf-dist/doc/latex/base/classes.pdf and b/Master/texmf-dist/doc/latex/base/classes.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/clsguide.pdf b/Master/texmf-dist/doc/latex/base/clsguide.pdf index ff54e4b9556..044e350bd35 100644 Binary files a/Master/texmf-dist/doc/latex/base/clsguide.pdf and b/Master/texmf-dist/doc/latex/base/clsguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/cmfonts.pdf b/Master/texmf-dist/doc/latex/base/cmfonts.pdf index a6ff9e00bdc..d330f9a466e 100644 Binary files a/Master/texmf-dist/doc/latex/base/cmfonts.pdf and b/Master/texmf-dist/doc/latex/base/cmfonts.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/cyrguide.pdf b/Master/texmf-dist/doc/latex/base/cyrguide.pdf index e88e70e9390..0fbd119e9d7 100644 Binary files a/Master/texmf-dist/doc/latex/base/cyrguide.pdf and b/Master/texmf-dist/doc/latex/base/cyrguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/doc.pdf b/Master/texmf-dist/doc/latex/base/doc.pdf index 77b1452c8aa..6d9349c7adf 100644 Binary files a/Master/texmf-dist/doc/latex/base/doc.pdf and b/Master/texmf-dist/doc/latex/base/doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/docstrip.pdf b/Master/texmf-dist/doc/latex/base/docstrip.pdf index 6b1544b05e2..38337b7c322 100644 Binary files a/Master/texmf-dist/doc/latex/base/docstrip.pdf and b/Master/texmf-dist/doc/latex/base/docstrip.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/encguide.pdf b/Master/texmf-dist/doc/latex/base/encguide.pdf index e680378ccfe..20a49176567 100644 Binary files a/Master/texmf-dist/doc/latex/base/encguide.pdf and b/Master/texmf-dist/doc/latex/base/encguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/exscale.pdf b/Master/texmf-dist/doc/latex/base/exscale.pdf index c338d1092e4..27ab4c5121e 100644 Binary files a/Master/texmf-dist/doc/latex/base/exscale.pdf and b/Master/texmf-dist/doc/latex/base/exscale.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/fix-cm.pdf b/Master/texmf-dist/doc/latex/base/fix-cm.pdf index 54b085f8487..58c8537aa4c 100644 Binary files a/Master/texmf-dist/doc/latex/base/fix-cm.pdf and b/Master/texmf-dist/doc/latex/base/fix-cm.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/fntguide.pdf b/Master/texmf-dist/doc/latex/base/fntguide.pdf index edc6305f756..154f2b00c15 100644 Binary files a/Master/texmf-dist/doc/latex/base/fntguide.pdf and b/Master/texmf-dist/doc/latex/base/fntguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/fntguide.tex b/Master/texmf-dist/doc/latex/base/fntguide.tex index f19e0de7ba1..0c18661a316 100644 --- a/Master/texmf-dist/doc/latex/base/fntguide.tex +++ b/Master/texmf-dist/doc/latex/base/fntguide.tex @@ -229,7 +229,7 @@ ones are: \end{tabular} \end{minipage} \end{center} -\NEWdescription{2019/07/10} +\NEWdescription{2019/07/10}\label{page:seriesvalues} The font series is denoting a combination of the weight (boldness) and the width (amount of expansion). The standard supported for weights and widths are: @@ -1090,6 +1090,26 @@ contain: This enables the use of an alternative |\hyphenchar| in other encodings whilst maintaining the correct value for all fonts. +\NEWfeature{2020/02/02} According to NFSS conventions the series value +should be a combination of weight and width abbreviated each with one or +two letters as described on page~\pageref{page:seriesvalues}. In +particular it should not contain contain an ``\texttt{m}'' unless it +consists of just one character. In the past incorrect values such as +``\texttt{cm}'' were simply accepted, but since this now leads to +problems with the extended mechanism, the correct syntax is now +enforced. + +More exactly, if the series values is a member of a specific set of +values (\texttt{ulm}, \texttt{elm}, \texttt{lm}, \texttt{slm}, +\texttt{mm}, \texttt{sbm}, \texttt{bm}, \texttt{ebm}, \texttt{ubm}, +\texttt{muc}, \texttt{mec}, \texttt{mc}, \texttt{msc}, \texttt{msx}, +\texttt{mx}, \texttt{mex} or \texttt{mux}) it is assumed to be in +incorrect NFSS notation and so a warning is given and a surplus +``\texttt{m}'' is dropped. Other values are not touched to allow for +the usage of values like ``\texttt{semibold}'' or ``\texttt{medium}'' as +used by the \texttt{autoinst} program. + + \subsection{Font file loading information} \label{sec:loadinfo} diff --git a/Master/texmf-dist/doc/latex/base/graphpap.pdf b/Master/texmf-dist/doc/latex/base/graphpap.pdf index b4b010ee2c3..3b9066abf42 100644 Binary files a/Master/texmf-dist/doc/latex/base/graphpap.pdf and b/Master/texmf-dist/doc/latex/base/graphpap.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ifthen.pdf b/Master/texmf-dist/doc/latex/base/ifthen.pdf index c218d73665e..923858250e2 100644 Binary files a/Master/texmf-dist/doc/latex/base/ifthen.pdf and b/Master/texmf-dist/doc/latex/base/ifthen.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/inputenc.pdf b/Master/texmf-dist/doc/latex/base/inputenc.pdf index e8cd8241306..5dc879078db 100644 Binary files a/Master/texmf-dist/doc/latex/base/inputenc.pdf and b/Master/texmf-dist/doc/latex/base/inputenc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/latexchanges.pdf b/Master/texmf-dist/doc/latex/base/latexchanges.pdf index 61b12ab20cd..8b2520d441b 100644 Binary files a/Master/texmf-dist/doc/latex/base/latexchanges.pdf and b/Master/texmf-dist/doc/latex/base/latexchanges.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/latexchanges.tex b/Master/texmf-dist/doc/latex/base/latexchanges.tex index 1442ca229cb..8e1681c5e00 100644 --- a/Master/texmf-dist/doc/latex/base/latexchanges.tex +++ b/Master/texmf-dist/doc/latex/base/latexchanges.tex @@ -107,6 +107,22 @@ see for example +\section{Changes introduced in 2020-02-02 patch~5} + +The patch~4 dropped a bit too much in certain situations, e.g., it +changed a series value of \texttt{semibold} (as used by +\texttt{autoinst}) to \texttt{seibold}, rendering it useless. So we +now only correct series values if they are a member one of the +following list: \texttt{ulm}, \texttt{elm}, \texttt{lm}, \texttt{slm}, +\texttt{mm}, \texttt{sbm}, \texttt{bm}, \texttt{ebm}, \texttt{ubm}, +\texttt{muc}, \texttt{mec}, \texttt{mc}, \texttt{msc}, \texttt{msx}, +\texttt{mx}, \texttt{mex} or \texttt{mux}. Here we assume that people +intended to follow the NFSS convention but somehow got it wrong. So we +drop one ``m'' and also add a warning that the +\verb=\DeclareFontShape= declaration in question should be updated +(\ghissue{293}). + + \section{Changes introduced in 2020-02-02 patch~4} In some cases the \texttt{filecontents} environment was opening the diff --git a/Master/texmf-dist/doc/latex/base/latexrelease.pdf b/Master/texmf-dist/doc/latex/base/latexrelease.pdf index 6f83afba79d..1e450d49257 100644 Binary files a/Master/texmf-dist/doc/latex/base/latexrelease.pdf and b/Master/texmf-dist/doc/latex/base/latexrelease.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/latexsym.pdf b/Master/texmf-dist/doc/latex/base/latexsym.pdf index c5301dadf73..ee44228ca26 100644 Binary files a/Master/texmf-dist/doc/latex/base/latexsym.pdf and b/Master/texmf-dist/doc/latex/base/latexsym.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/lb2.pdf b/Master/texmf-dist/doc/latex/base/lb2.pdf index 214a5b5a2ea..8100b3efc06 100644 Binary files a/Master/texmf-dist/doc/latex/base/lb2.pdf and b/Master/texmf-dist/doc/latex/base/lb2.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/letter.pdf b/Master/texmf-dist/doc/latex/base/letter.pdf index 1f7dd2a0ae2..1627b8a9d00 100644 Binary files a/Master/texmf-dist/doc/latex/base/letter.pdf and b/Master/texmf-dist/doc/latex/base/letter.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/lgc2.pdf b/Master/texmf-dist/doc/latex/base/lgc2.pdf index 378045ff886..a30a3884eb7 100644 Binary files a/Master/texmf-dist/doc/latex/base/lgc2.pdf and b/Master/texmf-dist/doc/latex/base/lgc2.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltluatex.pdf b/Master/texmf-dist/doc/latex/base/ltluatex.pdf index 9b843654119..977a4186135 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltluatex.pdf and b/Master/texmf-dist/doc/latex/base/ltluatex.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews.pdf b/Master/texmf-dist/doc/latex/base/ltnews.pdf index fdd874ae570..c771eb2c011 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews.pdf and b/Master/texmf-dist/doc/latex/base/ltnews.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews01.pdf b/Master/texmf-dist/doc/latex/base/ltnews01.pdf index 04eaa53a503..ed276f3dc6f 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews01.pdf and b/Master/texmf-dist/doc/latex/base/ltnews01.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews02.pdf b/Master/texmf-dist/doc/latex/base/ltnews02.pdf index 8b6b7049d8c..e302c27ff77 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews02.pdf and b/Master/texmf-dist/doc/latex/base/ltnews02.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews03.pdf b/Master/texmf-dist/doc/latex/base/ltnews03.pdf index 1c53581470a..842ef7b7291 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews03.pdf and b/Master/texmf-dist/doc/latex/base/ltnews03.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews04.pdf b/Master/texmf-dist/doc/latex/base/ltnews04.pdf index ae2f8ffec4a..77b660fdc1e 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews04.pdf and b/Master/texmf-dist/doc/latex/base/ltnews04.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews05.pdf b/Master/texmf-dist/doc/latex/base/ltnews05.pdf index e1e06fdce27..5565bbff785 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews05.pdf and b/Master/texmf-dist/doc/latex/base/ltnews05.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews06.pdf b/Master/texmf-dist/doc/latex/base/ltnews06.pdf index 72d783c537a..04da9f5b984 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews06.pdf and b/Master/texmf-dist/doc/latex/base/ltnews06.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews07.pdf b/Master/texmf-dist/doc/latex/base/ltnews07.pdf index 670f748ab04..5f5d3ece1de 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews07.pdf and b/Master/texmf-dist/doc/latex/base/ltnews07.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews08.pdf b/Master/texmf-dist/doc/latex/base/ltnews08.pdf index f6ca68db8aa..e224c8c856f 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews08.pdf and b/Master/texmf-dist/doc/latex/base/ltnews08.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews09.pdf b/Master/texmf-dist/doc/latex/base/ltnews09.pdf index 8dd75d2a100..75c53dab17d 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews09.pdf and b/Master/texmf-dist/doc/latex/base/ltnews09.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews10.pdf b/Master/texmf-dist/doc/latex/base/ltnews10.pdf index fe0b41042e5..659fd94221a 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews10.pdf and b/Master/texmf-dist/doc/latex/base/ltnews10.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews11.pdf b/Master/texmf-dist/doc/latex/base/ltnews11.pdf index 06199153dd2..cbea4f1ab60 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews11.pdf and b/Master/texmf-dist/doc/latex/base/ltnews11.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews12.pdf b/Master/texmf-dist/doc/latex/base/ltnews12.pdf index c7845c9ef80..1cdc700d561 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews12.pdf and b/Master/texmf-dist/doc/latex/base/ltnews12.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews13.pdf b/Master/texmf-dist/doc/latex/base/ltnews13.pdf index ec3bb79e405..14f2adf6698 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews13.pdf and b/Master/texmf-dist/doc/latex/base/ltnews13.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews14.pdf b/Master/texmf-dist/doc/latex/base/ltnews14.pdf index 97572536eb3..7a9d27cf75c 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews14.pdf and b/Master/texmf-dist/doc/latex/base/ltnews14.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews15.pdf b/Master/texmf-dist/doc/latex/base/ltnews15.pdf index 4342f766a9b..65b136a4016 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews15.pdf and b/Master/texmf-dist/doc/latex/base/ltnews15.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews16.pdf b/Master/texmf-dist/doc/latex/base/ltnews16.pdf index 9596ff2dc46..b591f573727 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews16.pdf and b/Master/texmf-dist/doc/latex/base/ltnews16.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews17.pdf b/Master/texmf-dist/doc/latex/base/ltnews17.pdf index 4d5769dbf8a..9dba7d0dab1 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews17.pdf and b/Master/texmf-dist/doc/latex/base/ltnews17.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews18.pdf b/Master/texmf-dist/doc/latex/base/ltnews18.pdf index 1423d091982..00e010c4bdb 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews18.pdf and b/Master/texmf-dist/doc/latex/base/ltnews18.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews19.pdf b/Master/texmf-dist/doc/latex/base/ltnews19.pdf index e3dd768981b..99d49ce1606 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews19.pdf and b/Master/texmf-dist/doc/latex/base/ltnews19.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews20.pdf b/Master/texmf-dist/doc/latex/base/ltnews20.pdf index a5ca847e315..0204949b53e 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews20.pdf and b/Master/texmf-dist/doc/latex/base/ltnews20.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews21.pdf b/Master/texmf-dist/doc/latex/base/ltnews21.pdf index 5810d0bf87b..bb0d2dc5c3d 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews21.pdf and b/Master/texmf-dist/doc/latex/base/ltnews21.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews22.pdf b/Master/texmf-dist/doc/latex/base/ltnews22.pdf index 68dfa0947c0..dbfd0e3d524 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews22.pdf and b/Master/texmf-dist/doc/latex/base/ltnews22.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews23.pdf b/Master/texmf-dist/doc/latex/base/ltnews23.pdf index 03eb1ac7647..abae6798fed 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews23.pdf and b/Master/texmf-dist/doc/latex/base/ltnews23.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews24.pdf b/Master/texmf-dist/doc/latex/base/ltnews24.pdf index 0f21c981bb1..5972ff359d9 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews24.pdf and b/Master/texmf-dist/doc/latex/base/ltnews24.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews25.pdf b/Master/texmf-dist/doc/latex/base/ltnews25.pdf index d766eac5b66..596ac14433c 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews25.pdf and b/Master/texmf-dist/doc/latex/base/ltnews25.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews26.pdf b/Master/texmf-dist/doc/latex/base/ltnews26.pdf index b46844e18d8..d50c1e4157c 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews26.pdf and b/Master/texmf-dist/doc/latex/base/ltnews26.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews27.pdf b/Master/texmf-dist/doc/latex/base/ltnews27.pdf index 4c1d47b2df3..fe24251a6e3 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews27.pdf and b/Master/texmf-dist/doc/latex/base/ltnews27.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews28.pdf b/Master/texmf-dist/doc/latex/base/ltnews28.pdf index d125191dae4..b8be6715985 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews28.pdf and b/Master/texmf-dist/doc/latex/base/ltnews28.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews29.pdf b/Master/texmf-dist/doc/latex/base/ltnews29.pdf index 8e3d912e8c9..1834909510a 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews29.pdf and b/Master/texmf-dist/doc/latex/base/ltnews29.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews30.pdf b/Master/texmf-dist/doc/latex/base/ltnews30.pdf index 37d9bf704ad..49269ac1a2c 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews30.pdf and b/Master/texmf-dist/doc/latex/base/ltnews30.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltnews31.pdf b/Master/texmf-dist/doc/latex/base/ltnews31.pdf index ec1ce7e4b56..ef27cd9f96d 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltnews31.pdf and b/Master/texmf-dist/doc/latex/base/ltnews31.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltx3info.pdf b/Master/texmf-dist/doc/latex/base/ltx3info.pdf index 943f721f939..06a7c70b3d3 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltx3info.pdf and b/Master/texmf-dist/doc/latex/base/ltx3info.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf index 4d3b1945574..faae246cd27 100644 Binary files a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf and b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/makeindx.pdf b/Master/texmf-dist/doc/latex/base/makeindx.pdf index 7e4449f2279..c04a87e618f 100644 Binary files a/Master/texmf-dist/doc/latex/base/makeindx.pdf and b/Master/texmf-dist/doc/latex/base/makeindx.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/manual.pdf b/Master/texmf-dist/doc/latex/base/manual.pdf index 2c164483917..7d59a86c76c 100644 Binary files a/Master/texmf-dist/doc/latex/base/manual.pdf and b/Master/texmf-dist/doc/latex/base/manual.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/modguide.pdf b/Master/texmf-dist/doc/latex/base/modguide.pdf index 5c2511393cc..7f218eea10f 100644 Binary files a/Master/texmf-dist/doc/latex/base/modguide.pdf and b/Master/texmf-dist/doc/latex/base/modguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/nfssfont.pdf b/Master/texmf-dist/doc/latex/base/nfssfont.pdf index f27620a3ca2..be79c9b1292 100644 Binary files a/Master/texmf-dist/doc/latex/base/nfssfont.pdf and b/Master/texmf-dist/doc/latex/base/nfssfont.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/proc.pdf b/Master/texmf-dist/doc/latex/base/proc.pdf index 33c7b74736b..498beac0bb1 100644 Binary files a/Master/texmf-dist/doc/latex/base/proc.pdf and b/Master/texmf-dist/doc/latex/base/proc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/slides.pdf b/Master/texmf-dist/doc/latex/base/slides.pdf index 99b9144c2dd..fa258cff072 100644 Binary files a/Master/texmf-dist/doc/latex/base/slides.pdf and b/Master/texmf-dist/doc/latex/base/slides.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/slifonts.pdf b/Master/texmf-dist/doc/latex/base/slifonts.pdf index dc88bca51b6..af1c18085a8 100644 Binary files a/Master/texmf-dist/doc/latex/base/slifonts.pdf and b/Master/texmf-dist/doc/latex/base/slifonts.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/source2e.pdf b/Master/texmf-dist/doc/latex/base/source2e.pdf index 82d453e69c1..8af94cb6580 100644 Binary files a/Master/texmf-dist/doc/latex/base/source2e.pdf and b/Master/texmf-dist/doc/latex/base/source2e.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/syntonly.pdf b/Master/texmf-dist/doc/latex/base/syntonly.pdf index 07ad7328286..9849a16e558 100644 Binary files a/Master/texmf-dist/doc/latex/base/syntonly.pdf and b/Master/texmf-dist/doc/latex/base/syntonly.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/tlc2.pdf b/Master/texmf-dist/doc/latex/base/tlc2.pdf index a018e819598..0791805e77f 100644 Binary files a/Master/texmf-dist/doc/latex/base/tlc2.pdf and b/Master/texmf-dist/doc/latex/base/tlc2.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/tulm.pdf b/Master/texmf-dist/doc/latex/base/tulm.pdf index 90918b8c2be..5818aa99a51 100644 Binary files a/Master/texmf-dist/doc/latex/base/tulm.pdf and b/Master/texmf-dist/doc/latex/base/tulm.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/usrguide.pdf b/Master/texmf-dist/doc/latex/base/usrguide.pdf index 141948cc9fa..95438446b97 100644 Binary files a/Master/texmf-dist/doc/latex/base/usrguide.pdf and b/Master/texmf-dist/doc/latex/base/usrguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf index 4ccd4dc614f..6b2ed3009b8 100644 Binary files a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf and b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf differ diff --git a/Master/texmf-dist/doc/latex/base/webcomp.pdf b/Master/texmf-dist/doc/latex/base/webcomp.pdf index 1506af3d452..1732a9a4d4c 100644 Binary files a/Master/texmf-dist/doc/latex/base/webcomp.pdf and b/Master/texmf-dist/doc/latex/base/webcomp.pdf differ diff --git a/Master/texmf-dist/source/latex/base/ltdefns.dtx b/Master/texmf-dist/source/latex/base/ltdefns.dtx index ae472966d57..303b9e5604b 100644 --- a/Master/texmf-dist/source/latex/base/ltdefns.dtx +++ b/Master/texmf-dist/source/latex/base/ltdefns.dtx @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltdefns.dtx} - [2019/08/27 v1.5f LaTeX Kernel (definition commands)] + [2020/02/27 v1.5g LaTeX Kernel (definition commands)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltdefns.dtx} @@ -888,17 +888,21 @@ % % \begin{macro}{\@gobble} % \begin{macro}{\@gobbletwo} +% \begin{macro}{\@gobblethree} +% \changes{v1.5g}{2020/02/27}{Macro added} % \begin{macro}{\@gobblefour} % \changes{v1.2n}{1995/05/26}{(CAR) Added \cs{long}s} % The |\@gobble| macro is used to get rid of its argument. % \begin{macrocode} \long\def \@gobble #1{} \long\def \@gobbletwo #1#2{} +\long\def \@gobblethree #1#2#3{} \long\def \@gobblefour #1#2#3#4{} % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \begin{macro}{\@firstofone} % \begin{macro}{\@firstoftwo} diff --git a/Master/texmf-dist/source/latex/base/ltfssaxes.dtx b/Master/texmf-dist/source/latex/base/ltfssaxes.dtx index 1a8dbd9cfba..02a49a3122d 100644 --- a/Master/texmf-dist/source/latex/base/ltfssaxes.dtx +++ b/Master/texmf-dist/source/latex/base/ltfssaxes.dtx @@ -35,7 +35,7 @@ % % \ProvidesFile{ltfssaxes.dtx} - [2020/02/18 v1.0c LaTeX Kernel (NFSS Axes handing)] + [2020/02/27 v1.0d LaTeX Kernel (NFSS Axes handing)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -827,7 +827,6 @@ % % % \begin{macro}{\set@target@series} -% \begin{macro}{\series@drop@one@m} % % Finally the code for normalizing the \cs{f@series} value. % @@ -845,21 +844,63 @@ \def\set@target@series#1{% % \end{macrocode} % We need to \cs{edef} the argument first in case it starts with a -% conditional. +% conditional. Then we check (and perhaps drop) an ``m'' from the +% value andassign the result to \cs{f@series}. +% \changes{v1.0d}{2020/02/27}{Drop ``m'' only in a specific set of values (gh/293)} % \begin{macrocode} \edef\f@series{#1}% - \edef\f@series{\expandafter\series@drop@one@m\f@series mm\series@drop@one@m}% + \expandafter\series@maybe@drop@one@m\expandafter{\f@series}\f@series +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\series@maybe@drop@one@m} +% If the series value is in NFSS notation then it should not +% contain any ``m'' unless it is just an ``m'' by it own. So we +% need to drop surplus ``m''s. But we better don't do this for full +% names, such as ``\texttt{semibold}'' as used by +% \texttt{autoinst}, for example. So we test against the possible +% explicit values that should drop an ``m''. +% After that we assign the result to \verb=#2= for further use. +% \changes{v1.0d}{2020/02/27}{Drop ``m'' in certain values from a +% fixed list (gh/293)} +% \begin{macrocode} +\def\series@maybe@drop@one@m#1#2{% +% \end{macrocode} +% The code below is an inline version of the \cs{in@} macro without +% the group, so that it works in \cs{accent}. +% \begin{macrocode} + \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 } % \end{macrocode} +% As a precaution we use a private toks register not \cs{toks@} as +% that is no longer hidden inside the group. +% \begin{macrocode} +\newtoks\series@check@toks +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\series@drop@one@m} % Drop up to two \texttt{m}s but keep one if that makes the series -% value empty. +% value empty. Actually, with the current implementation we know +% that there is at least one in the series value istelf and we +% added one after it, so all we have to do is now returning +% \verb=#1#2= and dropping the rest. % \begin{macrocode} \def\series@drop@one@m#1m#2m#3\series@drop@one@m{% - \ifx\relax#1#2\relax m\else#1#2\fi +% \ifx\relax#1#2\relax m\else#1#2\fi + #1#2% } % \end{macrocode} % \end{macro} -% \end{macro} @@ -1215,6 +1256,7 @@ %\let\@font@shape@subst@warning\@undefined %\let\maybe@load@fontshape\@undefined %\let\set@target@series\@undefined +%\let\series@maybe@drop@one@m\@undefined %\let\series@drop@one@m\@undefined %\let\DeclareFontShapeChangeRule\@undefined %\let\merge@font@shape\@undefined diff --git a/Master/texmf-dist/source/latex/base/ltfssbas.dtx b/Master/texmf-dist/source/latex/base/ltfssbas.dtx index fedfcb68ec8..f51d742d466 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} - [2020/02/24 v3.2f LaTeX Kernel (NFSS Basic Macros)] + [2020/02/27 v3.2g LaTeX Kernel (NFSS Basic Macros)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -266,18 +266,38 @@ \expandafter\ifx\csname #1+#2\endcsname\relax \@latex@error{Font family `#1+#2' unknown}\@eha \else - \expandafter - \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 +% keep the ``m'' if it is by its own. In that case also issue a +% warning that the declaration needs correction. +% \changes{v3.2f}{2020/02/24}{Drop surplus ``m'' in series when % defining fontshape (gh/289)} +% \changes{v3.2g}{2020/02/27}{Only ``m'' if the series value is a member +% of a fixed list and issue warning if doing it (gh/293)} +% +% For this we compare the given value \verb=#3= with one where we +% may have dropped an ``m''. If nothing has changes, +% fine. Otherwise there was a wrong value which is now corrected in +% \cs{reservedb} so we use that and also issue a warning. +% \begin{macrocode} + \edef\reserved@a{#3}% + \expandafter\series@maybe@drop@one@m\expandafter{#3}\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/\reserved@b/#4\endcsname + {\expandafter\noexpand\csname #5\endcsname}% +% +% \end{macrocode} +% Most of the time \verb=#6= is empty so using \cs{let} to +% \cs{@empty} saves on space compared to using \cs{def}. That's +% really one of the old space saving techniques and probably not +% necessary these days. % \begin{macrocode} - \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 diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx index b38dee39c89..f13a6ae6851 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> -\def\patch@level{4} +\def\patch@level{5} % \end{macrocode} % % \begin{macro}{\development@branch@name} diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index 09f921e2795..4b3cccd20d1 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{4} +\def\patch@level{5} \edef\development@branch@name{} \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,11 +2394,16 @@ Type H for immediate help.}% \expandafter\ifx\csname #1+#2\endcsname\relax \@latex@error{Font family `#1+#2' unknown}\@eha \else + \edef\reserved@a{#3}% + \expandafter\series@maybe@drop@one@m\expandafter{#3}\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/% - \expandafter\series@drop@one@m #3mm\series@drop@one@m/% - #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 @@ -3297,10 +3303,22 @@ Type H 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}% + \expandafter\series@maybe@drop@one@m\expandafter{\f@series}\f@series +} +\def\series@maybe@drop@one@m#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{% diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty index 11e6ea016af..353f2aa7c5f 100644 --- a/Master/texmf-dist/tex/latex/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty @@ -4816,11 +4816,16 @@ of this package available from CTAN} \expandafter\ifx\csname #1+#2\endcsname\relax \@latex@error{Font family `#1+#2' unknown}\@eha \else + \edef\reserved@a{#3}% + \expandafter\series@maybe@drop@one@m\expandafter{#3}\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/% - \expandafter\series@drop@one@m #3mm\series@drop@one@m/% - #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 @@ -5538,10 +5543,22 @@ of this package available from CTAN} \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}% + \expandafter\series@maybe@drop@one@m\expandafter{\f@series}\f@series +} +\def\series@maybe@drop@one@m#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{% @@ -5667,6 +5684,7 @@ of this package available from CTAN} \let\@font@shape@subst@warning\@undefined \let\maybe@load@fontshape\@undefined \let\set@target@series\@undefined +\let\series@maybe@drop@one@m\@undefined \let\series@drop@one@m\@undefined \let\DeclareFontShapeChangeRule\@undefined \let\merge@font@shape\@undefined -- cgit v1.2.3