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 --- Master/texmf-dist/tex/latex-dev/base/fontenc.sty | 5 +- Master/texmf-dist/tex/latex-dev/base/fontmath.cfg | 2 +- Master/texmf-dist/tex/latex-dev/base/fontmath.ltx | 2 +- Master/texmf-dist/tex/latex-dev/base/fonttext.cfg | 2 +- Master/texmf-dist/tex/latex-dev/base/fonttext.ltx | 4 +- Master/texmf-dist/tex/latex-dev/base/latex.ltx | 41 ++++++++------- .../texmf-dist/tex/latex-dev/base/latexrelease.sty | 58 ++++++++++++++++++---- Master/texmf-dist/tex/latex-dev/base/omlenc.def | 2 +- Master/texmf-dist/tex/latex-dev/base/omsenc.def | 2 +- Master/texmf-dist/tex/latex-dev/base/ot1enc.def | 2 +- Master/texmf-dist/tex/latex-dev/base/ot4enc.def | 2 +- Master/texmf-dist/tex/latex-dev/base/preload.cfg | 2 +- Master/texmf-dist/tex/latex-dev/base/t1enc.def | 2 +- Master/texmf-dist/tex/latex-dev/base/tuenc.def | 2 +- 14 files changed, 90 insertions(+), 38 deletions(-) (limited to 'Master/texmf-dist/tex/latex-dev') diff --git a/Master/texmf-dist/tex/latex-dev/base/fontenc.sty b/Master/texmf-dist/tex/latex-dev/base/fontenc.sty index b912d2a7371..85d45461b2b 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fontenc.sty +++ b/Master/texmf-dist/tex/latex-dev/base/fontenc.sty @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesPackage{fontenc} - [2020/01/25 v2.0m + [2020/02/11 v2.0o Standard LaTeX package] \def\update@uclc@with@cyrillic{% \expandafter\def\expandafter\@uclclist\expandafter @@ -111,6 +111,9 @@ \ProcessOptions* \usefont\encodingdefault\familydefault\seriesdefault\shapedefault \let\update@uclc@with@cyrillic\relax +\let\@elt\relax +\xdef\@fontenc@load@list{\@fontenc@load@list + \@elt{\csname opt@fontenc.sty\endcsname}} \global\expandafter\let\csname ver@fontenc.sty\endcsname\relax \global\expandafter\let\csname opt@fontenc.sty\endcsname\relax \global\let\@ifl@ter@@\@ifl@ter diff --git a/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg b/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg index 82f5f872f32..0ced57368ab 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg +++ b/Master/texmf-dist/tex/latex-dev/base/fontmath.cfg @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fontmath.cfg} - [2020/01/25 v3.0f LaTeX Kernel + [2020/02/11 v3.0g LaTeX Kernel (Uncustomised math font setup)] %% diff --git a/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx b/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx index 6e9c316e486..008e3dfa85a 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx +++ b/Master/texmf-dist/tex/latex-dev/base/fontmath.ltx @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fontmath.ltx} - [2020/01/25 v3.0f LaTeX Kernel + [2020/02/11 v3.0g LaTeX Kernel (Math font setup)] \typeout{=== Don't modify this file, use a .cfg file instead ===^^J} diff --git a/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg b/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg index 8e5838f5c71..cccff529eb8 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg +++ b/Master/texmf-dist/tex/latex-dev/base/fonttext.cfg @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fonttext.cfg} - [2020/01/25 v3.0f LaTeX Kernel + [2020/02/11 v3.0g LaTeX Kernel (Uncustomised text font setup)] %% diff --git a/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx b/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx index 993e85a8ca2..ab8e0d2c9c8 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx +++ b/Master/texmf-dist/tex/latex-dev/base/fonttext.ltx @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{fonttext.ltx} - [2020/01/25 v3.0f LaTeX Kernel + [2020/02/11 v3.0g LaTeX Kernel (Text font setup)] \typeout{=== Don't modify this file, use a .cfg file instead ===^^J} @@ -48,6 +48,7 @@ \input{ts1enc.def} \ifx\Umathchar\@undefined \fontencoding{OT1} +\def\@fontenc@load@list{\@elt{T1,OT1}} \def\rmsubstdefault{cmr} \def\sfsubstdefault{cmss} \def\ttsubstdefault{cmtt} @@ -55,6 +56,7 @@ \else \input {tuenc.def} \fontencoding{TU} +\def\@fontenc@load@list{\@elt{TU}} \DeclareFontSubstitution{TU}{lmr}{m}{n} \LoadFontDefinitionFile{TU}{lmr} \LoadFontDefinitionFile{TU}{lmss} diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx index 30db2cded55..47da4e3c4c6 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{-1} +\def\patch@level{-2} \edef\development@branch@name{develop \the\year-\the\month-\the\day} \iffalse \def\reserved@a#1/#2/#3\@nil{% @@ -4695,16 +4695,16 @@ Type H for immediate help.}% \else \expandafter\ifx\csname#1def@ult\endcsname\f@family \let\@elt\@gobble - \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 \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 @@ -4785,7 +4785,11 @@ Type H for immediate help.}% \mathversion{normal}} \def\math@version{normal} \def\newfont#1#2{\@ifdefinable#1{\font#1=#2\relax}} -\DeclareRobustCommand\symbol[1]{\char #1\relax} +\ifdefined\XeTeXversion + \DeclareRobustCommand\symbol[1]{\Ucharcat#1 12\relax} +\else + \DeclareRobustCommand\symbol[1]{\char#1\relax} +\fi \def\@setfontsize#1#2#3{\@nomath#1% \ifx\protect\@typeset@protect \let\@currsize#1% @@ -4796,13 +4800,15 @@ Type H for immediate help.}% 0\or 1\or 2\or 3\or 4\or 5\or 6\or 7\or 8\or 9\or A\or B\or C\or D\or E\or F\fi} \def\nfss@text#1{{\mbox{#1}}} -\DeclareRobustCommand\normalfont - {\usefont\encodingdefault - \familydefault - \seriesdefault - \shapedefault - \relax} +\DeclareRobustCommand\normalfont{% + \fontencoding\encodingdefault + \edef\f@family{\familydefault}% + \edef\f@series{\seriesdefault}% + \edef\f@shape{\shapedefault}% + \@defaultfamilyhook + \selectfont} \let\reset@font\normalfont +\let\@defaultfamilyhook\@empty \def\not@base#1{\@latex@error {Command \noexpand#1not provided in base LaTeX2e}% {Load the latexsym or the amsfonts package to @@ -4825,6 +4831,7 @@ Type H for immediate help.}% \fontseries{m} \fontshape{n} \fontsize{10}{10} +\def\@fontenc@load@list{\@elt{T1,OT1}} \InputIfFileExists{fonttext.cfg} {\typeout{====================================^^J% ^^J% @@ -5169,16 +5176,16 @@ Type H for immediate help.}% \DeclareTextCommandDefault{\newtie} {\tc@check@accent{\t}2\newtie} \DeclareTextCommandDefault{\capitalnewtie} {\tc@check@accent{\t}2\capitalnewtie} \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/tex/latex-dev/base/latexrelease.sty b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty index 928b9e11354..eae5f67c17c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty @@ -3860,16 +3860,16 @@ of this package available from CTAN} \else \expandafter\ifx\csname#1def@ult\endcsname\f@family \let\@elt\@gobble - \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 \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 @@ -3989,6 +3989,46 @@ of this package available from CTAN} {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ \upshape \else \itshape \fi}% \let\eminnershape\@undefined +\EndIncludeInRelease +\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 +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}% + {\symbol}{XeTeX change for math}% + +\DeclareRobustCommand\symbol[1]{\char#1\relax} + +\EndIncludeInRelease +\IncludeInRelease{2020/02/02}% + {\normalfont}{Add hook to \normalfont}% +\DeclareRobustCommand\normalfont{% + \fontencoding\encodingdefault + \edef\f@family{\familydefault}% + \edef\f@series{\seriesdefault}% + \edef\f@shape{\shapedefault}% + \@defaultfamilyhook + \selectfont} +\let\reset@font\normalfont +\let\@defaultfamilyhook\@empty +\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 %%% From File: fontdef.dtx \IncludeInRelease{2017/01/01}% @@ -4261,16 +4301,16 @@ of this package available from CTAN} \DeclareTextCommandDefault{\newtie} {\tc@check@accent{\t}2\newtie} \DeclareTextCommandDefault{\capitalnewtie} {\tc@check@accent{\t}2\capitalnewtie} \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/tex/latex-dev/base/omlenc.def b/Master/texmf-dist/tex/latex-dev/base/omlenc.def index 9c61c9e7230..266f9c9eb5b 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omlenc.def +++ b/Master/texmf-dist/tex/latex-dev/base/omlenc.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{omlenc.def} - [2020/01/25 v2.0m + [2020/02/11 v2.0o Standard LaTeX file] \DeclareFontEncoding{OML}{}{} \DeclareTextSymbol{\textless}{OML}{`\<} diff --git a/Master/texmf-dist/tex/latex-dev/base/omsenc.def b/Master/texmf-dist/tex/latex-dev/base/omsenc.def index 7cd0afe50ed..b62514c1d3c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/omsenc.def +++ b/Master/texmf-dist/tex/latex-dev/base/omsenc.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{omsenc.def} - [2020/01/25 v2.0m + [2020/02/11 v2.0o Standard LaTeX file] \DeclareFontEncoding{OMS}{}{} \DeclareTextSymbol{\textasteriskcentered}{OMS}{3} % "03 diff --git a/Master/texmf-dist/tex/latex-dev/base/ot1enc.def b/Master/texmf-dist/tex/latex-dev/base/ot1enc.def index eec28395c18..087bb545493 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot1enc.def +++ b/Master/texmf-dist/tex/latex-dev/base/ot1enc.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{ot1enc.def} - [2020/01/25 v2.0m + [2020/02/11 v2.0o Standard LaTeX file] \DeclareFontEncoding{OT1}{}{} \DeclareTextAccent{\"}{OT1}{127} diff --git a/Master/texmf-dist/tex/latex-dev/base/ot4enc.def b/Master/texmf-dist/tex/latex-dev/base/ot4enc.def index 3f8b4ed347e..4ee0bd0bc9c 100644 --- a/Master/texmf-dist/tex/latex-dev/base/ot4enc.def +++ b/Master/texmf-dist/tex/latex-dev/base/ot4enc.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{ot4enc.def} - [2020/01/25 v2.0m + [2020/02/11 v2.0o Standard LaTeX file] \DeclareFontEncoding{OT4}{}{} \DeclareFontSubstitution{OT4}{cmr}{m}{n} diff --git a/Master/texmf-dist/tex/latex-dev/base/preload.cfg b/Master/texmf-dist/tex/latex-dev/base/preload.cfg index 5cdae1ed526..02d8cb532ef 100644 --- a/Master/texmf-dist/tex/latex-dev/base/preload.cfg +++ b/Master/texmf-dist/tex/latex-dev/base/preload.cfg @@ -37,7 +37,7 @@ %% %%% From File: fontdef.dtx \ProvidesFile{preload.cfg} - [2020/01/25 v3.0f LaTeX Kernel + [2020/02/11 v3.0g LaTeX Kernel (Uncustomised preload font setup)] %% diff --git a/Master/texmf-dist/tex/latex-dev/base/t1enc.def b/Master/texmf-dist/tex/latex-dev/base/t1enc.def index 3ba415ede45..0a983d455ca 100644 --- a/Master/texmf-dist/tex/latex-dev/base/t1enc.def +++ b/Master/texmf-dist/tex/latex-dev/base/t1enc.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{t1enc.def} - [2020/01/25 v2.0m + [2020/02/11 v2.0o Standard LaTeX file] \DeclareFontEncoding{T1}{}{} \DeclareTextAccent{\`}{T1}{0} diff --git a/Master/texmf-dist/tex/latex-dev/base/tuenc.def b/Master/texmf-dist/tex/latex-dev/base/tuenc.def index 313278a5723..88093dba94a 100644 --- a/Master/texmf-dist/tex/latex-dev/base/tuenc.def +++ b/Master/texmf-dist/tex/latex-dev/base/tuenc.def @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutenc.dtx \ProvidesFile{tuenc.def} - [2020/01/25 v2.0m + [2020/02/11 v2.0o Standard LaTeX file] \providecommand\UnicodeEncodingName{TU} \begingroup\expandafter\expandafter\expandafter\endgroup -- cgit v1.2.3