summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/base
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-07 21:57:46 +0000
committerKarl Berry <karl@freefriends.org>2020-02-07 21:57:46 +0000
commit536e687dbcddd012465050aa8580c3a3f6dcef5f (patch)
tree45806021c58934e2ee17bca4e75034adfad63ddb /Master/texmf-dist/source/latex/base
parent2e50b494c36f9089053ff2aff45447c34ba8166d (diff)
latex2e (7feb20)
git-svn-id: svn://tug.org/texlive/trunk@53712 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/base')
-rw-r--r--Master/texmf-dist/source/latex/base/ltclass.dtx10
-rw-r--r--Master/texmf-dist/source/latex/base/ltfssaxes.dtx26
-rw-r--r--Master/texmf-dist/source/latex/base/ltfssini.dtx19
-rw-r--r--Master/texmf-dist/source/latex/base/lttextcomp.dtx17
-rw-r--r--Master/texmf-dist/source/latex/base/ltvers.dtx2
5 files changed, 42 insertions, 32 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltclass.dtx b/Master/texmf-dist/source/latex/base/ltclass.dtx
index 9e7668e88e0..96daa3aa30f 100644
--- a/Master/texmf-dist/source/latex/base/ltclass.dtx
+++ b/Master/texmf-dist/source/latex/base/ltclass.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltclass.dtx}
- [2020/01/28 v1.3h LaTeX Kernel (Class & Package Interface)]
+ [2020/02/05 v1.3i LaTeX Kernel (Class & Package Interface)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltclass.dtx}
@@ -1807,11 +1807,11 @@
% \begin{macrocode}
\def\filec@ntents@opt[#1]{%
\edef\@fortmp{\zap@space#1 \@empty}%
- \@for\@reserveda:=\@fortmp\do{%
- \ifcsname filec@ntents@\@reserveda\endcsname
- \csname filec@ntents@\@reserveda\endcsname
+ \@for\reserved@a:=\@fortmp\do{%
+ \ifcsname filec@ntents@\reserved@a\endcsname
+ \csname filec@ntents@\reserved@a\endcsname
\else
- \@latex@error{Unknown filecontents option \@reserveda}%
+ \@latex@error{Unknown filecontents option \reserved@a}%
{Valid options are force (or overwrite), nosearch, noheader}%
\fi}%
\filec@ntents
diff --git a/Master/texmf-dist/source/latex/base/ltfssaxes.dtx b/Master/texmf-dist/source/latex/base/ltfssaxes.dtx
index 4dd7a36ca48..fcf304d1fa9 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/01/30 v1.0a LaTeX Kernel (NFSS Axes handing)]
+ [2020/02/05 v1.0b LaTeX Kernel (NFSS Axes handing)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -739,8 +739,8 @@
% definition of \cs{AmSfont} that is actually the case.
% \begin{macrocode}
%\ifcat\expandafter X\detokenize{#1}X%
- \def\@reserveda{#3}%
- \ifx\@reserveda\@empty
+ \def\reserved@a{#3}%
+ \ifx\reserved@a\@empty
\set@target@series{#2}%
\else
% \end{macrocode}
@@ -751,8 +751,8 @@
% is actually available.
% \begin{macrocode}
\maybe@load@fontshape
- \edef\@reserveda{\f@encoding /\f@family /#1/\f@shape}%
- \ifcsname \@reserveda \endcsname
+ \edef\reserved@a{\f@encoding /\f@family /#1/\f@shape}%
+ \ifcsname \reserved@a \endcsname
% \end{macrocode}
% If the desired result is available then we use that. However, we
% do need some post-processing because we need to drop surplus
@@ -791,10 +791,10 @@
% \cs{@reserveda} above.
% \begin{macrocode}
\def\@font@shape@subst@warning{%
- \edef\@reservedb{\curr@fontshape}%
- \ifx\@reserveda\@reservedb \else
- \@font@warning{Font shape `\@reserveda' undefined\MessageBreak
- using `\@reservedb' instead}%
+ \edef\reserved@b{\curr@fontshape}%
+ \ifx\reserved@a\reserved@b \else
+ \@font@warning{Font shape `\reserved@a' undefined\MessageBreak
+ using `\reserved@b' instead}%
\fi
}
% \end{macrocode}
@@ -1103,13 +1103,13 @@
% ``m''s from the name as we had to for the series.
% \begin{macrocode}
\def\merge@font@shape@#1#2#3\@nil{%
- \def\@reserveda{#3}%
- \ifx\@reserveda\@empty
+ \def\reserved@a{#3}%
+ \ifx\reserved@a\@empty
\edef\f@shape{#2}%
\else
\maybe@load@fontshape
- \edef\@reserveda{\f@encoding /\f@family /\f@series/#1}%
- \ifcsname \@reserveda\endcsname
+ \edef\reserved@a{\f@encoding /\f@family /\f@series/#1}%
+ \ifcsname \reserved@a\endcsname
\edef\f@shape{#1}%
\else
\ifcsname \f@encoding /\f@family /\f@series/#2\endcsname
diff --git a/Master/texmf-dist/source/latex/base/ltfssini.dtx b/Master/texmf-dist/source/latex/base/ltfssini.dtx
index 9687e08b0e6..320c5a181ef 100644
--- a/Master/texmf-dist/source/latex/base/ltfssini.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfssini.dtx
@@ -36,7 +36,7 @@
%
%
\ProvidesFile{ltfssini.dtx}
- [2020/01/11 v3.1f LaTeX Kernel (NFSS Initialisation)]
+ [2020/02/05 v3.1g LaTeX Kernel (NFSS Initialisation)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -279,16 +279,21 @@
% ``tt'' family.
% \begin{macrocode}
\newcommand\DeclareFontSeriesDefault[3][]{%
- \def\@reserveda{#1}%
+ \def\reserved@a{#1}%
% \end{macrocode}
% No optional argument: set up general default.
+% \changes{v3.1g}{2020/02/05}{Corrected misspelled csname (gh/264)}
% \begin{macrocode}
- \ifx\@resereda\@empty
+ \ifx\reserved@a\@empty
\ifcsname #2series\endcsname % supported are
% \[md/bf]default
\expandafter\def
\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}%
{Mandatory first argument must be 'md' or 'bf'.}
\fi
@@ -310,8 +315,8 @@
\csname #2series@#1@kernel\endcsname\@undefined
\else
\@latex@error{Wrong syntax for \string\DeclareFontSeriesDefault}%
- {Optional first argument must be 'rm', 'sf', or 'tt'. \MessageBreak
- Second argument must be 'md' or 'bf'.}
+ {Optional argument must be 'rm', 'sf', or 'tt'. \MessageBreak
+ Mandatory first argument must be 'md' or 'bf'.}
\fi
\fi
}
@@ -678,8 +683,8 @@
% contains all meta families and we need to ignore the case where
% current one from the list and target one are identical.
% \begin{macrocode}
- \def\@reserveda{#1}%
- \ifx\target@meta@family@value\@reserveda % rm -> rm do nothing
+ \def\reserved@a{#1}%
+ \ifx\target@meta@family@value\reserved@a % rm -> rm do nothing
\else
% \end{macrocode}
% We only ``do'' something if the current font family matches the
diff --git a/Master/texmf-dist/source/latex/base/lttextcomp.dtx b/Master/texmf-dist/source/latex/base/lttextcomp.dtx
index eca72e4d28c..c918a836f94 100644
--- a/Master/texmf-dist/source/latex/base/lttextcomp.dtx
+++ b/Master/texmf-dist/source/latex/base/lttextcomp.dtx
@@ -1397,7 +1397,6 @@
%
% \begin{macrocode}
%<*TS1sty>
-\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\providecommand\DeclareRelease[3]{}
\providecommand\DeclareCurrentRelease[2]{}
@@ -1405,7 +1404,13 @@
\DeclareCurrentRelease{}{2020-02-02}
\ProvidesPackage{textcomp}
- [2020/02/02 v2.0m Standard LaTeX package]
+ [2020/02/02 v2.0n Standard LaTeX package]
+% \end{macrocode}
+%
+% A precaution in case this is used without rebuilding the format.
+% \changes{v2.0n}{2020/02/05}{Ensure we are on a new format (gh/260)}
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[2020/02/02]
% \end{macrocode}
%
% This is implemented by defining the default subset:
@@ -1423,12 +1428,12 @@
% results to ensure that there aren't ``missing glyphs''.
%
% The next set of options define the warning level (default in the
-% kernel is info only). If you load the package then the default
-% changes to produce an error message if any substitution happens.
+% kernel is info only). Using the package options you can change this behavior.
+% \changes{v2.0n}{2020/02/05}{Changed the package default to info (gh/262)}
% \begin{macrocode}
-\def\tc@errorwarn{\PackageError{textcomp}}
\DeclareOption{error}{\gdef\tc@errorwarn{\PackageError{textcomp}}}
\DeclareOption{warn}{\gdef\tc@errorwarn#1#2{\PackageWarning{textcomp}{#1}}}
+\DeclareOption{info}{\gdef\tc@errorwarn#1#2{\PackageInfo{textcomp}{#1}}}
\DeclareOption{quiet}{\gdef\tc@errorwarn#1#2{}}
% \end{macrocode}
%
@@ -1453,7 +1458,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ExecuteOptions{}
+\ExecuteOptions{info}
\ProcessOptions\relax
% \end{macrocode}
%
diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx
index b23271f83b3..9223ca1abc1 100644
--- a/Master/texmf-dist/source/latex/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex/base/ltvers.dtx
@@ -115,7 +115,7 @@
{2020-02-02}
%</2ekernel|latexrelease>
%<*2ekernel>
-\def\patch@level{0}
+\def\patch@level{1}
% \end{macrocode}
%
% \begin{macro}{\development@branch@name}