From 9d5c27cd7720260b66f8026e31cbff60ab4fd281 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 14 Feb 2020 22:30:22 +0000 Subject: latex-base-dev (14feb20) git-svn-id: svn://tug.org/texlive/trunk@53778 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex-dev/base/fontdef.dtx | 22 +++- .../texmf-dist/source/latex-dev/base/ltfssini.dtx | 126 +++++++++++++++++---- .../texmf-dist/source/latex-dev/base/ltoutenc.dtx | 12 +- .../source/latex-dev/base/lttextcomp.dtx | 9 +- Master/texmf-dist/source/latex-dev/base/ltvers.dtx | 2 +- 5 files changed, 138 insertions(+), 33 deletions(-) (limited to 'Master/texmf-dist/source/latex-dev') diff --git a/Master/texmf-dist/source/latex-dev/base/fontdef.dtx b/Master/texmf-dist/source/latex-dev/base/fontdef.dtx index 4dd5ea38456..c5623c5566e 100644 --- a/Master/texmf-dist/source/latex-dev/base/fontdef.dtx +++ b/Master/texmf-dist/source/latex-dev/base/fontdef.dtx @@ -39,7 +39,7 @@ %\ProvidesFile{fontdef.drv} % \fi % \ProvidesFile{fontdef.dtx} -%<-latexrelease> [2020/01/25 v3.0f LaTeX Kernel +%<-latexrelease> [2020/02/11 v3.0g LaTeX Kernel % \iftrue (\else %(Text %(Math @@ -264,6 +264,9 @@ % \begin{macrocode} \input{ts1enc.def} % \end{macrocode} +% +% +% % \changes{v3.0a}{2016/12/03}{(DPC) Default to TU encoding for Unicode TeX engines} % \begin{macrocode} \ifx\Umathchar\@undefined @@ -276,6 +279,13 @@ \fontencoding{OT1} % \end{macrocode} % +% The initial \texttt{fontenc} package load list if an 8-bit \TeX{} +% engine is used: +% \changes{v3.0g}{2020/02/11}{Provide value for \cs{@fontenc@load@list} (gh/273)} +% \begin{macrocode} +\def\@fontenc@load@list{\@elt{T1,OT1}} +% \end{macrocode} +% % % % @@ -293,6 +303,16 @@ % \begin{macrocode} \input {tuenc.def} \fontencoding{TU} +% \end{macrocode} +% +% The initial \texttt{fontenc} package load list if a Unicode +% engine is used: +% \changes{v3.0g}{2020/02/11}{Provide value for \cs{@fontenc@load@list} (gh/273)} +% \begin{macrocode} +\def\@fontenc@load@list{\@elt{TU}} +% \end{macrocode} +% +% \begin{macrocode} \DeclareFontSubstitution{TU}{lmr}{m}{n} \LoadFontDefinitionFile{TU}{lmr} \LoadFontDefinitionFile{TU}{lmss} diff --git a/Master/texmf-dist/source/latex-dev/base/ltfssini.dtx b/Master/texmf-dist/source/latex-dev/base/ltfssini.dtx index 320c5a181ef..71aae0dcfa1 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/05 v3.1g LaTeX Kernel (NFSS Initialisation)] + [2020/02/11 v3.1h LaTeX Kernel (NFSS Initialisation)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -291,7 +291,7 @@ \csname #2default\endcsname{#3}% \else % \end{macrocode} -% +% % \changes{v3.1g}{2020/02/05}{Clarrified error text} % \begin{macrocode} \@latex@error{Wrong syntax for \string\DeclareFontSeriesDefault}% @@ -570,7 +570,7 @@ % \begin{macrocode} \prepare@family@series@update{rm}\rmdefault % \end{macrocode} -% The comes the hook code (by default a no-op) and finally the call +% Then comes the hook code (by default a no-op) and finally the call % to \cs{selectfont}. % \begin{macrocode} \@rmfamilyhook @@ -703,9 +703,9 @@ % because we now need to use \cs{csname} and this way the code will % be a little faster. % \begin{macrocode} - \expandafter\let\expandafter\@reservedb + \expandafter\let\expandafter\reserved@b \csname mdseries@\target@meta@family@value\endcsname - \expandafter\let\expandafter\@reservedc + \expandafter\let\expandafter\reserved@c \csname bfseries@\target@meta@family@value\endcsname % \end{macrocode} % This here is now identical to the nested \cs{ifx} block from the @@ -714,11 +714,11 @@ % loop when a match was found. % \begin{macrocode} \expandafter\ifx\csname mdseries@#1\endcsname\f@series - \let\target@series@value\@reservedb + \let\target@series@value\reserved@b \else\expandafter\ifx\csname bfseries@#1\endcsname\f@series - \let\target@series@value\@reservedc - \else\ifx\f@series\mddef@ult \let\target@series@value\@reservedb - \else\ifx\f@series\bfdef@ult \let\target@series@value\@reservedc + \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 \fi\fi\fi\fi \fi \fi @@ -1138,27 +1138,51 @@ \def\math@version{normal} % \end{macrocode} % -% \subsection{Miscellaneous} +% \subsection{Legacy} % -% \begin{macro}{\newfont} -% \changes{v1.2g}{1991/03/30}{Definition added.} -% \changes{v2.2e}{1995/05/23}{Font assignment made local again.} -% \begin{macro}{\symbol} -% \changes{v1.2g}{1991/03/30}{Definition added.} % We start by defining a few macros that are part of % standard \LaTeX's user interface. The use of these functions is % not encouraged, but they will allow to process older documents % without changes to the source. +% +% \begin{macro}{\newfont} +% \changes{v1.2g}{1991/03/30}{Definition added.} +% \changes{v2.2e}{1995/05/23}{Font assignment made local again.} % \begin{macrocode} \def\newfont#1#2{\@ifdefinable#1{\font#1=#2\relax}} % \end{macrocode} +% \end{macro} % +% \begin{macro}{\symbol} +% \changes{v1.2g}{1991/03/30}{Definition added.} +% \changes{v3.1h}{2020/02/07}{XeTeX-specific version to avoid bug in maths mode.} % \begin{macrocode} -\DeclareRobustCommand\symbol[1]{\char #1\relax} +% +%<*2ekernel|latexrelease> +%\IncludeInRelease{2020/10/01}% +% {\symbol}{XeTeX change for math}% +\ifdefined\XeTeXversion + \DeclareRobustCommand\symbol[1]{\Ucharcat#1 12\relax} +\else + \DeclareRobustCommand\symbol[1]{\char#1\relax} +\fi +% +% \end{macrocode} +% +% \begin{macrocode} +%\EndIncludeInRelease +%\IncludeInRelease{0000/00/00}% +% {\symbol}{XeTeX change for math}% +% +%\DeclareRobustCommand\symbol[1]{\char#1\relax} +% +%\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} -% \end{macro} % \end{macro} % +% \subsection{Miscellaneous} +% % \begin{macro}{\@setfontsize} % \begin{macro}{\@setsize} % This abbreviation is used by \LaTeX's user level size changing @@ -1249,7 +1273,6 @@ % \begin{macro}{\normalfont} % \changes{v2.1a}{1993/11/11}{Macro added} % \begin{macro}{\reset@font} -% \begin{macro}{\p@reset@font} % \changes{v1.1n}{1991/08/26}{Macro introduced} % The macro |\reset@font| is used in \LaTeX{} to switch to a standard % font, in order to initialize the current font in situations where @@ -1264,18 +1287,63 @@ % \changes{v2.1k}{1994/05/14}{Remove surplus braces} % \changes{v3.0f}{1995/10/16}{Added \cs{relax} after \cs{usefont}, % as the latter eats up spaces.} +% \changes{v3.1h}{2020/02/10}{Add \cs{@defaultfamilyhook} to \cs{normalfont} (gh/269)} +% \begin{macrocode} +% +%<*2ekernel|latexrelease> +%\IncludeInRelease{2020/02/02}% +% {\normalfont}{Add hook to \normalfont}% +\DeclareRobustCommand\normalfont{% +% \end{macrocode} +% Instead of calling \cs{usefont}, as it was done in the past, we +% inline the code from \cs{usefont} as we want to add the hook +% before \cs{selectfont}, but after all the font attributes are set. +% \begin{macrocode} + \fontencoding\encodingdefault + \edef\f@family{\familydefault}% + \edef\f@series{\seriesdefault}% + \edef\f@shape{\shapedefault}% +% \end{macrocode} +% +% \begin{macrocode} + \@defaultfamilyhook + \selectfont} +% \end{macrocode} +% % \begin{macrocode} -\DeclareRobustCommand\normalfont - {\usefont\encodingdefault - \familydefault - \seriesdefault - \shapedefault - \relax} \let\reset@font\normalfont % \end{macrocode} % \end{macro} % \end{macro} -% \end{macro} +% +% +% \begin{macro}{\@defaultfamilyhook} +% By default the hooks do nothing. +% \changes{v3.1h}{2020/02/10}{Add \cs{@defaultfamilyhook} to \cs{normalfont} (gh/269)} +% \begin{macrocode} +\let\@defaultfamilyhook\@empty +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +% +%\EndIncludeInRelease +%\IncludeInRelease{0000/00/00}% +% {\normalfont}{Add hook to \normalfont}% +% +%\DeclareRobustCommand\normalfont +% {\usefont\encodingdefault +% \familydefault +% \seriesdefault +% \shapedefault +% \relax} +%\let\reset@font\normalfont +% +%\let\@defaultfamilyhook\@undefined +% +%\EndIncludeInRelease +%<*2ekernel> +% \end{macrocode} % % % @@ -1332,6 +1400,14 @@ % \end{macrocode} % % +% The initial \texttt{fontenc} package load list. This will get +% overwritten in \texttt{fonttext} and is only provided in case an +% old \texttt{fonttext.cfg} does not define the command: +% \changes{v3.1h}{2020/02/11}{Provide default value for +% \cs{@fontenc@load@list} (gh/273)} +% \begin{macrocode} +\def\@fontenc@load@list{\@elt{T1,OT1}} +% \end{macrocode} % % % We now load the customizable parts of NFSS. diff --git a/Master/texmf-dist/source/latex-dev/base/ltoutenc.dtx b/Master/texmf-dist/source/latex-dev/base/ltoutenc.dtx index 6ebb62cee8d..f3c19000edf 100644 --- a/Master/texmf-dist/source/latex-dev/base/ltoutenc.dtx +++ b/Master/texmf-dist/source/latex-dev/base/ltoutenc.dtx @@ -37,14 +37,14 @@ %\ProvidesFile{ts1enc.def}[2001/06/05 v3.0e (jk/car/fm) %\ProvidesFile{tuenc.def} %\ProvidesPackage{fontenc} -% [2020/01/25 v2.0m +% [2020/02/11 v2.0o % Standard LaTeX file] % Standard LaTeX package] % %<*driver> % \fi \ProvidesFile{ltoutenc.dtx} - [2020/01/20 v2.0n LaTeX Kernel (font encodings)] + [2020/02/11 v2.0o LaTeX Kernel (font encodings)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltoutenc.dtx} @@ -3594,6 +3594,14 @@ % times} % \changes{v1.9u}{1999/06/10}{Ensure that we also forget old options % (pr/2888)} +% \changes{v2.0o}{2020/02/11}{Update \cs{@fontenc@load@list} +% with option list (gh/273)} +% \begin{macrocode} +\let\@elt\relax +\xdef\@fontenc@load@list{\@fontenc@load@list + \@elt{\csname opt@fontenc.sty\endcsname}} +% \end{macrocode} +% % \begin{macrocode} \global\expandafter\let\csname ver@fontenc.sty\endcsname\relax \global\expandafter\let\csname opt@fontenc.sty\endcsname\relax diff --git a/Master/texmf-dist/source/latex-dev/base/lttextcomp.dtx b/Master/texmf-dist/source/latex-dev/base/lttextcomp.dtx index c918a836f94..ed37b9d9957 100644 --- a/Master/texmf-dist/source/latex-dev/base/lttextcomp.dtx +++ b/Master/texmf-dist/source/latex-dev/base/lttextcomp.dtx @@ -33,7 +33,7 @@ % % \ProvidesFile{lttextcomp.dtx} - [2020/01/25 v1.0b LaTeX Kernel (text companion symbols)] + [2020/02/10 v1.0c LaTeX Kernel (text companion symbols)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -564,18 +564,19 @@ % \end{macrocode} % % In Unicode engines we just execute the simple accents: +% \changes{v1.0c}{2020/02/10}{Use \cs{@tabacckludge} for tabbing where necessary (gh/271)} % \begin{macrocode} \else - \def\capitalacute{\'} + \def\capitalacute{\@tabacckludge'} \def\capitalbreve{\u} \def\capitalcaron{\v} \def\capitalcedilla{\c} \def\capitalcircumflex{\^} \def\capitaldieresis{\"} \def\capitaldotaccent{\.} - \def\capitalgrave{\`} + \def\capitalgrave{\@tabacckludge`} \def\capitalhungarumlaut{\H} - \def\capitalmacron{\=} + \def\capitalmacron{\@tabacckludge=} \def\capitalnewtie{\t} \def\capitalogonek{\k} \def\capitalring{\r} diff --git a/Master/texmf-dist/source/latex-dev/base/ltvers.dtx b/Master/texmf-dist/source/latex-dev/base/ltvers.dtx index e381864bd45..470da0bf293 100644 --- a/Master/texmf-dist/source/latex-dev/base/ltvers.dtx +++ b/Master/texmf-dist/source/latex-dev/base/ltvers.dtx @@ -115,7 +115,7 @@ {2020-10-01} % %<*2ekernel> -\def\patch@level{-1} +\def\patch@level{-2} % \end{macrocode} % % \begin{macro}{\development@branch@name} -- cgit v1.2.3