From 2e50b494c36f9089053ff2aff45447c34ba8166d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 7 Feb 2020 21:51:33 +0000 Subject: latex-dev (7feb20) git-svn-id: svn://tug.org/texlive/trunk@53711 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex-dev/base/latex.ltx | 46 +++++++++++----------- .../texmf-dist/tex/latex-dev/base/latexrelease.sty | 46 +++++++++++----------- Master/texmf-dist/tex/latex-dev/base/textcomp.sty | 8 ++-- 3 files changed, 50 insertions(+), 50 deletions(-) (limited to 'Master/texmf-dist/tex/latex-dev/base') diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx index 0378238a9a4..30db2cded55 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{0} +\def\patch@level{-1} \edef\development@branch@name{develop \the\year-\the\month-\the\day} \iffalse \def\reserved@a#1/#2/#3\@nil{% @@ -3264,13 +3264,13 @@ Type H for immediate help.}% } \def\merge@font@series@#1#2#3\@nil{% - \def\@reserveda{#3}% - \ifx\@reserveda\@empty + \def\reserved@a{#3}% + \ifx\reserved@a\@empty \set@target@series{#2}% \else \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 \set@target@series{#1}% \else \ifcsname \f@encoding /\f@family /#2/\f@shape \endcsname @@ -3284,10 +3284,10 @@ Type H for immediate help.}% \fi } \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 } \def\maybe@load@fontshape{\begingroup\try@load@fontshape\endgroup} @@ -3363,13 +3363,13 @@ Type H for immediate help.}% } \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 @@ -4585,8 +4585,8 @@ Type H for immediate help.}% {\not@math@alphabet\itshape\mathit \fontshape\itdefault\selectfont} \newcommand\DeclareFontSeriesDefault[3][]{% - \def\@reserveda{#1}% - \ifx\@resereda\@empty + \def\reserved@a{#1}% + \ifx\reserved@a\@empty \ifcsname #2series\endcsname % supported are % \[md/bf]default \expandafter\def @@ -4604,8 +4604,8 @@ Type H for immediate help.}% \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 } @@ -4690,8 +4690,8 @@ Type H for immediate help.}% \fi } \def\update@series@target@value#1{% - \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 \expandafter\ifx\csname#1def@ult\endcsname\f@family \let\@elt\@gobble @@ -9478,11 +9478,11 @@ Type H for immediate help.}% } \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/tex/latex-dev/base/latexrelease.sty b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty index fef28021941..928b9e11354 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty @@ -2776,11 +2776,11 @@ of this package available from CTAN} } \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 @@ -3750,8 +3750,8 @@ of this package available from CTAN} \IncludeInRelease{2020/02/02}% {\DeclareFontSeriesDefault}{Custom series}% \newcommand\DeclareFontSeriesDefault[3][]{% - \def\@reserveda{#1}% - \ifx\@resereda\@empty + \def\reserved@a{#1}% + \ifx\reserved@a\@empty \ifcsname #2series\endcsname % supported are % \[md/bf]default \expandafter\def @@ -3769,8 +3769,8 @@ of this package available from CTAN} \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 } @@ -3855,8 +3855,8 @@ of this package available from CTAN} \fi } \def\update@series@target@value#1{% - \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 \expandafter\ifx\csname#1def@ult\endcsname\f@family \let\@elt\@gobble @@ -5434,13 +5434,13 @@ of this package available from CTAN} } \def\merge@font@series@#1#2#3\@nil{% - \def\@reserveda{#3}% - \ifx\@reserveda\@empty + \def\reserved@a{#3}% + \ifx\reserved@a\@empty \set@target@series{#2}% \else \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 \set@target@series{#1}% \else \ifcsname \f@encoding /\f@family /#2/\f@shape \endcsname @@ -5454,10 +5454,10 @@ of this package available from CTAN} \fi } \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 } \def\maybe@load@fontshape{\begingroup\try@load@fontshape\endgroup} @@ -5533,13 +5533,13 @@ of this package available from CTAN} } \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 @@ -5611,7 +5611,7 @@ of this package available from CTAN} %%% From File: ltfsstrc.dtx %% Copyright (C) 1989-97 by Frank Mittelbach and Rainer Sch\"opf. %% Copyright (C) 1994-97 by LaTeX3 project. All rights reserved. -\IncludeInRelease{2020/02/01}% +\IncludeInRelease{2020/02/02}% {\@font@aliasinfo}{alias size function}% \DeclareSizeFunction{alias}{\sub@sfcnt\@font@aliasinfo} \def\@font@aliasinfo#1{% diff --git a/Master/texmf-dist/tex/latex-dev/base/textcomp.sty b/Master/texmf-dist/tex/latex-dev/base/textcomp.sty index cb0abba2c95..b6e340e8195 100644 --- a/Master/texmf-dist/tex/latex-dev/base/textcomp.sty +++ b/Master/texmf-dist/tex/latex-dev/base/textcomp.sty @@ -42,7 +42,6 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. -\NeedsTeXFormat{LaTeX2e}[1995/06/01] \providecommand\DeclareRelease[3]{} \providecommand\DeclareCurrentRelease[2]{} @@ -50,14 +49,15 @@ \DeclareCurrentRelease{}{2020-02-02} \ProvidesPackage{textcomp} - [2020/02/02 v2.0m Standard LaTeX package] + [2020/02/02 v2.0n Standard LaTeX package] +\NeedsTeXFormat{LaTeX2e}[2020/02/02] \DeclareOption{full}{\DeclareEncodingSubset{TS1}{?}{0}} \DeclareOption{almostfull}{\DeclareEncodingSubset{TS1}{?}{1}} \DeclareOption{euro}{\DeclareEncodingSubset{TS1}{?}{8}} \DeclareOption{safe}{\DeclareEncodingSubset{TS1}{?}{9}} -\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{}} \DeclareOption{force}{% \def\CheckEncodingSubset#1#2#3#4#5{% @@ -71,7 +71,7 @@ {#1{#2}}{#3}% #5}% } -\ExecuteOptions{} +\ExecuteOptions{info} \ProcessOptions\relax \InputIfFileExists{textcomp.cfg} {\PackageInfo{textcomp}{Local configuration file used}}{} -- cgit v1.2.3