From 42ae3845f0172233885a1e6895a92093a68c2711 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 6 Mar 2020 21:30:29 +0000 Subject: latex-base-dev (6mar20) git-svn-id: svn://tug.org/texlive/trunk@54129 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex-dev/base/README.md | 2 +- Master/texmf-dist/doc/latex-dev/base/alltt.pdf | Bin 173077 -> 173077 bytes Master/texmf-dist/doc/latex-dev/base/cfgguide.pdf | Bin 220211 -> 220211 bytes Master/texmf-dist/doc/latex-dev/base/changes.txt | 45 ++++++- Master/texmf-dist/doc/latex-dev/base/classes.pdf | Bin 521080 -> 521080 bytes Master/texmf-dist/doc/latex-dev/base/clsguide.pdf | Bin 372505 -> 372505 bytes Master/texmf-dist/doc/latex-dev/base/cmfonts.pdf | Bin 264453 -> 264453 bytes Master/texmf-dist/doc/latex-dev/base/cyrguide.pdf | Bin 216976 -> 216976 bytes Master/texmf-dist/doc/latex-dev/base/doc.pdf | Bin 629729 -> 629318 bytes Master/texmf-dist/doc/latex-dev/base/docstrip.pdf | Bin 469471 -> 469448 bytes Master/texmf-dist/doc/latex-dev/base/encguide.pdf | Bin 1532114 -> 1532114 bytes Master/texmf-dist/doc/latex-dev/base/exscale.pdf | Bin 195880 -> 195880 bytes Master/texmf-dist/doc/latex-dev/base/fix-cm.pdf | Bin 262051 -> 262051 bytes Master/texmf-dist/doc/latex-dev/base/fntguide.pdf | Bin 360915 -> 361810 bytes Master/texmf-dist/doc/latex-dev/base/fntguide.tex | 22 +++- Master/texmf-dist/doc/latex-dev/base/graphpap.pdf | Bin 156280 -> 156280 bytes Master/texmf-dist/doc/latex-dev/base/ifthen.pdf | Bin 205205 -> 205205 bytes Master/texmf-dist/doc/latex-dev/base/inputenc.pdf | Bin 294824 -> 294824 bytes .../texmf-dist/doc/latex-dev/base/latexchanges.pdf | Bin 231085 -> 232380 bytes .../texmf-dist/doc/latex-dev/base/latexchanges.tex | 19 +++ .../texmf-dist/doc/latex-dev/base/latexrelease.pdf | Bin 246174 -> 246174 bytes Master/texmf-dist/doc/latex-dev/base/latexsym.pdf | Bin 192289 -> 192289 bytes Master/texmf-dist/doc/latex-dev/base/lb2.pdf | Bin 138223 -> 138223 bytes Master/texmf-dist/doc/latex-dev/base/letter.pdf | Bin 305194 -> 304792 bytes Master/texmf-dist/doc/latex-dev/base/lgc2.pdf | Bin 101344 -> 101344 bytes Master/texmf-dist/doc/latex-dev/base/ltluatex.pdf | Bin 304104 -> 304104 bytes Master/texmf-dist/doc/latex-dev/base/ltnews.pdf | Bin 956541 -> 959539 bytes Master/texmf-dist/doc/latex-dev/base/ltnews01.pdf | Bin 150020 -> 150020 bytes Master/texmf-dist/doc/latex-dev/base/ltnews02.pdf | Bin 134750 -> 134750 bytes Master/texmf-dist/doc/latex-dev/base/ltnews03.pdf | Bin 134730 -> 134730 bytes Master/texmf-dist/doc/latex-dev/base/ltnews04.pdf | Bin 128768 -> 128768 bytes Master/texmf-dist/doc/latex-dev/base/ltnews05.pdf | Bin 157174 -> 157174 bytes Master/texmf-dist/doc/latex-dev/base/ltnews06.pdf | Bin 133132 -> 133132 bytes Master/texmf-dist/doc/latex-dev/base/ltnews07.pdf | Bin 124028 -> 124028 bytes Master/texmf-dist/doc/latex-dev/base/ltnews08.pdf | Bin 144471 -> 144471 bytes Master/texmf-dist/doc/latex-dev/base/ltnews09.pdf | Bin 120208 -> 120208 bytes Master/texmf-dist/doc/latex-dev/base/ltnews10.pdf | Bin 147941 -> 147941 bytes Master/texmf-dist/doc/latex-dev/base/ltnews11.pdf | Bin 104942 -> 104942 bytes Master/texmf-dist/doc/latex-dev/base/ltnews12.pdf | Bin 137918 -> 137918 bytes Master/texmf-dist/doc/latex-dev/base/ltnews13.pdf | Bin 161066 -> 161066 bytes Master/texmf-dist/doc/latex-dev/base/ltnews14.pdf | Bin 150920 -> 150920 bytes Master/texmf-dist/doc/latex-dev/base/ltnews15.pdf | Bin 122088 -> 122088 bytes Master/texmf-dist/doc/latex-dev/base/ltnews16.pdf | Bin 130688 -> 130688 bytes Master/texmf-dist/doc/latex-dev/base/ltnews17.pdf | Bin 149835 -> 149835 bytes Master/texmf-dist/doc/latex-dev/base/ltnews18.pdf | Bin 36003 -> 36003 bytes Master/texmf-dist/doc/latex-dev/base/ltnews19.pdf | Bin 235068 -> 235068 bytes Master/texmf-dist/doc/latex-dev/base/ltnews20.pdf | Bin 283323 -> 283323 bytes Master/texmf-dist/doc/latex-dev/base/ltnews21.pdf | Bin 233491 -> 233491 bytes Master/texmf-dist/doc/latex-dev/base/ltnews22.pdf | Bin 302835 -> 302835 bytes Master/texmf-dist/doc/latex-dev/base/ltnews23.pdf | Bin 274453 -> 274453 bytes Master/texmf-dist/doc/latex-dev/base/ltnews24.pdf | Bin 252641 -> 252641 bytes Master/texmf-dist/doc/latex-dev/base/ltnews25.pdf | Bin 196325 -> 196325 bytes Master/texmf-dist/doc/latex-dev/base/ltnews26.pdf | Bin 362836 -> 362836 bytes Master/texmf-dist/doc/latex-dev/base/ltnews27.pdf | Bin 239755 -> 239755 bytes Master/texmf-dist/doc/latex-dev/base/ltnews28.pdf | Bin 368228 -> 368228 bytes Master/texmf-dist/doc/latex-dev/base/ltnews29.pdf | Bin 433006 -> 433006 bytes Master/texmf-dist/doc/latex-dev/base/ltnews30.pdf | Bin 491245 -> 491245 bytes Master/texmf-dist/doc/latex-dev/base/ltnews31.pdf | Bin 500199 -> 500199 bytes Master/texmf-dist/doc/latex-dev/base/ltnews32.pdf | Bin 333725 -> 344268 bytes Master/texmf-dist/doc/latex-dev/base/ltnews32.tex | 44 +++++-- Master/texmf-dist/doc/latex-dev/base/ltx3info.pdf | Bin 191528 -> 191528 bytes Master/texmf-dist/doc/latex-dev/base/ltxdoc.pdf | Bin 215600 -> 215600 bytes Master/texmf-dist/doc/latex-dev/base/makeindx.pdf | Bin 160673 -> 160673 bytes Master/texmf-dist/doc/latex-dev/base/manual.pdf | Bin 151354 -> 151354 bytes Master/texmf-dist/doc/latex-dev/base/modguide.pdf | Bin 220384 -> 220384 bytes Master/texmf-dist/doc/latex-dev/base/nfssfont.pdf | Bin 202429 -> 202429 bytes Master/texmf-dist/doc/latex-dev/base/proc.pdf | Bin 216899 -> 216899 bytes Master/texmf-dist/doc/latex-dev/base/slides.pdf | Bin 351660 -> 351660 bytes Master/texmf-dist/doc/latex-dev/base/slifonts.pdf | Bin 214708 -> 214708 bytes Master/texmf-dist/doc/latex-dev/base/source2e.pdf | Bin 3108047 -> 3117644 bytes Master/texmf-dist/doc/latex-dev/base/syntonly.pdf | Bin 181576 -> 181181 bytes Master/texmf-dist/doc/latex-dev/base/tlc2.pdf | Bin 164949 -> 164949 bytes Master/texmf-dist/doc/latex-dev/base/tulm.pdf | Bin 156534 -> 156534 bytes Master/texmf-dist/doc/latex-dev/base/usrguide.pdf | Bin 398281 -> 398281 bytes Master/texmf-dist/doc/latex-dev/base/utf8ienc.pdf | Bin 330919 -> 330773 bytes Master/texmf-dist/doc/latex-dev/base/webcomp.pdf | Bin 136153 -> 136153 bytes .../texmf-dist/source/latex-dev/base/ltclass.dtx | 6 +- .../texmf-dist/source/latex-dev/base/ltdefns.dtx | 6 +- Master/texmf-dist/source/latex-dev/base/ltexpl.dtx | 58 ++++++--- .../texmf-dist/source/latex-dev/base/ltfssaxes.dtx | 65 ++++++++-- .../texmf-dist/source/latex-dev/base/ltfssbas.dtx | 74 +++++++++++- .../texmf-dist/source/latex-dev/base/ltfssini.dtx | 50 ++++++-- Master/texmf-dist/source/latex-dev/base/ltvers.dtx | 12 +- Master/texmf-dist/tex/latex-dev/base/latex.ltx | 52 ++++++-- .../texmf-dist/tex/latex-dev/base/latexrelease.sty | 134 +++++++++++++++++---- Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx | 43 ++++--- 86 files changed, 529 insertions(+), 103 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex-dev/base/README.md b/Master/texmf-dist/doc/latex-dev/base/README.md index b1e0da2aefb..95c699fdeac 100644 --- a/Master/texmf-dist/doc/latex-dev/base/README.md +++ b/Master/texmf-dist/doc/latex-dev/base/README.md @@ -1,7 +1,7 @@ The LaTeX kernel ================ -Release 2020-02-02 pre-release 4 +Release 2020-10-01 pre-release 5 Overview -------- diff --git a/Master/texmf-dist/doc/latex-dev/base/alltt.pdf b/Master/texmf-dist/doc/latex-dev/base/alltt.pdf index 17dfc861e41..1e49f05ae1b 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/alltt.pdf and b/Master/texmf-dist/doc/latex-dev/base/alltt.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/cfgguide.pdf b/Master/texmf-dist/doc/latex-dev/base/cfgguide.pdf index b5bfde7242d..f5a3e684254 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/cfgguide.pdf and b/Master/texmf-dist/doc/latex-dev/base/cfgguide.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/changes.txt b/Master/texmf-dist/doc/latex-dev/base/changes.txt index bb0c31288bb..96654ea52b0 100644 --- a/Master/texmf-dist/doc/latex-dev/base/changes.txt +++ b/Master/texmf-dist/doc/latex-dev/base/changes.txt @@ -6,12 +6,32 @@ completeness or accuracy and it contains some references to files that are not part of the distribution. ================================================================================ +2020-03-05 Joseph Wright + + * ltexpl.dtx: Pre-load xparse where expl3 does not define \NewDocumentCommand + +2020-03-02 Frank Mittelbach + + * ltfssini.dtx (section{Custom series settings for main document families}): + Ensure that \DeclareFontSeriesDefault is undefined + before using \newcommand in rollback (gh/295) + + * ltfssaxes.dtx (section{Changing the shape}): + Ensure that \ulcdefault, \swdefault and \sscdefault are undefined + before using \newcommand in rollback (gh/295) + +2020-02-25 Frank Mittelbach + + * ltfssini.dtx (section{Custom series settings for main document families}): + Drop any surplus ``m'' from \bfdef@ult, \mddef@ult and other + places (gh/291) + 2020-02-18 Frank Mittelbach * ltmath.dtx (subsubsection{Flush left equations}): Make \mathindent a skip register to match amsmath (gh/252) - Separate formula and eqn number by a compressable space when + Separate formula and eqn number by a compressible space when fleqn option is in force. 2020-02-14 Frank Mittelbach @@ -30,10 +50,33 @@ All changes above are only part of the development branch for the next release. ================================================================================ +######################### +# 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 ######################### +2020-02-24 Frank Mittelbach + + * ltfssbas.dtx (section{Macros for setting up the tables}): + Drop surplus ``m'' in series when defining fontshape (gh/289) + 2020-02-21 Frank Mittelbach * ltclass.dtx (subsection{Providing shipment}): diff --git a/Master/texmf-dist/doc/latex-dev/base/classes.pdf b/Master/texmf-dist/doc/latex-dev/base/classes.pdf index 36dd536c826..f72dae4514d 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/classes.pdf and b/Master/texmf-dist/doc/latex-dev/base/classes.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/clsguide.pdf b/Master/texmf-dist/doc/latex-dev/base/clsguide.pdf index 227220ee8b3..b0459b419bc 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/clsguide.pdf and b/Master/texmf-dist/doc/latex-dev/base/clsguide.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/cmfonts.pdf b/Master/texmf-dist/doc/latex-dev/base/cmfonts.pdf index 562ebc1ed59..b942338d530 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/cmfonts.pdf and b/Master/texmf-dist/doc/latex-dev/base/cmfonts.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/cyrguide.pdf b/Master/texmf-dist/doc/latex-dev/base/cyrguide.pdf index 5ac7c0a51c4..a2f9f702ce6 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/cyrguide.pdf and b/Master/texmf-dist/doc/latex-dev/base/cyrguide.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/doc.pdf b/Master/texmf-dist/doc/latex-dev/base/doc.pdf index 9b9a2da5a1c..88da0aa9843 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/doc.pdf and b/Master/texmf-dist/doc/latex-dev/base/doc.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/docstrip.pdf b/Master/texmf-dist/doc/latex-dev/base/docstrip.pdf index 3ca1968ce89..dc31dee8fa7 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/docstrip.pdf and b/Master/texmf-dist/doc/latex-dev/base/docstrip.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/encguide.pdf b/Master/texmf-dist/doc/latex-dev/base/encguide.pdf index 367d7577a79..64ceff2a9a5 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/encguide.pdf and b/Master/texmf-dist/doc/latex-dev/base/encguide.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/exscale.pdf b/Master/texmf-dist/doc/latex-dev/base/exscale.pdf index a584441052c..2912bad8fd8 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/exscale.pdf and b/Master/texmf-dist/doc/latex-dev/base/exscale.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/fix-cm.pdf b/Master/texmf-dist/doc/latex-dev/base/fix-cm.pdf index 975cdc3c9b7..856c5c0ec27 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/fix-cm.pdf and b/Master/texmf-dist/doc/latex-dev/base/fix-cm.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/fntguide.pdf b/Master/texmf-dist/doc/latex-dev/base/fntguide.pdf index c44cbb4561d..46a96dcb9a2 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/fntguide.pdf and b/Master/texmf-dist/doc/latex-dev/base/fntguide.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/fntguide.tex b/Master/texmf-dist/doc/latex-dev/base/fntguide.tex index f19e0de7ba1..8610bc99f77 100644 --- a/Master/texmf-dist/doc/latex-dev/base/fntguide.tex +++ b/Master/texmf-dist/doc/latex-dev/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 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-dev/base/graphpap.pdf b/Master/texmf-dist/doc/latex-dev/base/graphpap.pdf index 8718025defc..8c59ea26510 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/graphpap.pdf and b/Master/texmf-dist/doc/latex-dev/base/graphpap.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ifthen.pdf b/Master/texmf-dist/doc/latex-dev/base/ifthen.pdf index 43cf7e863cf..be07cdedb5d 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ifthen.pdf and b/Master/texmf-dist/doc/latex-dev/base/ifthen.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/inputenc.pdf b/Master/texmf-dist/doc/latex-dev/base/inputenc.pdf index 45c2c0ebfaf..48d288b0de0 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/inputenc.pdf and b/Master/texmf-dist/doc/latex-dev/base/inputenc.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/latexchanges.pdf b/Master/texmf-dist/doc/latex-dev/base/latexchanges.pdf index ac91adda03c..4730d7f8cd4 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/latexchanges.pdf and b/Master/texmf-dist/doc/latex-dev/base/latexchanges.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/latexchanges.tex b/Master/texmf-dist/doc/latex-dev/base/latexchanges.tex index d8bb8207f92..dc8eb4be4eb 100644 --- a/Master/texmf-dist/doc/latex-dev/base/latexchanges.tex +++ b/Master/texmf-dist/doc/latex-dev/base/latexchanges.tex @@ -107,12 +107,31 @@ 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 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 file for writing without quoting it, so that files with spaces failed (\ghissue{284}). +Ensure that \verb=\DeclareFontShape= drops surplus ``m'' in situations +where an \texttt{.fd} incorrectly specifies \texttt{mc} instead of +\texttt{c}, etc.\ (\ghissue{289}). \section{Changes introduced in 2020-02-02 patch~3} diff --git a/Master/texmf-dist/doc/latex-dev/base/latexrelease.pdf b/Master/texmf-dist/doc/latex-dev/base/latexrelease.pdf index 5e0b477eae4..396d04c8f5c 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/latexrelease.pdf and b/Master/texmf-dist/doc/latex-dev/base/latexrelease.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/latexsym.pdf b/Master/texmf-dist/doc/latex-dev/base/latexsym.pdf index 8014a5078d5..f6b265cee54 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/latexsym.pdf and b/Master/texmf-dist/doc/latex-dev/base/latexsym.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/lb2.pdf b/Master/texmf-dist/doc/latex-dev/base/lb2.pdf index c21331d340a..b04c71d42c7 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/lb2.pdf and b/Master/texmf-dist/doc/latex-dev/base/lb2.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/letter.pdf b/Master/texmf-dist/doc/latex-dev/base/letter.pdf index 1d7dc7bb9c6..ef5e8173e4d 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/letter.pdf and b/Master/texmf-dist/doc/latex-dev/base/letter.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/lgc2.pdf b/Master/texmf-dist/doc/latex-dev/base/lgc2.pdf index 5afcd11bab8..d365e0f353f 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/lgc2.pdf and b/Master/texmf-dist/doc/latex-dev/base/lgc2.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltluatex.pdf b/Master/texmf-dist/doc/latex-dev/base/ltluatex.pdf index 3f5257fd6ec..86769bca60e 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltluatex.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltluatex.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews.pdf index 77564e46090..ef7aa51e08b 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews01.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews01.pdf index e5e4d434fb0..44694047ca3 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews01.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews01.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews02.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews02.pdf index 99d06d9a91f..b43d192424c 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews02.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews02.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews03.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews03.pdf index 2c85575c8a5..4ccdc3613b1 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews03.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews03.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews04.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews04.pdf index d25f6243c64..7c8c60445db 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews04.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews04.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews05.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews05.pdf index 01faeb219a5..e4e3b4a417b 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews05.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews05.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews06.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews06.pdf index f7a2174a764..33b0dd42c9e 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews06.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews06.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews07.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews07.pdf index 9b1971b1716..45aab0c7572 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews07.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews07.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews08.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews08.pdf index 6411707ae64..20e8980064c 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews08.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews08.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews09.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews09.pdf index e4638e44aca..5c59f4537b7 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews09.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews09.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews10.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews10.pdf index 113610aa98e..93cabf0b38d 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews10.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews10.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews11.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews11.pdf index 8c3c4f24885..c5697130111 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews11.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews11.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews12.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews12.pdf index 8f277763523..b0cebe5ef1e 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews12.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews12.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews13.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews13.pdf index 797a7d4876f..99a85c75dbb 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews13.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews13.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews14.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews14.pdf index ad31b78431f..e9c7b3c0e6b 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews14.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews14.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews15.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews15.pdf index f5859f67add..9cb9472821d 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews15.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews15.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews16.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews16.pdf index d31ee4e7603..61ddf3036ff 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews16.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews16.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews17.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews17.pdf index 27cbed34007..1136df63b6b 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews17.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews17.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews18.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews18.pdf index 58e5a826a7b..6b925fb64c1 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews18.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews18.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews19.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews19.pdf index 90d8e7e25f9..e307c301b85 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews19.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews19.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews20.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews20.pdf index 543b2ff90f0..4115da16dd7 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews20.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews20.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews21.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews21.pdf index 12aa5ccff5d..890e6ca687d 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews21.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews21.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews22.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews22.pdf index b106c51d344..9b46a670496 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews22.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews22.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews23.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews23.pdf index 1675f45cfe6..6b95b99e639 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews23.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews23.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews24.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews24.pdf index 8f207102524..9100081fade 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews24.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews24.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews25.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews25.pdf index 5a1cb20add2..24c36ca0b73 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews25.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews25.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews26.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews26.pdf index 68165d1d3ff..bfda22ad971 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews26.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews26.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews27.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews27.pdf index 6cd653cf8a4..a4a4e355f69 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews27.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews27.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews28.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews28.pdf index f1f10a8f7b2..3fd460e3970 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews28.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews28.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews29.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews29.pdf index e2e800f4506..63b04671376 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews29.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews29.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews30.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews30.pdf index 56f39b08006..bef0c7e1943 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews30.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews30.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews31.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews31.pdf index e2e6d9068cc..62024ac7f87 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews31.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews31.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews32.pdf b/Master/texmf-dist/doc/latex-dev/base/ltnews32.pdf index 3f2c2ba44b6..c820928b65a 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltnews32.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltnews32.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltnews32.tex b/Master/texmf-dist/doc/latex-dev/base/ltnews32.tex index e6d91d2ae27..bd1ebffb10b 100644 --- a/Master/texmf-dist/doc/latex-dev/base/ltnews32.tex +++ b/Master/texmf-dist/doc/latex-dev/base/ltnews32.tex @@ -146,13 +146,14 @@ This document is under construction \ldots \subsection{\cs{symbol} in math mode for large Unicode values} -The \LaTeXe{} kernel defines the command \cs{symbol}, which allows characters to be -typeset by entering their `slot number'. With the \LuaTeX{} and \XeTeX{} engines, these -slot numbers can extend to very large values to accomodate Unicode characters in the upper -Unicode planes (e.g., bold mathematical capital A is slot number \texttt{"1D400} in hex or -\texttt{119808} in decimal). -The \XeTeX{} engine did not allow \cs{symbol} in math mode for values above $2^{16}$, and -this limitation has now been lifted. +The \LaTeXe{} kernel defines the command \cs{symbol}, which allows +characters to be typeset by entering their `slot number'. With the +\LuaTeX{} and \XeTeX{} engines, these slot numbers can extend to very +large values to accomodate Unicode characters in the upper Unicode +planes (e.g., bold mathematical capital A is slot number +\texttt{"1D400} in hex or \texttt{119808} in decimal). The \XeTeX{} +engine did not allow \cs{symbol} in math mode for values above +$2^{16}$, and this limitation has now been lifted. % \githubissue{124} @@ -166,6 +167,24 @@ to the right. This has been corrected. \githubissue{270} +\subsection{Better support for uncommon font series defaults} + +If a font family was set up with fairly unusual font series defaults, +e.g., +\begin{verbatim} +\renewcommand\ttdefault{lmvtt} +\DeclareFontSeriesDefault[tt]{md}{lm} +\DeclareFontSeriesDefault[tt]{bf}{bm} +\end{verbatim} +then a switch between the main document families, e.g., +\verb=\ttfamily...\rmfamily= did not always correctly continued +typesetting in medium or bold series if that involved adjusting the +values used by \verb=\mdseries= or \verb=\bfseries=. This has now +been corrected. +% +\githubissue{291} + + \subsection{Adjusting \texttt{fleqn}} In \pkg{amsmath} the \cs{mathindent} parameter used with the @@ -183,6 +202,17 @@ equation number. +\section{Changes to packages in the \pkg{graphics} category} + +\subsection{Generate a warning if existing color definition is changed} + +If a color is defined twice using \cs{DefineNamedColor}, no +info text \texttt{Redefining color ... in named color model ...} is written +to the log file, because of a typo in the check. This has been corrected. +% +\gnatsissue{graphics}{3635} + + \section{Changes to packages in the \pkg{tools} category} \subsection{Support stretchable glue in \texttt{w}-columns} diff --git a/Master/texmf-dist/doc/latex-dev/base/ltx3info.pdf b/Master/texmf-dist/doc/latex-dev/base/ltx3info.pdf index 4a9f8480c26..b0b6c366905 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltx3info.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltx3info.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/ltxdoc.pdf b/Master/texmf-dist/doc/latex-dev/base/ltxdoc.pdf index cec6d524265..f7d0cc4d621 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/ltxdoc.pdf and b/Master/texmf-dist/doc/latex-dev/base/ltxdoc.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/makeindx.pdf b/Master/texmf-dist/doc/latex-dev/base/makeindx.pdf index 210ad974899..d6c2172b6ed 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/makeindx.pdf and b/Master/texmf-dist/doc/latex-dev/base/makeindx.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/manual.pdf b/Master/texmf-dist/doc/latex-dev/base/manual.pdf index 07648a13730..787714470f7 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/manual.pdf and b/Master/texmf-dist/doc/latex-dev/base/manual.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/modguide.pdf b/Master/texmf-dist/doc/latex-dev/base/modguide.pdf index f66470d3a92..9bcc7f99564 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/modguide.pdf and b/Master/texmf-dist/doc/latex-dev/base/modguide.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/nfssfont.pdf b/Master/texmf-dist/doc/latex-dev/base/nfssfont.pdf index 5c7b884b978..f64d059903c 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/nfssfont.pdf and b/Master/texmf-dist/doc/latex-dev/base/nfssfont.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/proc.pdf b/Master/texmf-dist/doc/latex-dev/base/proc.pdf index b28e71acfba..9c1d27f4e17 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/proc.pdf and b/Master/texmf-dist/doc/latex-dev/base/proc.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/slides.pdf b/Master/texmf-dist/doc/latex-dev/base/slides.pdf index b4e866188fd..30e0437bec2 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/slides.pdf and b/Master/texmf-dist/doc/latex-dev/base/slides.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/slifonts.pdf b/Master/texmf-dist/doc/latex-dev/base/slifonts.pdf index c5960032488..24093386ef2 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/slifonts.pdf and b/Master/texmf-dist/doc/latex-dev/base/slifonts.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/source2e.pdf b/Master/texmf-dist/doc/latex-dev/base/source2e.pdf index 95ba3f354de..2ff5360a994 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/source2e.pdf and b/Master/texmf-dist/doc/latex-dev/base/source2e.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/syntonly.pdf b/Master/texmf-dist/doc/latex-dev/base/syntonly.pdf index af45776ef70..f653c51bba0 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/syntonly.pdf and b/Master/texmf-dist/doc/latex-dev/base/syntonly.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/tlc2.pdf b/Master/texmf-dist/doc/latex-dev/base/tlc2.pdf index 46ffc8c630d..230d37b4315 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/tlc2.pdf and b/Master/texmf-dist/doc/latex-dev/base/tlc2.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/tulm.pdf b/Master/texmf-dist/doc/latex-dev/base/tulm.pdf index c47e1c8a85c..b0f9e7b62da 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/tulm.pdf and b/Master/texmf-dist/doc/latex-dev/base/tulm.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/usrguide.pdf b/Master/texmf-dist/doc/latex-dev/base/usrguide.pdf index d46d8381f89..93bf90b2acd 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/usrguide.pdf and b/Master/texmf-dist/doc/latex-dev/base/usrguide.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/utf8ienc.pdf b/Master/texmf-dist/doc/latex-dev/base/utf8ienc.pdf index d4a874c11cb..a4794e4ba3d 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/utf8ienc.pdf and b/Master/texmf-dist/doc/latex-dev/base/utf8ienc.pdf differ diff --git a/Master/texmf-dist/doc/latex-dev/base/webcomp.pdf b/Master/texmf-dist/doc/latex-dev/base/webcomp.pdf index 50b18784983..e576a8cda06 100644 Binary files a/Master/texmf-dist/doc/latex-dev/base/webcomp.pdf and b/Master/texmf-dist/doc/latex-dev/base/webcomp.pdf differ diff --git a/Master/texmf-dist/source/latex-dev/base/ltclass.dtx b/Master/texmf-dist/source/latex-dev/base/ltclass.dtx index 578443921b8..f43e8f0c0d6 100644 --- a/Master/texmf-dist/source/latex-dev/base/ltclass.dtx +++ b/Master/texmf-dist/source/latex-dev/base/ltclass.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltclass.dtx} - [2020/02/20 v1.3j LaTeX Kernel (Class & Package Interface)] + [2020/03/02 v1.3j LaTeX Kernel (Class & Package Interface)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltclass.dtx} @@ -161,7 +161,7 @@ % option \texttt{nosearch} will only check the current directory % when looking if the file exists. This can be useful if you want to % generate a local (modified) copy of some file that is already in the -% search tree of \TeX{}. Finally, you can use \texttt{nopremable} to +% search tree of \TeX{}. Finally, you can use \texttt{noheader} to % prevent it from writing the standard blurb at the top of the file % (this is actually the same as using the star form of the environment). % @@ -1817,7 +1817,7 @@ \filec@ntents } % \end{macrocode} -% Option \texttt{force}) (or \texttt{overwrite}) changes the +% Option \texttt{force} (or \texttt{overwrite}) changes the % overwriting switch % \begin{macrocode} \let\filec@ntents@force\@fileswfalse diff --git a/Master/texmf-dist/source/latex-dev/base/ltdefns.dtx b/Master/texmf-dist/source/latex-dev/base/ltdefns.dtx index ae472966d57..303b9e5604b 100644 --- a/Master/texmf-dist/source/latex-dev/base/ltdefns.dtx +++ b/Master/texmf-dist/source/latex-dev/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-dev/base/ltexpl.dtx b/Master/texmf-dist/source/latex-dev/base/ltexpl.dtx index 230cd911588..e86b80acaf6 100644 --- a/Master/texmf-dist/source/latex-dev/base/ltexpl.dtx +++ b/Master/texmf-dist/source/latex-dev/base/ltexpl.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltexpl.dtx} - [2019-10-02 v0.0 LaTeX Kernel (expl3-dependent code)] + [2020-03-05 v1.1 LaTeX Kernel (expl3-dependent code)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltfinal.dtx} @@ -68,25 +68,47 @@ %<*2ekernel|latexrelease> %\IncludeInRelease{2020/02/02}% % {expl3}{Pre-load expl3}% -\IfFileExists{expl3.ltx} - {% - \ifnum0% - \ifdefined\pdffilesize 1\fi - \ifdefined\filesize 1\fi - \ifdefined\luatexversion\ifnum\luatexversion>94 1\fi\fi - >0 % - \else - \message{Skipping expl3-dependent extensions} +% \end{macrocode} +% If we are doing a rollback with a format containing expl3 we +% aren't reloading it as that creates havoc. This may need a +% refined version! +% \changes{v1.0a}{2020/03/02} +% {Don't load expl3 if already in the format (gh/295)} +% \changes{v1.1}{2020/03/05} +% {Load xparse.ltx if \cs{NewDocumentCommand} is not defined by expl3.ltx} +% \begin{macrocode} +\expandafter\ifx\csname tex\string _let:D\endcsname\relax + \IfFileExists{expl3.ltx} + {% + \ifnum0% + \ifdefined\pdffilesize 1\fi + \ifdefined\filesize 1\fi + \ifdefined\luatexversion\ifnum\luatexversion>94 1\fi\fi + >0 % + \expandafter\@firstofone + \else + \message{Skipping expl3-dependent extensions} %<2ekernel> \expandafter\endinput -% \expandafter\@gobbletwo - \fi - } - {% - \message{Skipping expl3-dependent extensions}% +% \expandafter\@gobble + \fi + } + {% + \message{Skipping expl3-dependent extensions}% %<2ekernel> \endinput -% \@gobbletwo - }% -\input{expl3.ltx} +% \@gobble + }% + {% + \input{expl3.ltx} + \ifdefined\NewDocumentCommand + \else + \IfFileExists{xparse.ltx} + {\input{xparse.ltx}} + {}% + \fi + }% +\else + \GenericInfo{}{Skipping: expl3 code already part of the format} +\fi % %\EndIncludeInRelease %<*2ekernel> diff --git a/Master/texmf-dist/source/latex-dev/base/ltfssaxes.dtx b/Master/texmf-dist/source/latex-dev/base/ltfssaxes.dtx index 1a8dbd9cfba..58d9aa159e3 100644 --- a/Master/texmf-dist/source/latex-dev/base/ltfssaxes.dtx +++ b/Master/texmf-dist/source/latex-dev/base/ltfssaxes.dtx @@ -35,7 +35,7 @@ % % \ProvidesFile{ltfssaxes.dtx} - [2020/02/18 v1.0c LaTeX Kernel (NFSS Axes handing)] + [2020/03/02 v1.0e 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,69 @@ \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}% + \series@maybe@drop@one@m\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{% + \expandafter\series@maybe@drop@one@m@x\expandafter{#1}} +% \end{macrocode} +% +% \begin{macrocode} + +\def\series@maybe@drop@one@m@x#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 itself 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} @@ -908,6 +955,7 @@ \DeclareRobustCommand\ulcshape {\not@math@alphabet\ulcshape\relax \fontshape\ulcdefault\selectfont} +\let\ulcdefault\@undefined % for rollback \newcommand\ulcdefault{ulc} % \end{macrocode} % \end{macro} @@ -928,6 +976,7 @@ \DeclareRobustCommand\swshape {\not@math@alphabet\swshape\relax \fontshape\swdefault\selectfont} +\let\swdefault\@undefined % for rollback \newcommand\swdefault{sw} % \end{macrocode} % \end{macro} @@ -951,6 +1000,7 @@ \DeclareRobustCommand\sscshape {\not@math@alphabet\sscshape\relax \fontshape\sscdefault\selectfont} +\let\sscdefault\@undefined % for rollback \newcommand\sscdefault{ssc} % \end{macrocode} % \end{macro} @@ -1215,6 +1265,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-dev/base/ltfssbas.dtx b/Master/texmf-dist/source/latex-dev/base/ltfssbas.dtx index b59b0fafdd6..5715106ca63 100644 --- a/Master/texmf-dist/source/latex-dev/base/ltfssbas.dtx +++ b/Master/texmf-dist/source/latex-dev/base/ltfssbas.dtx @@ -35,7 +35,7 @@ % % \ProvidesFile{ltfssbas.dtx} - [2019/12/17 v3.2e LaTeX Kernel (NFSS Basic Macros)] + [2020/02/27 v3.2g LaTeX Kernel (NFSS Basic Macros)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -245,24 +245,59 @@ % 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|latexrelease> +%\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 +% \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. 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}% + \series@maybe@drop@one@m\reserved@a\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/#3/#4\endcsname{\expandafter\noexpand - \csname #5\endcsname}% + \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} \def\reserved@a{#6}% \global \expandafter\let\csname#5\expandafter\endcsname @@ -274,6 +309,33 @@ \fi } % \end{macrocode} +% +% \begin{macrocode} +% +%\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 +%<*2ekernel> +% \end{macrocode} % \end{macro} % % diff --git a/Master/texmf-dist/source/latex-dev/base/ltfssini.dtx b/Master/texmf-dist/source/latex-dev/base/ltfssini.dtx index bdf5f5e6e91..3947b4d9538 100644 --- a/Master/texmf-dist/source/latex-dev/base/ltfssini.dtx +++ b/Master/texmf-dist/source/latex-dev/base/ltfssini.dtx @@ -36,7 +36,7 @@ % % \ProvidesFile{ltfssini.dtx} - [2020/02/18 v3.1i LaTeX Kernel (NFSS Initialisation)] + [2020/03/02 v3.1k LaTeX Kernel (NFSS Initialisation)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -244,7 +244,7 @@ % \DescribeMacro\DeclareFontSeriesDefault % We now support this concept directly from within \LaTeX{} and for % use in font packages (or the document preamble) we offer -% \cs{DeclareSeriesDefault}. This declaration takes three +% \cs{DeclareFontSeriesDefault}. This declaration takes three % arguments: % \begin{description} % \item[document family interface:] Can either be \texttt{rm}, @@ -278,6 +278,7 @@ % The command to declare font series defaults for the ``rm'', ``sf'' or % ``tt'' family. % \begin{macrocode} +\let\DeclareFontSeriesDefault\@undefined % for rollback \newcommand\DeclareFontSeriesDefault[3][]{% \def\reserved@a{#1}% % \end{macrocode} @@ -393,8 +394,14 @@ \edef\rmdef@ult{\rmdefault}% \edef\sfdef@ult{\sfdefault}% \edef\ttdef@ult{\ttdefault}% - \edef\bfdef@ult{\bfdefault}% - \edef\mddef@ult{\mddefault}% +% \end{macrocode} +% The series defaults may contain some surplus \texttt{m} that we +% need to drop here. +% \changes{v3.1j}{2020/02/25}{Drop surplus ``m'' from \cs{bfdef@ult} +% and \cs{mddef@ult} (gh/291)} +% \begin{macrocode} + \series@maybe@drop@one@m\bfdefault\bfdef@ult + \series@maybe@drop@one@m\mddefault\mddef@ult \edef\famdef@ult{\familydefault}% } % \end{macrocode} @@ -718,7 +725,16 @@ \maybe@load@fontshape %<+debug> \series@change@debug{Target series: %<+debug> \f@series \space -> \target@series@value}% - \let\f@series\target@series@value +% \end{macrocode} +% The \cs{target@series@value} may contain something like +% \texttt{cm} (coming from a default) and so we can't directly +% asign it to \cs{f@series} be have to drop any surplus \texttt{m} +% first. +% \changes{v3.1j}{2020/02/25}{Drop surplus ``m'' from +% \cs{target@series@value} (gh/291)} +% \begin{macrocode} +% \let\f@series\target@series@value + \series@maybe@drop@one@m\target@series@value\f@series \fi \fi \fi @@ -776,10 +792,30 @@ % \cs{rmfamily}. This is now covered by looping and stopping the % loop when a match was found. % \begin{macrocode} - \expandafter\ifx\csname mdseries@#1\endcsname\f@series +% \end{macrocode} +% We have to sanitize the default value first because it may +% contain something like \texttt{mc} and that would never match +% \cs{f@series} because there it would be called \texttt{c} with +% the \texttt{m} dropped. It would be probably better to do that +% differently these days, but it is hard to adjust without causing +% a lot of issues, so we do the dropping in various places instead. +% \changes{v3.1j}{2020/02/25}{Drop surplus ``m'' from \cs{reserved@d} +% (gh/291)} +% \begin{macrocode} + \expandafter\series@maybe@drop@one@m + \csname mdseries@#1\endcsname\reserved@d + \ifx\reserved@d\f@series %<+debug> \series@change@debug{mdseries@#1 matched -> \reserved@b}% \let\target@series@value\reserved@b - \else\expandafter\ifx\csname bfseries@#1\endcsname\f@series + \else +% \end{macrocode} +% Again do some sanitizing. +% \changes{v3.1j}{2020/02/25}{Drop surplus ``m'' from \cs{reserved@d} +% (gh/291)} +% \begin{macrocode} + \expandafter\series@maybe@drop@one@m + \csname bfseries@#1\endcsname\reserved@d + \ifx\reserved@d\f@series %<+debug> \series@change@debug{bfseries@#1 matched -> \reserved@c}% \let\target@series@value\reserved@c \else\ifx\f@series\mddef@ult \let\target@series@value\reserved@b diff --git a/Master/texmf-dist/source/latex-dev/base/ltvers.dtx b/Master/texmf-dist/source/latex-dev/base/ltvers.dtx index 2b54638bc42..ed2abe1088b 100644 --- a/Master/texmf-dist/source/latex-dev/base/ltvers.dtx +++ b/Master/texmf-dist/source/latex-dev/base/ltvers.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltvers.dtx} - [2020/01/31 v1.1e LaTeX Kernel (Version Info)] + [2020/03/02 v1.1e LaTeX Kernel (Version Info)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltvers.dtx} @@ -115,7 +115,7 @@ {2020-10-01} % %<*2ekernel> -\def\patch@level{-4} +\def\patch@level{-5} % \end{macrocode} % % \begin{macro}{\development@branch@name} @@ -250,6 +250,14 @@ \def\@IncludeInRele@se#1#2#3{% \toks@{[#1] #3}% \expandafter\ifx\csname\string#2+\@currname+IIR\endcsname\relax +% \end{macrocode} +% If we roll back and the first patch already match then applying +% that is actually reapplying what is already in the format, i.e., +% it is useless and possibly allocating new registers. However, it +% makes the logic simpler so this is the way it is for now. In +% theory we could always jump overthe first patch because that is +% only really needed for rolling forward. So maybe one day \dots +% \begin{macrocode} \ifnum\expandafter\@parse@version#1//00\@nil >\expandafter\@parse@version\fmtversion//00\@nil \GenericInfo{}{Skipping: \the\toks@}% diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx index a772c09e7ff..716c9e21c85 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{-4} +\def\patch@level{-5} \edef\development@branch@name{develop \the\year-\the\month-\the\day} \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,9 +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}% + \series@maybe@drop@one@m\reserved@a\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/#3/#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 @@ -3295,10 +3303,25 @@ 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}% + \series@maybe@drop@one@m\f@series\f@series +} +\def\series@maybe@drop@one@m#1{% + \expandafter\series@maybe@drop@one@m@x\expandafter{#1}} + +\def\series@maybe@drop@one@m@x#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{% @@ -3306,14 +3329,17 @@ Type H for immediate help.}% \DeclareRobustCommand\ulcshape {\not@math@alphabet\ulcshape\relax \fontshape\ulcdefault\selectfont} +\let\ulcdefault\@undefined % for rollback \newcommand\ulcdefault{ulc} \DeclareRobustCommand\swshape {\not@math@alphabet\swshape\relax \fontshape\swdefault\selectfont} +\let\swdefault\@undefined % for rollback \newcommand\swdefault{sw} \DeclareRobustCommand\sscshape {\not@math@alphabet\sscshape\relax \fontshape\sscdefault\selectfont} +\let\sscdefault\@undefined % for rollback \newcommand\sscdefault{ssc} \DeclareFontShapeChangeRule {n}{it} {it} {sl} \DeclareFontShapeChangeRule {n}{sl} {sl} {it} @@ -4585,6 +4611,7 @@ Type H for immediate help.}% \DeclareRobustCommand\itshape {\not@math@alphabet\itshape\mathit \fontshape\itdefault\selectfont} +\let\DeclareFontSeriesDefault\@undefined % for rollback \newcommand\DeclareFontSeriesDefault[3][]{% \def\reserved@a{#1}% \ifx\reserved@a\@empty @@ -4625,8 +4652,8 @@ Type H for immediate help.}% \edef\rmdef@ult{\rmdefault}% \edef\sfdef@ult{\sfdefault}% \edef\ttdef@ult{\ttdefault}% - \edef\bfdef@ult{\bfdefault}% - \edef\mddef@ult{\mddefault}% + \series@maybe@drop@one@m\bfdefault\bfdef@ult + \series@maybe@drop@one@m\mddefault\mddef@ult \edef\famdef@ult{\familydefault}% } @@ -4689,7 +4716,7 @@ Type H for immediate help.}% \ifx \f@series\target@series@value \else \maybe@load@fontshape - \let\f@series\target@series@value + \series@maybe@drop@one@m\target@series@value\f@series \fi \fi \fi @@ -4704,9 +4731,14 @@ Type H for immediate help.}% \csname mdseries@\target@meta@family@value\endcsname \expandafter\let\expandafter\reserved@c \csname bfseries@\target@meta@family@value\endcsname - \expandafter\ifx\csname mdseries@#1\endcsname\f@series + \expandafter\series@maybe@drop@one@m + \csname mdseries@#1\endcsname\reserved@d + \ifx\reserved@d\f@series \let\target@series@value\reserved@b - \else\expandafter\ifx\csname bfseries@#1\endcsname\f@series + \else + \expandafter\series@maybe@drop@one@m + \csname bfseries@#1\endcsname\reserved@d + \ifx\reserved@d\f@series \let\target@series@value\reserved@c \else\ifx\f@series\mddef@ult \let\target@series@value\reserved@b \else\ifx\f@series\bfdef@ult \let\target@series@value\reserved@c diff --git a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty index 7bcc348b57c..3f688abfcec 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty @@ -3749,6 +3749,7 @@ of this package available from CTAN} %% all rights reserved. \IncludeInRelease{2020/02/02}% {\DeclareFontSeriesDefault}{Custom series}% +\let\DeclareFontSeriesDefault\@undefined % for rollback \newcommand\DeclareFontSeriesDefault[3][]{% \def\reserved@a{#1}% \ifx\reserved@a\@empty @@ -3789,8 +3790,8 @@ of this package available from CTAN} \edef\rmdef@ult{\rmdefault}% \edef\sfdef@ult{\sfdefault}% \edef\ttdef@ult{\ttdefault}% - \edef\bfdef@ult{\bfdefault}% - \edef\mddef@ult{\mddefault}% + \series@maybe@drop@one@m\bfdefault\bfdef@ult + \series@maybe@drop@one@m\mddefault\mddef@ult \edef\famdef@ult{\familydefault}% } @@ -3853,7 +3854,7 @@ of this package available from CTAN} \ifx \f@series\target@series@value \else \maybe@load@fontshape - \let\f@series\target@series@value + \series@maybe@drop@one@m\target@series@value\f@series \fi \fi \fi @@ -3868,9 +3869,14 @@ of this package available from CTAN} \csname mdseries@\target@meta@family@value\endcsname \expandafter\let\expandafter\reserved@c \csname bfseries@\target@meta@family@value\endcsname - \expandafter\ifx\csname mdseries@#1\endcsname\f@series + \expandafter\series@maybe@drop@one@m + \csname mdseries@#1\endcsname\reserved@d + \ifx\reserved@d\f@series \let\target@series@value\reserved@b - \else\expandafter\ifx\csname bfseries@#1\endcsname\f@series + \else + \expandafter\series@maybe@drop@one@m + \csname bfseries@#1\endcsname\reserved@d + \ifx\reserved@d\f@series \let\target@series@value\reserved@c \else\ifx\f@series\mddef@ult \let\target@series@value\reserved@b \else\ifx\f@series\bfdef@ult \let\target@series@value\reserved@c @@ -4824,6 +4830,54 @@ 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 + \edef\reserved@a{#3}% + \series@maybe@drop@one@m\reserved@a\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}% + \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{% @@ -5509,10 +5563,25 @@ 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}% + \series@maybe@drop@one@m\f@series\f@series +} +\def\series@maybe@drop@one@m#1{% + \expandafter\series@maybe@drop@one@m@x\expandafter{#1}} + +\def\series@maybe@drop@one@m@x#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{% @@ -5520,14 +5589,17 @@ of this package available from CTAN} \DeclareRobustCommand\ulcshape {\not@math@alphabet\ulcshape\relax \fontshape\ulcdefault\selectfont} +\let\ulcdefault\@undefined % for rollback \newcommand\ulcdefault{ulc} \DeclareRobustCommand\swshape {\not@math@alphabet\swshape\relax \fontshape\swdefault\selectfont} +\let\swdefault\@undefined % for rollback \newcommand\swdefault{sw} \DeclareRobustCommand\sscshape {\not@math@alphabet\sscshape\relax \fontshape\sscdefault\selectfont} +\let\sscdefault\@undefined % for rollback \newcommand\sscdefault{ssc} \DeclareFontShapeChangeRule {n}{it} {it} {sl} \DeclareFontShapeChangeRule {n}{sl} {sl} {it} @@ -5638,6 +5710,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 @@ -6271,23 +6344,36 @@ of this package available from CTAN} %%% From File: ltexpl.dtx \IncludeInRelease{2020/02/02}% {expl3}{Pre-load expl3}% -\IfFileExists{expl3.ltx} - {% - \ifnum0% - \ifdefined\pdffilesize 1\fi - \ifdefined\filesize 1\fi - \ifdefined\luatexversion\ifnum\luatexversion>94 1\fi\fi - >0 % - \else - \message{Skipping expl3-dependent extensions} - \expandafter\@gobbletwo - \fi - } - {% - \message{Skipping expl3-dependent extensions}% - \@gobbletwo - }% -\input{expl3.ltx} +\expandafter\ifx\csname tex\string _let:D\endcsname\relax + \IfFileExists{expl3.ltx} + {% + \ifnum0% + \ifdefined\pdffilesize 1\fi + \ifdefined\filesize 1\fi + \ifdefined\luatexversion\ifnum\luatexversion>94 1\fi\fi + >0 % + \expandafter\@firstofone + \else + \message{Skipping expl3-dependent extensions} + \expandafter\@gobble + \fi + } + {% + \message{Skipping expl3-dependent extensions}% + \@gobble + }% + {% + \input{expl3.ltx} + \ifdefined\NewDocumentCommand + \else + \IfFileExists{xparse.ltx} + {\input{xparse.ltx}} + {}% + \fi + }% +\else + \GenericInfo{}{Skipping: expl3 code already part of the format} +\fi \EndIncludeInRelease %%% From File: ltfinal.dtx \IncludeInRelease{2015/01/01}% diff --git a/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx b/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx index cc67093fdbb..10d06c1f529 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx +++ b/Master/texmf-dist/tex/latex-dev/base/ltexpl.ltx @@ -42,23 +42,36 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %%% From File: ltexpl.dtx -\IfFileExists{expl3.ltx} - {% - \ifnum0% - \ifdefined\pdffilesize 1\fi - \ifdefined\filesize 1\fi - \ifdefined\luatexversion\ifnum\luatexversion>94 1\fi\fi - >0 % - \else - \message{Skipping expl3-dependent extensions} +\expandafter\ifx\csname tex\string _let:D\endcsname\relax + \IfFileExists{expl3.ltx} + {% + \ifnum0% + \ifdefined\pdffilesize 1\fi + \ifdefined\filesize 1\fi + \ifdefined\luatexversion\ifnum\luatexversion>94 1\fi\fi + >0 % + \expandafter\@firstofone + \else + \message{Skipping expl3-dependent extensions} \expandafter\endinput - \fi - } - {% - \message{Skipping expl3-dependent extensions}% + \fi + } + {% + \message{Skipping expl3-dependent extensions}% \endinput - }% -\input{expl3.ltx} + }% + {% + \input{expl3.ltx} + \ifdefined\NewDocumentCommand + \else + \IfFileExists{xparse.ltx} + {\input{xparse.ltx}} + {}% + \fi + }% +\else + \GenericInfo{}{Skipping: expl3 code already part of the format} +\fi \endinput %% %% End of file `ltexpl.ltx'. -- cgit v1.2.3