summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex-dev
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-06-05 21:10:24 +0000
committerKarl Berry <karl@freefriends.org>2021-06-05 21:10:24 +0000
commit9c010ac1d8ca51f8cc3735f106cb91f4dd1c8690 (patch)
tree5cc38c1c7a2c26a3dc483b67cdf6eb27c3ce3984 /Master/texmf-dist/source/latex-dev
parent5b7ef85ce25670aae3176daeee0a21757631bebc (diff)
latex-dev (5jun21)
git-svn-id: svn://tug.org/texlive/trunk@59474 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex-dev')
-rw-r--r--Master/texmf-dist/source/latex-dev/amsmath/amsbsy.dtx5
-rw-r--r--Master/texmf-dist/source/latex-dev/amsmath/amsbsy.ins13
-rw-r--r--Master/texmf-dist/source/latex-dev/amsmath/amscd.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/amsmath/amscd.ins12
-rw-r--r--Master/texmf-dist/source/latex-dev/amsmath/amsgen.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/amsmath/amsgen.ins12
-rw-r--r--Master/texmf-dist/source/latex-dev/amsmath/amsmath.dtx9
-rw-r--r--Master/texmf-dist/source/latex-dev/amsmath/amsmath.ins12
-rw-r--r--Master/texmf-dist/source/latex-dev/amsmath/amsopn.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/amsmath/amsopn.ins12
-rw-r--r--Master/texmf-dist/source/latex-dev/amsmath/amstext.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/amsmath/amstext.ins12
-rw-r--r--Master/texmf-dist/source/latex-dev/amsmath/amsxtra.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/amsmath/amsxtra.ins12
-rw-r--r--Master/texmf-dist/source/latex-dev/base/doc.dtx5
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltclass.dtx12
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltcmd.dtx173
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltcmdhooks.dtx33
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltdefns.dtx7
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltfilehook.dtx9
-rw-r--r--Master/texmf-dist/source/latex-dev/base/lthooks.dtx103
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltoutput.dtx16
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltpara.dtx35
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltvers.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/firstaid/firstaid.ins2
-rw-r--r--Master/texmf-dist/source/latex-dev/firstaid/latex2e-first-aid-for-external-files.dtx45
-rw-r--r--Master/texmf-dist/source/latex-dev/tools/longtable.dtx6
27 files changed, 314 insertions, 255 deletions
diff --git a/Master/texmf-dist/source/latex-dev/amsmath/amsbsy.dtx b/Master/texmf-dist/source/latex-dev/amsmath/amsbsy.dtx
index 11747842787..8557c6534a4 100644
--- a/Master/texmf-dist/source/latex-dev/amsmath/amsbsy.dtx
+++ b/Master/texmf-dist/source/latex-dev/amsmath/amsbsy.dtx
@@ -2,7 +2,8 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2021
+% LaTeX Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -14,7 +15,7 @@
%
% This work has the LPPL maintenance status `maintained'.
%
-% The Current Maintainer of this work is the LaTeX3 Project.
+% The Current Maintainer of this work is the LaTeX Project.
%
% \fi
%
diff --git a/Master/texmf-dist/source/latex-dev/amsmath/amsbsy.ins b/Master/texmf-dist/source/latex-dev/amsmath/amsbsy.ins
index 07707907e9c..91946086223 100644
--- a/Master/texmf-dist/source/latex-dev/amsmath/amsbsy.ins
+++ b/Master/texmf-dist/source/latex-dev/amsmath/amsbsy.ins
@@ -1,6 +1,7 @@
%%
-%% Copyright 2010 American Mathematical Society.
-%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
+%% Copyright (C) 2010 American Mathematical Society.
+%% Copyright (C) 2016-2021
+% LaTeX Project and American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -12,7 +13,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is the LaTeX3 Project.
+%% The Current Maintainer of this work is the LaTeX Project.
%%
%% ====================================================================
@@ -24,8 +25,8 @@
\preamble
-Copyright 1995, 1999 American Mathematical Society.
-Copyright 2016 LaTeX3 Project and American Mathematical Society.
+Copyright (C) 1995, 1999 American Mathematical Society.
+Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
@@ -37,7 +38,7 @@ version 2005/12/01 or later.
This work has the LPPL maintenance status `maintained'.
-The Current Maintainer of this work is the LaTeX3 project.
+The Current Maintainer of this work is the LaTeX Project.
\endpreamble
diff --git a/Master/texmf-dist/source/latex-dev/amsmath/amscd.dtx b/Master/texmf-dist/source/latex-dev/amsmath/amscd.dtx
index 12e94a11dc1..f3528dd7c1b 100644
--- a/Master/texmf-dist/source/latex-dev/amsmath/amscd.dtx
+++ b/Master/texmf-dist/source/latex-dev/amsmath/amscd.dtx
@@ -2,7 +2,7 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -14,7 +14,7 @@
%
% This work has the LPPL maintenance status `maintained'.
%
-% The Current Maintainer of this work is the LaTeX3 Project.
+% The Current Maintainer of this work is the LaTeX Project.
%
% \fi
%
diff --git a/Master/texmf-dist/source/latex-dev/amsmath/amscd.ins b/Master/texmf-dist/source/latex-dev/amsmath/amscd.ins
index 5890ca06c10..30b2f281777 100644
--- a/Master/texmf-dist/source/latex-dev/amsmath/amscd.ins
+++ b/Master/texmf-dist/source/latex-dev/amsmath/amscd.ins
@@ -1,6 +1,6 @@
%%
-%% Copyright 2010 American Mathematical Society.
-%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
+%% Copyright (C) 2010 American Mathematical Society.
+%% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -12,7 +12,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is the LaTeX3 Project.
+%% The Current Maintainer of this work is the LaTeX Project.
%%
%% ====================================================================
@@ -24,8 +24,8 @@
\preamble
-Copyright 1995, 1999 American Mathematical Society.
-Copyright 2016 LaTeX3 Project and American Mathematical Society.
+Copyright (C) 1995, 1999 American Mathematical Society.
+Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
@@ -37,7 +37,7 @@ version 2005/12/01 or later.
This work has the LPPL maintenance status `maintained'.
-The Current Maintainer of this work is the LaTeX3 project.
+The Current Maintainer of this work is the LaTeX Project.
\endpreamble
diff --git a/Master/texmf-dist/source/latex-dev/amsmath/amsgen.dtx b/Master/texmf-dist/source/latex-dev/amsmath/amsgen.dtx
index 92df548f127..10ac58b18ed 100644
--- a/Master/texmf-dist/source/latex-dev/amsmath/amsgen.dtx
+++ b/Master/texmf-dist/source/latex-dev/amsmath/amsgen.dtx
@@ -2,7 +2,7 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -14,7 +14,7 @@
%
% This work has the LPPL maintenance status `maintained'.
%
-% The Current Maintainer of this work is the LaTeX3 Project.
+% The Current Maintainer of this work is the LaTeX Project.
%
% \fi
%
diff --git a/Master/texmf-dist/source/latex-dev/amsmath/amsgen.ins b/Master/texmf-dist/source/latex-dev/amsmath/amsgen.ins
index be7720bc891..aacb6e0c393 100644
--- a/Master/texmf-dist/source/latex-dev/amsmath/amsgen.ins
+++ b/Master/texmf-dist/source/latex-dev/amsmath/amsgen.ins
@@ -1,6 +1,6 @@
%%
-%% Copyright 2010 American Mathematical Society.
-%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
+%% Copyright (C) 2010 American Mathematical Society.
+%% Copyright (C) 2016 LaTeX Project and American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -12,7 +12,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is the LaTeX3 Project.
+%% The Current Maintainer of this work is the LaTeX Project.
%%
%% ====================================================================
@@ -24,8 +24,8 @@
\preamble
-Copyright 1995, 1999 American Mathematical Society.
-Copyright 2016 LaTeX3 Project and American Mathematical Society.
+Copyright (C) 1995, 1999 American Mathematical Society.
+Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
@@ -37,7 +37,7 @@ version 2005/12/01 or later.
This work has the LPPL maintenance status `maintained'.
-The Current Maintainer of this work is the LaTeX3 project.
+The Current Maintainer of this work is the LaTeX Project.
\endpreamble
diff --git a/Master/texmf-dist/source/latex-dev/amsmath/amsmath.dtx b/Master/texmf-dist/source/latex-dev/amsmath/amsmath.dtx
index 7f324700f67..88578611019 100644
--- a/Master/texmf-dist/source/latex-dev/amsmath/amsmath.dtx
+++ b/Master/texmf-dist/source/latex-dev/amsmath/amsmath.dtx
@@ -2,7 +2,7 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 2000, 2013 American Mathematical Society.
-% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -14,7 +14,7 @@
%
% This work has the LPPL maintenance status `maintained'.
%
-% The Current Maintainer of this work is the LaTeX3 Project.
+% The Current Maintainer of this work is the LaTeX Project.
%
% \fi
%
@@ -86,7 +86,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesPackage{amsmath}[2020/09/23 v2.17i AMS math features]
+\ProvidesPackage{amsmath}[2021/04/20 v2.17j AMS math features]
% \end{macrocode}
%
% \section{Catcode defenses}
@@ -2752,8 +2752,9 @@ ill-advised in LaTeX.%
% \textit{u} template of the current column if the author ended the
% current row with an empty column (i.e., the mathcr was immediately
% preceded by an ampersand).
+% \changes{v2.17j}{2021/04/20}{Use \cs{protected} for \cs{\bslash} variant (gh/548)}
% \begin{macrocode}
-\def\math@cr{\relax\iffalse{\fi\ifnum0=`}\fi
+\protected\def\math@cr{\relax\iffalse{\fi\ifnum0=`}\fi
% \end{macrocode}
% The first step is now to check whether an asterisk follows.
% \cs{@eqpen} is used to hold the penalty value to be put on
diff --git a/Master/texmf-dist/source/latex-dev/amsmath/amsmath.ins b/Master/texmf-dist/source/latex-dev/amsmath/amsmath.ins
index 55e40898042..1bb73101bb5 100644
--- a/Master/texmf-dist/source/latex-dev/amsmath/amsmath.ins
+++ b/Master/texmf-dist/source/latex-dev/amsmath/amsmath.ins
@@ -1,6 +1,6 @@
%%
-%% Copyright 2010 American Mathematical Society.
-%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
+%% Copyright (C) 2010 American Mathematical Society.
+%% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -12,7 +12,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is the LaTeX3 Project.
+%% The Current Maintainer of this work is the LaTeX Project.
%%
%% ====================================================================
@@ -24,8 +24,8 @@
\preamble
-Copyright 1995, 1999, 2000, 2013 American Mathematical Society.
-Copyright 2016 LaTeX3 Project and American Mathematical Society.
+Copyright (C) 1995, 1999, 2000, 2013 American Mathematical Society.
+Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
@@ -37,7 +37,7 @@ version 2005/12/01 or later.
This work has the LPPL maintenance status `maintained'.
-The Current Maintainer of this work is the LaTeX3 project.
+The Current Maintainer of this work is the LaTeX Project.
\endpreamble
diff --git a/Master/texmf-dist/source/latex-dev/amsmath/amsopn.dtx b/Master/texmf-dist/source/latex-dev/amsmath/amsopn.dtx
index 35c3b1605bc..a71c13d6c89 100644
--- a/Master/texmf-dist/source/latex-dev/amsmath/amsopn.dtx
+++ b/Master/texmf-dist/source/latex-dev/amsmath/amsopn.dtx
@@ -2,7 +2,7 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -14,7 +14,7 @@
%
% This work has the LPPL maintenance status `maintained'.
%
-% The Current Maintainer of this work is the LaTeX3 Project.
+% The Current Maintainer of this work is the LaTeX Project.
%
% \fi
%
diff --git a/Master/texmf-dist/source/latex-dev/amsmath/amsopn.ins b/Master/texmf-dist/source/latex-dev/amsmath/amsopn.ins
index 84aff6243b9..72c649c3409 100644
--- a/Master/texmf-dist/source/latex-dev/amsmath/amsopn.ins
+++ b/Master/texmf-dist/source/latex-dev/amsmath/amsopn.ins
@@ -1,6 +1,6 @@
%%
-%% Copyright 2010 American Mathematical Society.
-%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
+%% Copyright (C) 2010 American Mathematical Society.
+%% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -12,7 +12,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is the LaTeX3 Project.
+%% The Current Maintainer of this work is the LaTeX Project.
%%
%% ====================================================================
@@ -24,8 +24,8 @@
\preamble
-Copyright 1995, 1999 American Mathematical Society.
-Copyright 2016 LaTeX3 Project and American Mathematical Society.
+Copyright (C) 1995, 1999 American Mathematical Society.
+Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
@@ -37,7 +37,7 @@ version 2005/12/01 or later.
This work has the LPPL maintenance status `maintained'.
-The Current Maintainer of this work is the LaTeX3 project.
+The Current Maintainer of this work is the LaTeX Project.
\endpreamble
diff --git a/Master/texmf-dist/source/latex-dev/amsmath/amstext.dtx b/Master/texmf-dist/source/latex-dev/amsmath/amstext.dtx
index 5e7e6ca6720..d6475561fb0 100644
--- a/Master/texmf-dist/source/latex-dev/amsmath/amstext.dtx
+++ b/Master/texmf-dist/source/latex-dev/amsmath/amstext.dtx
@@ -2,7 +2,7 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -14,7 +14,7 @@
%
% This work has the LPPL maintenance status `maintained'.
%
-% The Current Maintainer of this work is the LaTeX3 Project.
+% The Current Maintainer of this work is the LaTeX Project.
%
% \fi
%
diff --git a/Master/texmf-dist/source/latex-dev/amsmath/amstext.ins b/Master/texmf-dist/source/latex-dev/amsmath/amstext.ins
index 5f9a5c4076a..5578a7e9473 100644
--- a/Master/texmf-dist/source/latex-dev/amsmath/amstext.ins
+++ b/Master/texmf-dist/source/latex-dev/amsmath/amstext.ins
@@ -1,6 +1,6 @@
%%
-%% Copyright 2010 American Mathematical Society.
-%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
+%% Copyright (C) 2010 American Mathematical Society.
+%% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -12,7 +12,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is the LaTeX3 Project.
+%% The Current Maintainer of this work is the LaTeX Project.
%%
%% ====================================================================
@@ -24,8 +24,8 @@
\preamble
-Copyright 1995, 1999 American Mathematical Society.
-Copyright 2016 LaTeX3 Project and American Mathematical Society.
+Copyright (C) 1995, 1999 American Mathematical Society.
+Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
@@ -37,7 +37,7 @@ version 2005/12/01 or later.
This work has the LPPL maintenance status `maintained'.
-The Current Maintainer of this work is the LaTeX3 project.
+The Current Maintainer of this work is the LaTeX Project.
\endpreamble
diff --git a/Master/texmf-dist/source/latex-dev/amsmath/amsxtra.dtx b/Master/texmf-dist/source/latex-dev/amsmath/amsxtra.dtx
index 9cc0b710273..aaa5fd1a2db 100644
--- a/Master/texmf-dist/source/latex-dev/amsmath/amsxtra.dtx
+++ b/Master/texmf-dist/source/latex-dev/amsmath/amsxtra.dtx
@@ -2,7 +2,7 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 1999 American Mathematical Society.
-% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -14,7 +14,7 @@
%
% This work has the LPPL maintenance status `maintained'.
%
-% The Current Maintainer of this work is the LaTeX3 Project.
+% The Current Maintainer of this work is the LaTeX Project.
%
% \fi
%
diff --git a/Master/texmf-dist/source/latex-dev/amsmath/amsxtra.ins b/Master/texmf-dist/source/latex-dev/amsmath/amsxtra.ins
index bbcd08e3f7a..7eca6e065ad 100644
--- a/Master/texmf-dist/source/latex-dev/amsmath/amsxtra.ins
+++ b/Master/texmf-dist/source/latex-dev/amsmath/amsxtra.ins
@@ -1,6 +1,6 @@
%%
-%% Copyright 2010 American Mathematical Society.
-%% Copyright 2016 LaTeX3 Project and American Mathematical Society.
+%% Copyright (C) 2010 American Mathematical Society.
+%% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -12,7 +12,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is the LaTeX3 Project.
+%% The Current Maintainer of this work is the LaTeX Project.
%%
%% ====================================================================
@@ -24,8 +24,8 @@
\preamble
-Copyright 1995, 1999 American Mathematical Society.
-Copyright 2016 LaTeX3 Project and American Mathematical Society.
+Copyright (C) 1995, 1999 American Mathematical Society.
+Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society.
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
@@ -37,7 +37,7 @@ version 2005/12/01 or later.
This work has the LPPL maintenance status `maintained'.
-The Current Maintainer of this work is the LaTeX3 project.
+The Current Maintainer of this work is the LaTeX Project.
\endpreamble
diff --git a/Master/texmf-dist/source/latex-dev/base/doc.dtx b/Master/texmf-dist/source/latex-dev/base/doc.dtx
index c1a96948a89..fb3412f21f4 100644
--- a/Master/texmf-dist/source/latex-dev/base/doc.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/doc.dtx
@@ -35,7 +35,7 @@
%<+package|shortvrb>\NeedsTeXFormat{LaTeX2e}[1994/12/01]
%<+package> \ProvidesPackage{doc}
%<+shortvrb>\ProvidesPackage{shortvrb}
-%<+package|shortvrb> [2020/11/23 v2.1m
+%<+package|shortvrb> [2021/05/28 v2.1n
%<+package|shortvrb> Standard LaTeX documentation package (FMi)]
%\catcode`\<=12
%
@@ -2117,6 +2117,7 @@
% \begin{macro}{\verb@eol@error}
% \changes{v1.8b}{1993/09/21}{Renamed \cs{verb@err} to
% \cs{verb@eol@error}, as in new LaTeX verbatim.}
+% \changes{v2.1n}{2021/05/28}{Use same error message text as in format}
% \begin{macrocode}
\let\verb@balance@group\@empty
@@ -2126,7 +2127,7 @@
\obeylines%
\gdef\verb@eol@error{\obeylines%
\def^^M{\verb@egroup\@latex@error{%
- Text for \noexpand\verb command ended by end of line}\@ehc}}%
+ \noexpand\verb ended by end of line}\@ehc}}%
\endgroup
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltclass.dtx b/Master/texmf-dist/source/latex-dev/base/ltclass.dtx
index 06b0e1cf43f..a0ab0fa3547 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}
- [2021/03/27 v1.4a LaTeX Kernel (Class & Package Interface)]
+ [2021/05/18 v1.4b LaTeX Kernel (Class & Package Interface)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltclass.dtx}
@@ -505,6 +505,14 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\@raw@classoptionslist}
+% List of options of the main class (unprocessed).
+% \changes{v1.4b}{2021/05/18}{Initialise to \cs{relax} to match \cs{@classoptionslist}}
+% \begin{macrocode}
+\let\@raw@classoptionslist\relax
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\@unusedoptionlist}
% \changes{v1.0u}{1996/07/26}{made only preamble}
% List of options of the main class that haven't been declared or
@@ -1910,7 +1918,7 @@
% \begin{macrocode}
\ifx\@nnil##1\relax\else
% \end{macrocode}
-% If |\ifx\@nnil##1\n@nil| is true then |#1| is (presumably) empty
+% If |\ifx\@nnil##1\@nnil| is true then |#1| is (presumably) empty
% (Older code used |\relax| which is slightly easier to get into |#1|
% by mistake, which would spoil this test.)
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltcmd.dtx b/Master/texmf-dist/source/latex-dev/base/ltcmd.dtx
index fee555586da..806161d5386 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltcmd.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltcmd.dtx
@@ -34,8 +34,8 @@
%%% From File: ltcmd.dtx
%
% \begin{macrocode}
-\def\ltcmdversion{v1.0d}
-\def\ltcmddate{2021-04-19}
+\def\ltcmdversion{v1.0e}
+\def\ltcmddate{2021-05-24}
% \end{macrocode}
%
%<*driver>
@@ -80,6 +80,9 @@
% \end{macrocode}
%
% \changes{v1.0b}{2021/03/18}{Use \cs{NewModuleRelease}.}
+% \changes{v1.0e}{2021/05/24}{Use \cs{msg_...} instead of \cs{__kernel_msg...}}
+%
+%
% \pkg{ltcmd} code contains an |^^@| character, which usually has
% catcode~15, so \cs{IncludeInRelease} will break when this code is
% being skipped, so we'll save the catcode of |^^@| to restore later:
@@ -328,7 +331,12 @@
% switched off by default, unless the |log-declarations| package
% option was used, so here we'll switch that off as well.
% \begin{macrocode}
-\msg_redirect_module:nnn { LaTeX / ltcmd } { info } { none }
+\msg_redirect_module:nnn { cmd } { info } { none }
+% \end{macrocode}
+%
+% Also add \pkg{cmd} to the \pkg{LaTeX} messages.
+% \begin{macrocode}
+\prop_gput:Nnn \g_msg_module_type_prop { cmd } { LaTeX }
% \end{macrocode}
%
% \subsection{Declaring commands and environments}
@@ -358,7 +366,7 @@
{
\cs_if_exist:NTF #1
{
- \__kernel_msg_info:nnxx { ltcmd } { redefine-command }
+ \msg_info:nnxx { cmd } { redefine-command }
{ \token_to_str:N #1 } { \tl_to_str:n {#2} }
}
{
@@ -366,10 +374,10 @@
{ \cs_if_exist_p:c { \cs_to_str:N #1 ~ code } }
{ \cs_if_exist_p:c { \cs_to_str:N #1 ~ defaults } }
{
- \__kernel_msg_warning:nnx { ltcmd } { unsupported-let }
+ \msg_warning:nnx { cmd } { unsupported-let }
{ \token_to_str:N #1 }
}
- \__kernel_msg_info:nnxx { ltcmd } { define-command }
+ \msg_info:nnxx { cmd } { define-command }
{ \token_to_str:N #1 } { \tl_to_str:n {#2} }
}
\bool_set_false:N \l_@@_environment_bool
@@ -528,11 +536,11 @@
{ \tl_trim_spaces:o { \l_@@_environment_str } }
\cs_if_exist:cTF { \l_@@_environment_str }
{
- \__kernel_msg_info:nnxx { ltcmd } { redefine-environment }
+ \msg_info:nnxx { cmd } { redefine-environment }
{ \l_@@_environment_str } { \tl_to_str:n {#2} }
}
{
- \__kernel_msg_info:nnxx { ltcmd } { define-environment }
+ \msg_info:nnxx { cmd } { define-environment }
{ \l_@@_environment_str } { \tl_to_str:n {#2} }
}
\bool_set_false:N \l_@@_expandable_bool
@@ -685,7 +693,7 @@
}
\cs_new_protected:Npn \@@_defaults_error:w \q_recursion_stop
{
- \__kernel_msg_error:nnx { ltcmd } { loop-in-defaults }
+ \msg_error:nnx { cmd } { loop-in-defaults }
{ \@@_environment_or_command: }
}
% \end{macrocode}
@@ -813,8 +821,7 @@
\@@_end_expandable_defaults:nnnNNn {#1} { } {#1} #2#3
{ } { } { } { } { } { } { } { } { } { }
{
- \__kernel_msg_expandable_error:nnf
- { ltcmd } { loop-in-defaults }
+ \msg_expandable_error:nnf { cmd } { loop-in-defaults }
{ \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N #4 } }
\use_iv:nnnn
}
@@ -912,7 +919,7 @@
\q_recursion_tail \q_recursion_tail \q_recursion_tail \q_recursion_stop
\int_compare:nNnT \l_@@_current_arg_int > 9
{
- \__kernel_msg_error:nnxx { ltcmd } { too-many-arguments }
+ \msg_error:nnxx { cmd } { too-many-arguments }
{ \@@_environment_or_command: } { \tl_to_str:n {#1} }
\@@_bad_def:wn
}
@@ -920,7 +927,7 @@
{
\tl_if_empty:NF \l_@@_last_delimiters_tl
{
- \__kernel_msg_error:nnxx { ltcmd } { expandable-ending-optional }
+ \msg_error:nnxx { cmd } { expandable-ending-optional }
{ \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
\@@_bad_def:wn
}
@@ -944,11 +951,11 @@
{ \str_if_eq_p:nn {#1} { u } }
}
{
- \__kernel_msg_error:nnxx { ltcmd } { xparse-argument-type }
+ \msg_error:nnxx { cmd } { xparse-argument-type }
{ \@@_environment_or_command: } { \tl_to_str:n {#1} }
}
{
- \__kernel_msg_error:nnxx { ltcmd } { unknown-argument-type }
+ \msg_error:nnxx { cmd } { unknown-argument-type }
{ \@@_environment_or_command: } { \tl_to_str:n {#1} }
}
\@@_bad_def:wn
@@ -1020,7 +1027,7 @@
\quark_if_recursion_tail_stop_do:nn {#2} { \@@_bad_arg_spec:wn }
\bool_if:NT \l_@@_expandable_bool
{
- \__kernel_msg_error:nnxx { ltcmd } { processor-in-expandable }
+ \msg_error:nnxx { cmd } { processor-in-expandable }
{ \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
\@@_bad_def:wn
}
@@ -1034,7 +1041,7 @@
\quark_if_recursion_tail_stop_do:nn {#1} { \@@_bad_arg_spec:wn }
\bool_if:NT \l_@@_long_bool
{
- \__kernel_msg_error:nnxx { ltcmd } { two-markers }
+ \msg_error:nnxx { cmd } { two-markers }
{ \@@_environment_or_command: } { + }
\@@_bad_def:wn
}
@@ -1047,7 +1054,7 @@
\quark_if_recursion_tail_stop_do:nn {#1} { \@@_bad_arg_spec:wn }
\bool_if:NT \l_@@_obey_spaces_bool
{
- \__kernel_msg_error:nnxx { ltcmd } { two-markers }
+ \msg_error:nnxx { cmd } { two-markers }
{ \@@_environment_or_command: } { ! }
\@@_bad_def:wn
}
@@ -1179,15 +1186,14 @@
{
\bool_if:NF \l_@@_environment_bool
{
- \__kernel_msg_error:nnxx
- { ltcmd } { invalid-command-arg }
+ \msg_error:nnxx { cmd } { invalid-command-arg }
{ \@@_environment_or_command: } { b }
\@@_bad_def:wn
}
\tl_clear:N \l_@@_last_delimiters_tl
\@@_add_arg_spec:n { b }
\quark_if_recursion_tail_stop:n {#1}
- \__kernel_msg_error:nnxx { ltcmd } { arg-after-body }
+ \msg_error:nnxx { cmd } { arg-after-body }
{ \@@_environment_or_command: }
{ \tl_to_str:n {#1} }
\@@_bad_def:wn
@@ -1203,7 +1209,7 @@
{
\tl_trim_spaces_apply:nN {#1} \tl_if_single_token:nF
{
- \__kernel_msg_error:nnxx { ltcmd } { not-single-token }
+ \msg_error:nnxx { cmd } { not-single-token }
{ \@@_environment_or_command: } { \tl_to_str:n {#1} }
\@@_bad_def:wn
}
@@ -1235,8 +1241,7 @@
{ \use_none:n }
}
{
- \__kernel_msg_error:nnxxx
- { ltcmd } { forbidden-implicit-group-token }
+ \msg_error:nnxxx { cmd } { forbidden-implicit-group-token }
{ \@@_environment_or_command: } { \tl_to_str:n {#1} }
{
\token_if_eq_meaning:NNTF #1 \c_group_begin_token
@@ -1256,8 +1261,7 @@
{
\bool_if:NT \l_@@_expandable_bool
{
- \__kernel_msg_error:nnxx
- { ltcmd } { invalid-expandable-argument-type }
+ \msg_error:nnxx { cmd } { invalid-expandable-argument-type }
{ \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
\@@_bad_def:wn
}
@@ -1269,8 +1273,7 @@
{
\tl_if_empty:NF \l_@@_last_delimiters_tl
{
- \__kernel_msg_error:nnxx
- { ltcmd } { invalid-after-optional-expandably }
+ \msg_error:nnxx { cmd } { invalid-after-optional-expandably }
{ \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
\@@_bad_def:wn
}
@@ -1291,7 +1294,7 @@
{
\tl_if_eq:nnT {##1} {#1}
{
- \__kernel_msg_warning:nnxx { ltcmd } { optional-mandatory }
+ \msg_warning:nnxx { cmd } { optional-mandatory }
{#2} {#3}
}
}
@@ -1305,7 +1308,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_bad_arg_spec:wn #1 \@@_break_point:n #2
{
- \__kernel_msg_error:nnxx { ltcmd } { bad-arg-spec }
+ \msg_error:nnxx { cmd } { bad-arg-spec }
{ \@@_environment_or_command: } { \tl_to_str:n {#2} }
}
\cs_new_protected:Npn \@@_bad_def:wn #1 \@@_break_point:n #2 { }
@@ -1331,7 +1334,7 @@
{
\bool_if:NT \l_@@_expandable_bool
{
- \__kernel_msg_error:nnx { ltcmd } { inconsistent-long }
+ \msg_error:nnx { cmd } { inconsistent-long }
{ \iow_char:N \\ \l_@@_function_tl }
\@@_bad_def:wn
}
@@ -1353,7 +1356,7 @@
{
\bool_if:NT \l_@@_some_obey_spaces_bool
{
- \__kernel_msg_error:nnxx { ltcmd } { non-trailing-obey-spaces }
+ \msg_error:nnxx { cmd } { non-trailing-obey-spaces }
{ \@@_environment_or_command: } { \tl_to_str:n {#1} }
\@@_bad_def:wn
}
@@ -2331,7 +2334,7 @@
\@@_peek_nonspace_remove:NTF #1
{ \@@_grab_D_call:Nw #1 }
{
- \__kernel_msg_error:nnxx { ltcmd } { missing-required }
+ \msg_error:nnxx { cmd } { missing-required }
{ \@@_environment_or_command: }
{ \token_to_str:N #1 }
\@@_add_arg:o \c_novalue_tl
@@ -2584,14 +2587,14 @@
\exp_after:wN \exp_after:wN \exp_after:wN
\peek_meaning_remove:NTF \char_generate:nn { \tex_endlinechar:D } { 6 }
{
- \__kernel_msg_error:nnxxx { ltcmd } { verbatim-newline }
+ \msg_error:nnxxx { cmd } { verbatim-newline }
{ \@@_environment_or_command: }
{ \tl_to_str:N \l_@@_v_arg_tl }
{ \tl_to_str:n {#1} }
\@@_add_arg:o \c_novalue_tl
}
{
- \__kernel_msg_error:nnxxx { ltcmd } { verbatim-tokenized }
+ \msg_error:nnxxx { cmd } { verbatim-tokenized }
{ \@@_environment_or_command: }
{ \tl_to_str:N \l_@@_v_arg_tl }
{ \tl_to_str:n {#1} }
@@ -2942,8 +2945,7 @@
\q_nil { } ##2 \ERROR \q_@@ \ERROR
}
{
- \__kernel_msg_expandable_error:nnff
- { ltcmd } { missing-required }
+ \msg_expandable_error:nnff { cmd } { missing-required }
{ \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N ##5 } }
{ \tl_to_str:n {##2} }
##4 {#1} \q_@@ ##5 ##6 {##7}
@@ -2980,8 +2982,7 @@
##6 \ERROR
}
{
- \__kernel_msg_expandable_error:nnff
- { ltcmd } { missing-required }
+ \msg_expandable_error:nnff { cmd } { missing-required }
{ \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N ##4 } }
{ \tl_to_str:n {##2} }
##3 {#1} \q_@@ ##4 ##5 {##6}
@@ -3114,7 +3115,7 @@
\ProcessedArgument
\q_stop
}
- \__kernel_msg_error:nnxxx { ltcmd } { split-excess-tokens }
+ \msg_error:nnxxx { cmd } { split-excess-tokens }
{ \tl_to_str:n {#3} } { \int_eval:n { #2 + 1 } }
{ \tl_to_str:n {#4} }
}
@@ -3177,11 +3178,11 @@
{
#1
{
- \__kernel_msg_error:nnx { ltcmd } { non-xparse }
+ \msg_error:nnx { cmd } { non-xparse }
{ \@@_environment_or_command: }
}
{
- \__kernel_msg_error:nnx { ltcmd } { unknown }
+ \msg_error:nnx { cmd } { unknown }
{ \@@_environment_or_command: }
}
}
@@ -3305,11 +3306,11 @@
}
{ \group_end: \use_ii:nnn }
{
- \__kernel_msg_error:nnxx { ltcmd } { not-definable }
+ \msg_error:nnxx { cmd } { not-definable }
{ \tl_to_str:n {#1} } { \token_to_str:N #2 }
}
{
- \__kernel_msg_error:nnxx { ltcmd } { not-one-token }
+ \msg_error:nnxx { cmd } { not-one-token }
{ \tl_to_str:n {#1} } { \token_to_str:N #2 }
}
}
@@ -3504,49 +3505,49 @@
%
% Some messages intended as errors when defining commands/environments.
% \begin{macrocode}
-\__kernel_msg_new:nnnn { ltcmd } { arg-after-body }
+\msg_new:nnnn { cmd } { arg-after-body }
{ In~the~definition~of~#1,~b~(body)~argument~must~be~last. }
{
The~'body'~argument~type~is~followed~by~'#2'~in~the~argument~
specification~of~the~#1.~This~is~not~allowed.
\c_@@_ignore_def_tl
}
-\__kernel_msg_new:nnnn { ltcmd } { bad-arg-spec }
+\msg_new:nnnn { cmd } { bad-arg-spec }
{ Bad~argument~specification~'#2'~for~#1. }
{
The~argument~specification~provided~was~not~valid:~
one~or~more~mandatory~pieces~of~information~were~missing.
\c_@@_ignore_def_tl
}
-\__kernel_msg_new:nnnn { ltcmd } { command-already-defined }
+\msg_new:nnnn { cmd } { command-already-defined }
{ Command~'#1'~already~defined! }
{
You~have~used~#2~
with~a~command~that~already~has~a~definition. \\ \\
The~existing~definition~of~'#1'~will~not~be~altered.
}
-\__kernel_msg_new:nnnn { ltcmd } { command-not-yet-defined }
+\msg_new:nnnn { cmd } { command-not-yet-defined }
{ Command ~'#1'~not~yet~defined! }
{
You~have~used~#2~
with~a~command~that~was~never~defined.
\c_@@_ignore_def_tl
}
-\__kernel_msg_new:nnnn { ltcmd } { environment-already-defined }
+\msg_new:nnnn { cmd } { environment-already-defined }
{ Environment~'#1'~already~defined! }
{
You~have~used~\NewDocumentEnvironment
with~an~environment~that~already~has~a~definition. \\ \\
The~existing~definition~of~'#1'~will~not~be~altered.
}
-\__kernel_msg_new:nnnn { ltcmd } { environment-not-yet-defined }
+\msg_new:nnnn { cmd } { environment-not-yet-defined }
{ Environment~'#1'~not~yet~defined! }
{
You~have~used~\RenewDocumentEnvironment
with~an~environment~that~was~never~defined.
\c_@@_ignore_def_tl
}
-\__kernel_msg_new:nnnn { ltcmd } { expandable-ending-optional }
+\msg_new:nnnn { cmd } { expandable-ending-optional }
{
Argument~specification~'#2'~for~expandable~command~'#1'~
ends~with~optional~argument.
@@ -3556,13 +3557,13 @@
(or~no~arguments~at~all).~You~cannot~have~a~terminal~optional~
argument~with~expandable~commands.
}
-\__kernel_msg_new:nnnn { ltcmd } { inconsistent-long }
+\msg_new:nnnn { cmd } { inconsistent-long }
{ Inconsistent~long~arguments~for~expandable~command~'#1'. }
{
The~arguments~for~an~expandable~command~must~not~involve~short~
arguments~after~long~arguments.~You~have~tried~to~mix~the~two~types.
}
-\__kernel_msg_new:nnnn { ltcmd } { invalid-command-arg }
+\msg_new:nnnn { cmd } { invalid-command-arg }
{ Argument~type~'#2'~not~available~for~#1. }
{
The~letter~'#2'~can~only~be~used~in~environment~argument~
@@ -3570,14 +3571,14 @@
\\ \\
LaTeX~will~ignore~this~entire~definition.
}
-\__kernel_msg_new:nnnn { ltcmd } { invalid-expandable-argument-type }
+\msg_new:nnnn { cmd } { invalid-expandable-argument-type }
{ Argument~type~'#2'~not~available~for~expandable~command~'#1'. }
{
The~letter~'#2'~specifies~an~argument~type~which~cannot~be~used~
in~an~expandable~command.
\c_@@_ignore_def_tl
}
-\__kernel_msg_new:nnnn { ltcmd } { invalid-after-optional-expandably }
+\msg_new:nnnn { cmd } { invalid-after-optional-expandably }
{
Argument~type~'#2'~not~available~after~optional~argument~
for~expandable~command~'#1'.
@@ -3587,13 +3588,13 @@
in~an~expandable~command~after~an~optional~argument.
\c_@@_ignore_def_tl
}
-\__kernel_msg_new:nnnn { ltcmd } { non-trailing-obey-spaces }
+\msg_new:nnnn { cmd } { non-trailing-obey-spaces }
{ Prefix~'!'~used~before~mandatory~argument~'#2'~of~#1. }
{
The~prefix~'!'~can~only~apply~to~trailing~optional~arguments.
\c_@@_ignore_def_tl
}
-\__kernel_msg_new:nnnn { ltcmd } { not-definable }
+\msg_new:nnnn { cmd } { not-definable }
{ First~argument~of~'#2'~must~be~a~command. }
{
The~first~argument~of~'#2'~should~be~the~document~command~that~will~
@@ -3601,7 +3602,7 @@
backslash~is~missing?
\c_@@_ignore_def_tl
}
-\__kernel_msg_new:nnnn { ltcmd } { not-one-token }
+\msg_new:nnnn { cmd } { not-one-token }
{ First~argument~of~'#2'~must~be~a~command. }
{
The~first~argument~of~'#2'~should~be~the~document~command~that~will~
@@ -3609,7 +3610,7 @@
token.~Perhaps~a~backslash~is~missing?
\c_@@_ignore_def_tl
}
-\__kernel_msg_new:nnnn { ltcmd } { not-single-token }
+\msg_new:nnnn { cmd } { not-single-token }
{
Argument~delimiter~'#2'~for~the~#1~should~be~
a~single~non-space~token.
@@ -3619,40 +3620,40 @@
where~a~single~token~is~required,~LaTeX~found~'#2'.
\c_@@_ignore_def_tl
}
-\__kernel_msg_new:nnnn { ltcmd } { forbidden-implicit-group-token }
+\msg_new:nnnn { cmd } { forbidden-implicit-group-token }
{ Argument~delimiter~'#2'~for~the~#1~is~not~allowed. }
{
The~argument~specification~provided~was~not~valid:~the~implicit~
#3-group~token~'#2'~is~not~allowed~as~an~argument~delimiter.
\c_@@_ignore_def_tl
}
-\__kernel_msg_new:nnnn { ltcmd } { processor-in-expandable }
+\msg_new:nnnn { cmd } { processor-in-expandable }
{ Argument~processor~'>{#2}'~cannot~be~used~for~the~expandable~command~'#1'. }
{
The~argument~specification~for~#1~contains~a~processor~function:~
this~is~only~supported~for~standard~robust~commands.
\c_@@_ignore_def_tl
}
-\__kernel_msg_new:nnnn { ltcmd } { too-many-arguments }
+\msg_new:nnnn { cmd } { too-many-arguments }
{ Too~many~arguments~in~argument~specification~'#2'~of~#1. }
{
The~argument~specification~provided~has~more~than~9~arguments.~
This~cannot~be~implemented.
\c_@@_ignore_def_tl
}
-\__kernel_msg_new:nnnn { ltcmd } { two-markers }
+\msg_new:nnnn { cmd } { two-markers }
{ Two~'#2'~apply~to~the~same~argument~in~argument~specification~of~#1. }
{
The~argument~specification~provided~has~two~markers~'#2'~applying~
to~the~same~argument;~these~are~redundant.
}
-\__kernel_msg_new:nnnn { ltcmd } { unknown-argument-type }
+\msg_new:nnnn { cmd } { unknown-argument-type }
{ Unknown~argument~type~'#2'~for~the~#1. }
{
The~letter~'#2'~does~not~specify~a~known~argument~type.
\c_@@_ignore_def_tl
}
-\__kernel_msg_new:nnnn { ltcmd } { xparse-argument-type }
+\msg_new:nnnn { cmd } { xparse-argument-type }
{ Deprecated~argument~type~'#2'~for~the~#1~requires~xparse. }
{
The~letter~'#2'~specifies~a~known~argument~type~that~requires~
@@ -3666,40 +3667,40 @@
% \texttt{loop-in-defaults} and \texttt{missing-required} messages can
% be expandable or not expandable.
% \begin{macrocode}
-\__kernel_msg_new:nnn { ltcmd } { if-boolean }
+\msg_new:nnn { cmd } { if-boolean }
{ Invalid~use~\iow_char:N\\IfBooleanTF~{#1} }
-\__kernel_msg_new:nnnn { ltcmd } { loop-in-defaults }
+\msg_new:nnnn { cmd } { loop-in-defaults }
{ Defaults~of~#1~have~circular~dependency. }
{
The~default~values~of~two~or~more~arguments~of~the~#1~
depend~on~each~other~in~a~way~that~cannot~be~resolved.
}
-\__kernel_msg_new:nnnn { ltcmd } { missing-required }
+\msg_new:nnnn { cmd } { missing-required }
{ Missing~required~argument~for~#1. }
{
The~current~#1~expects~an~argument~starting~with~'#2'.~
LaTeX~did~not~find~it,~and~will~insert~a~default~value~to~be~processed.
}
-\__kernel_msg_new:nnnn { ltcmd } { non-xparse }
+\msg_new:nnnn { cmd } { non-xparse }
{ \str_uppercase:n #1~not~defined~using~xparse. }
{
You~have~asked~for~the~argument~specification~for~the~#1,~
but~this~was~not~defined~using~xparse.
}
-\__kernel_msg_new:nnnn { ltcmd } { split-excess-tokens }
+\msg_new:nnnn { cmd } { split-excess-tokens }
{ Too~many~'#1'~tokens~when~trying~to~split~argument. }
{
LaTeX~was~asked~to~split~the~input~'#3'~
at~each~occurrence~of~the~token~'#1',~up~to~a~maximum~of~#2~parts.~
There~were~too~many~'#1'~tokens.
}
-\__kernel_msg_new:nnnn { ltcmd } { unknown }
+\msg_new:nnnn { cmd } { unknown }
{ Unknown~document~#1. }
{
You~have~asked~for~the~argument~specification~for~the~#1,~
but~it~is~not~defined.
}
-\__kernel_msg_new:nnnn { ltcmd } { verbatim-newline }
+\msg_new:nnnn { cmd } { verbatim-newline }
{ Verbatim~argument~of~#1~ended~by~end~of~line. }
{
The~verbatim~argument~of~the~#1~cannot~contain~more~than~one~line,~
@@ -3709,7 +3710,7 @@
\\ \\
LaTeX~will~ignore~'#2'.
}
-\__kernel_msg_new:nnnn { ltcmd } { verbatim-tokenized }
+\msg_new:nnnn { cmd } { verbatim-tokenized }
{ The~verbatim~#1~cannot~be~used~inside~an~argument. }
{
The~#1~takes~a~verbatim~argument.~
@@ -3722,33 +3723,33 @@
%
% Intended more for information.
% \begin{macrocode}
-\__kernel_msg_new:nnn { ltcmd } { define-command }
+\msg_new:nnn { cmd } { define-command }
{
Defining~command~#1~
with~sig.~'#2'~\msg_line_context:.
}
-\__kernel_msg_new:nnn { ltcmd } { define-environment }
+\msg_new:nnn { cmd } { define-environment }
{
Defining~environment~'#1'~
with~sig.~'#2'~\msg_line_context:.
}
-\__kernel_msg_new:nnn { ltcmd } { redefine-command }
+\msg_new:nnn { cmd } { redefine-command }
{
Redefining~command~#1~
with~sig.~'#2'~\msg_line_context:.
}
-\__kernel_msg_new:nnn { ltcmd } { redefine-environment }
+\msg_new:nnn { cmd } { redefine-environment }
{
Redefining~environment~'#1'~
with~sig.~'#2'~\msg_line_context:.
}
-\__kernel_msg_new:nnn { ltcmd } { optional-mandatory }
+\msg_new:nnn { cmd } { optional-mandatory }
{
Since~the~mandatory~argument~'#1'~has~the~same~delimiter~'#2'~
as~a~previous~optional~argument,~it~will~not~be~possible~to~
omit~all~optional~arguments~when~calling~this~command.
}
-\__kernel_msg_new:nnn { ltcmd } { unsupported-let }
+\msg_new:nnn { cmd } { unsupported-let }
{
The~command~'#1'~was~undefined~but~not~the~associated~commands~
'#1~code'~and/or~'#1~defaults'.~Maybe~you~tried~using~
@@ -3786,7 +3787,7 @@
{
\cs_if_exist:NTF #1
{
- \__kernel_msg_error:nnxx { ltcmd } { command-already-defined }
+ \msg_error:nnxx { cmd } { command-already-defined }
{ \use:nnn \token_to_str:N #1 { } }
{ \token_to_str:N \NewDocumentCommand }
}
@@ -3800,7 +3801,7 @@
\cs_if_exist:NTF #1
{ \@@_declare_cmd:Nnn #1 {#2} {#3} }
{
- \__kernel_msg_error:nnxx { ltcmd } { command-not-yet-defined }
+ \msg_error:nnxx { cmd } { command-not-yet-defined }
{ \use:nnn \token_to_str:N #1 { } }
{ \token_to_str:N \RenewDocumentCommand }
}
@@ -3831,14 +3832,14 @@
\cs_new_protected:Npn \NewDocumentEnvironment #1#2#3#4
{
\cs_if_exist:cTF {#1}
- { \__kernel_msg_error:nnx { ltcmd } { environment-already-defined } {#1} }
+ { \msg_error:nnx { cmd } { environment-already-defined } {#1} }
{ \@@_declare_env:nnnn {#1} {#2} {#3} {#4} }
}
\cs_new_protected:Npn \RenewDocumentEnvironment #1#2#3#4
{
\cs_if_exist:cTF {#1}
{ \@@_declare_env:nnnn {#1} {#2} {#3} {#4} }
- { \__kernel_msg_error:nnx { ltcmd } { environment-not-yet-defined } {#1} }
+ { \msg_error:nnx { cmd } { environment-not-yet-defined } {#1} }
}
\cs_new_protected:Npn \ProvideDocumentEnvironment #1#2#3#4
{ \cs_if_exist:cF {#1} { \@@_declare_env:nnnn {#1} {#2} {#3} {#4} } }
@@ -3865,7 +3866,7 @@
{
\cs_if_exist:NTF #1
{
- \__kernel_msg_error:nnxx { ltcmd } { command-already-defined }
+ \msg_error:nnxx { cmd } { command-already-defined }
{ \use:nnn \token_to_str:N #1 { } }
{ \token_to_str:N \NewExpandableDocumentCommand }
}
@@ -3879,7 +3880,7 @@
\cs_if_exist:NTF #1
{ \@@_declare_expandable_cmd:Nnn #1 {#2} {#3} }
{
- \__kernel_msg_error:nnxx { ltcmd } { command-not-yet-defined }
+ \msg_error:nnxx { cmd } { command-not-yet-defined }
{ \use:nnn \token_to_str:N #1 { } }
{ \token_to_str:N \RenewExpandableDocumentCommand }
}
@@ -3931,7 +3932,7 @@
\prg_break:n { \use:n }
\prg_break_point:
{
- \__kernel_msg_expandable_error:nnn { ltcmd } { if-boolean } {#1}
+ \msg_expandable_error:nnn { cmd } { if-boolean } {#1}
\use_ii:nn
}
}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltcmdhooks.dtx b/Master/texmf-dist/source/latex-dev/base/ltcmdhooks.dtx
index cc67f5eaa75..40cd55e52c7 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltcmdhooks.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltcmdhooks.dtx
@@ -13,8 +13,8 @@
%
%%% From File: ltcmdhooks.dtx
%
-\def\ltcmdhooksversion{v1.0a}
-\def\ltcmdhooksdate{2021/04/30}
+\def\ltcmdhooksversion{v1.0b}
+\def\ltcmdhooksdate{2021/05/26}
%
%
%
@@ -323,10 +323,13 @@
% throw an error.
% \end{enumerate}
%
+%
% \begin{macrocode}
%<@@=hook>
% \end{macrocode}
%
+% \changes{v1.0b}{2021/05/24}{Use \cs{msg_...} instead of \cs{__kernel_msg...}}
+%
% \begin{macrocode}
%<*2ekernel|latexrelease>
\ExplSyntaxOn
@@ -413,7 +416,7 @@
\str_case:nnTF {#3}
{ { before } { } { after } { } }
{ \exp_args:Nc \@@_patch_cmd_or_delay:Nnn {#2} {#2} {#3} }
- { \__kernel_msg_error:nnn { hooks } { wrong-cmd-hook } {#2} {#3} }
+ { \msg_error:nnnn { hooks } { wrong-cmd-hook } {#2} {#3} }
}
% \end{macrocode}
% \end{macro}
@@ -520,7 +523,7 @@
{
#1 #2 {#4}
{
- \__kernel_msg_error:nnxx { hooks } { cant-patch }
+ \msg_error:nnxx { hooks } { cant-patch }
{ \token_to_str:N #2 } {#3}
}
}
@@ -833,7 +836,7 @@
% command isn't changed in any way in that case.
% \begin{macrocode}
{
- \__kernel_msg_error:nnxx { hooks } { cant-patch }
+ \msg_error:nnxx { hooks } { cant-patch }
{ \c_backslash_str #2 } { retok }
}
}
@@ -1036,24 +1039,22 @@
% \subsection{Messages}
%
% \begin{macrocode}
-\__kernel_msg_new:nnnn { hooks } { wrong-cmd-hook }
+\msg_new:nnnn { hooks } { wrong-cmd-hook }
{
- Command~hook~`cmd/#1/#2'~invalid.\\
- The~hook~should~be~`cmd/#1/before'~or~`cmd/#1/after'.
+ Generic~hook~`cmd/#1/#2'~is~invalid.
+% The~hook~should~be~`cmd/#1/before'~or~`cmd/#1/after'.
}
{
- You~tried~to~add~a~hook~to~command~\iow_char:N \\#1,~but~`#2'~
- is~an~invalid~position.~Only~`before'~or~`after'~are~allowed.
+ You~tried~to~add~a~generic~hook~to~command~\iow_char:N \\#1,~but~`#2'~
+ is~an~invalid~component.~Only~`before'~or~`after'~are~allowed.
}
-\__kernel_msg_new:nnnn { hooks } { cant-patch }
+\msg_new:nnnn { hooks } { cant-patch }
{
- Command~`#1'~cannot~have~hooks~because~it~
- \@@_unpatchable_cases:n {#2} .
+ Generic~hooks~cannot~be~added~to~'#1'.
}
{
- You~tried~to~add~a~hook~to~`#1',~but~LaTeX~was~not~able~to~
- add~the~hook~to~that~command~because~`#1'~
- \@@_unpatchable_cases:n {#2} .
+ You~tried~to~add~a~hook~to~'#1',~but~LaTeX~was~unable~to~
+ patch~the~command~because~it~\@@_unpatchable_cases:n {#2}.
}
\cs_new:Npn \@@_unpatchable_cases:n #1
{
diff --git a/Master/texmf-dist/source/latex-dev/base/ltdefns.dtx b/Master/texmf-dist/source/latex-dev/base/ltdefns.dtx
index 7236083dfa2..4f39d922cce 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}
- [2021/04/19 v1.5o LaTeX Kernel (definition commands)]
+ [2021/05/27 v1.5p LaTeX Kernel (definition commands)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltdefns.dtx}
@@ -1222,6 +1222,7 @@
%
% The macro firstly checks if the control sequence in question exists
% at all.
+% \changes{v1.5p}{2021/05/26}{Normalize error message in \cs{MakeRobust}}
% \begin{macrocode}
%</2ekernel>
%<latexrelease>\IncludeInRelease{2020/10/01}{\MakeRobust}{\MakeRobust}%
@@ -1230,7 +1231,7 @@
\count@=\escapechar
\escapechar=`\\
\@ifundefined{\expandafter\@gobble\string#1}{%
- \@latex@error{The control sequence `\string#1' is undefined!%
+ \@latex@error{Command `\string#1' is undefined!%
\MessageBreak There is nothing here to make robust}%
\@eha
}%
@@ -1259,7 +1260,7 @@
\noexpand\protect\expandafter\noexpand
\csname\expandafter\@gobble\string#1\space\endcsname}%
}%
- {\@latex@info{The control sequence `\string#1' is already robust}}%
+ {\@latex@info{Command `\string#1' is already robust}}%
}%
\escapechar=\count@
}%
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfilehook.dtx b/Master/texmf-dist/source/latex-dev/base/ltfilehook.dtx
index e9309c41f78..5d0acc8fdfb 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltfilehook.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltfilehook.dtx
@@ -31,8 +31,8 @@
%%% From File: ltfilehook.dtx
%
% \begin{macrocode}
-\providecommand\ltfilehookversion{v1.0j}
-\providecommand\ltfilehookdate{2021/04/29}
+\providecommand\ltfilehookversion{v1.0k}
+\providecommand\ltfilehookdate{2021/05/25}
% \end{macrocode}
%
%<*driver>
@@ -454,6 +454,7 @@
%
%
% \section{The Implementation}
+%
% \begin{macrocode}
%<*2ekernel>
% \end{macrocode}
@@ -462,6 +463,8 @@
%<@@=filehook>
% \end{macrocode}
%
+% \changes{v1.0k}{2021/05/24}{Use \cs{msg_...} instead of \cs{__kernel_msg...}}
+%
%
% \subsection{Document and package-level commands}
%
@@ -605,7 +608,7 @@
\seq_gpop:NNTF \g_@@_input_file_seq \l_@@_internal_tl
{ \exp_after:wN \@@_file_pop_assign:nnnn \l_@@_internal_tl }
{
- \__kernel_msg_error:nnn { hooks } { should-not-happen }
+ \msg_error:nnn { kernel } { should-not-happen }
{ Tried~to~pop~from~an~empty~file~name~stack. }
}
}
diff --git a/Master/texmf-dist/source/latex-dev/base/lthooks.dtx b/Master/texmf-dist/source/latex-dev/base/lthooks.dtx
index 45d6a78aba1..20e172a57f2 100644
--- a/Master/texmf-dist/source/latex-dev/base/lthooks.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/lthooks.dtx
@@ -31,8 +31,8 @@
%%% From File: lthooks.dtx
%
% \begin{macrocode}
-\def\lthooksversion{v1.0m}
-\def\lthooksdate{2021/04/29}
+\def\lthooksversion{v1.0n}
+\def\lthooksdate{2021/05/26}
% \end{macrocode}
%
%<*driver>
@@ -1807,8 +1807,9 @@
%<@@=hook>
% \end{macrocode}
%
-% \changes{v1.0i}{2021/03/18}
-% {Use \cs{NewModuleRelease}.}
+% \changes{v1.0i}{2021/03/18}{Use \cs{NewModuleRelease}.}
+% \changes{v1.0n}{2021/05/24}{Use \cs{msg_...} instead of \cs{__kernel_msg...}}
+%
% \begin{macrocode}
%<*2ekernel|latexrelease>
\ExplSyntaxOn
@@ -2230,7 +2231,7 @@
% \cs{hook_new:n} is used.
% \begin{macrocode}
\@@_if_declared:nTF {#1}
- { \__kernel_msg_error:nnn { hooks } { exists } {#1} }
+ { \msg_error:nnn { hooks } { exists } {#1} }
{
\tl_new:c { g_@@_#1_declared_tl }
\@@_make_usable:n {#1}
@@ -2484,7 +2485,7 @@
% may change).
% \begin{macrocode}
\@@_if_disabled:nTF {#1}
- { \__kernel_msg_warning:nnn { hooks } { provide-disabled } {#1} }
+ { \msg_warning:nnn { hooks } { provide-disabled } {#1} }
% \end{macrocode}
% Otherwise we check if it was already declared.
% \begin{macrocode}
@@ -2496,7 +2497,7 @@
% the already existing one is not (or vice versa).
% \begin{macrocode}
\str_if_eq:eeF { \tl_use:c { g_@@_#1_reversed_tl } } {#2}
- { \__kernel_msg_error:nnn { hooks } { provide-error } {#1} }
+ { \msg_error:nnn { hooks } { provide-error } {#1} }
}
% \end{macrocode}
% If it wasn't declared, we declared as a normal or reversed hook
@@ -2572,7 +2573,7 @@
{
\tl_if_empty:nTF {#1}
{
- \__kernel_msg_expandable_error:nn { hooks } { empty-label }
+ \msg_expandable_error:nn { hooks } { empty-label }
\@@_currname_or_default:
}
{
@@ -2609,7 +2610,7 @@
{
\tl_if_empty:NTF \@currname
{
- \__kernel_msg_expandable_error:nnn { hooks } { should-not-happen }
+ \msg_expandable_error:nnn { kernel } { should-not-happen }
{ Empty~default~label. }
\@@_make_name:n { label-missing }
}
@@ -2750,7 +2751,7 @@
% \begin{macrocode}
{
\@@_if_disabled:nTF {#1}
- { \__kernel_msg_error:nnn { hooks } { hook-disabled } {#1} }
+ { \msg_error:nnn { hooks } { hook-disabled } {#1} }
{ \@@_try_declaring_generic_hook:nnn {#1} {#2} {#3} }
}
}
@@ -2793,7 +2794,7 @@
\@@_init_structure:n {#1}
\@@_tl_gput_right:cn { @@_toplevel~#1 } {#3}
}
- { \__kernel_msg_error:nnn { hooks } { misused-top-level } {#1} }
+ { \msg_error:nnn { hooks } { misused-top-level } {#1} }
}
{
\prop_get:cnNTF { g_@@_#1_code_prop } {#2} \l_@@_return_tl
@@ -3279,7 +3280,7 @@
{#1} {#2} {#4}
\@@_update_hook_code:n {#1}
}
- { \__kernel_msg_error:nnnnnn { hooks } { unknown-rule }
+ { \msg_error:nnnnnn { hooks } { unknown-rule }
{#1} {#2} {#3} {#4} }
}
% \end{macrocode}
@@ -3887,7 +3888,7 @@
\cs_new_protected:cpn { @@_apply_rule_xE:nnn } #1#2#3
{
\@@_debug:n { \@@_msg_pair_found:nnn {#1} {#2} {#3} }
- \__kernel_msg_error:nnnnnn { hooks } { labels-incompatible }
+ \msg_error:nnnnnn { hooks } { labels-incompatible }
{#1} {#2} {#3} { 1 }
\use:c { @@_apply_rule_->:nnn } {#1} {#2} {#3}
\use:c { @@_apply_rule_<-:nnn } {#1} {#2} {#3}
@@ -3895,7 +3896,7 @@
\cs_new_protected:cpn { @@_apply_rule_xW:nnn } #1#2#3
{
\@@_debug:n { \@@_msg_pair_found:nnn {#1} {#2} {#3} }
- \__kernel_msg_warning:nnnnnn { hooks } { labels-incompatible }
+ \msg_warning:nnnnnn { hooks } { labels-incompatible }
{#1} {#2} {#3} { 0 }
}
% \end{macrocode}
@@ -4239,7 +4240,7 @@
\cs_new_protected:Npn \@@_gput_next_code:nn #1 #2
{
\@@_if_disabled:nTF {#1}
- { \__kernel_msg_error:nnn { hooks } { hook-disabled } {#1} }
+ { \msg_error:nnn { hooks } { hook-disabled } {#1} }
{
\@@_init_structure:n {#1}
\@@_if_usable:nTF {#1}
@@ -4537,8 +4538,18 @@
%
% \subsection{Messages}
%
+% Hook errors are LaTeX kernel errors:
+% \begin{macrocode}
+\prop_gput:Nnn \g_msg_module_type_prop { hooks } { LaTeX }
+% \end{macrocode}
+% And so are kernel errors (this should move elsewhere eventually).
% \begin{macrocode}
-\__kernel_msg_new:nnnn { hooks } { labels-incompatible }
+\prop_gput:Nnn \g_msg_module_type_prop { kernel } { LaTeX }
+%\prop_gput:Nnn \g_msg_module_name_prop { kernel } { } % <-- currently not working
+% \end{macrocode}
+%
+% \begin{macrocode}
+\msg_new:nnnn { hooks } { labels-incompatible }
{
Labels~'#1'~and~'#2'~are~incompatible
\str_if_eq:nnF {#3} {??} { ~in~hook~'#3' } .~
@@ -4551,7 +4562,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnnn { hooks } { exists }
+\msg_new:nnnn { hooks } { exists }
{ Hook~'#1'~ has~ already~ been~ declared. }
{ There~ already~ exists~ a~ hook~ declaration~ with~ this~
name.\\
@@ -4560,7 +4571,7 @@
%
%
% \begin{macrocode}
-\__kernel_msg_new:nnnn { hooks } { hook-disabled }
+\msg_new:nnnn { hooks } { hook-disabled }
{ Cannot~add~code~to~disabled~hook~'#1'. }
{
The~hook~'#1'~you~tried~to~add~code~to~was~previously~disabled~
@@ -4570,7 +4581,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnn { hooks } { empty-label }
+\msg_new:nnn { hooks } { empty-label }
{
Empty~code~label~\msg_line_context:.~
Using~'\@@_currname_or_default:'~instead.
@@ -4578,7 +4589,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnn { hooks } { no-default-label }
+\msg_new:nnn { hooks } { no-default-label }
{
Missing~(empty)~default~label~\msg_line_context:. \\
This~command~was~ignored.
@@ -4586,7 +4597,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnnn { hooks } { unknown-rule }
+\msg_new:nnnn { hooks } { unknown-rule }
{ Unknown~ relationship~ '#3'~
between~ labels~ '#2'~ and~ '#4'~
\str_if_eq:nnF {#1} {??} { ~in~hook~'#1' }. ~
@@ -4604,9 +4615,9 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnnn { hooks } { misused-top-level }
+\msg_new:nnnn { hooks } { misused-top-level }
{
- Illegal~\iow_char:N \\AddToHook{#1}[top-level]{...}.\\
+ Illegal~use~of~\iow_char:N \\AddToHook{#1}[top-level]{...}.\\
'top-level'~is~reserved~for~the~user's~document.
}
{
@@ -4618,7 +4629,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnn { hooks } { set-top-level }
+\msg_new:nnn { hooks } { set-top-level }
{
You~cannot~change~the~default~label~#1~'top-level'.~Illegal \\
\use:nn { ~ } { ~ } \iow_char:N \\#2{#3} \\
@@ -4627,21 +4638,12 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnn { hooks } { ddhl-deprecated }
- {
- \iow_char:N \\DeclareDefaultHookLabel~is~deprecated.\\
- Use~\iow_char:N \\SetDefaultHookLabel~instead.\\ \\
- The~deprecated~name~will~be~removed~in~the~next~release.
- }
-% \end{macrocode}
-%
-% \begin{macrocode}
-\__kernel_msg_new:nnn { hooks } { extra-pop-label }
+\msg_new:nnn { hooks } { extra-pop-label }
{
Extra~\iow_char:N \\PopDefaultHookLabel. \\
This~command~will~be~ignored.
}
-\__kernel_msg_new:nnn { hooks } { missing-pop-label }
+\msg_new:nnn { hooks } { missing-pop-label }
{
Missing~\iow_char:N \\PopDefaultHookLabel. \\
The~label~'#1'~was~pushed~but~never~popped.~Something~is~wrong.
@@ -4649,9 +4651,9 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnn { hooks } { should-not-happen }
+\msg_new:nnn { kernel } { should-not-happen }
{
- ERROR!~This~should~not~happen.~#1 \\
+ This~should~not~happen.~#1 \\
Please~report~at~https://github.com/latex3/latex2e.
}
% \end{macrocode}
@@ -4659,14 +4661,14 @@
%
%
% \begin{macrocode}
-\__kernel_msg_new:nnn { hooks } { provide-disabled }
+\msg_new:nnn { hooks } { provide-disabled }
{
- Can't~ provide~ hook~ '#1'~ because~ it~ is~ disabled!
+ Cannot~ provide~ hook~ '#1'~ because~ it~ is~ disabled!
}
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnnn { hooks } { provide-error }
+\msg_new:nnnn { hooks } { provide-error }
{
Hook~'#1'~ already~ declared~ as~ a~
\@@_if_reversed:nTF {#1} { reversed } { normal }~ hook!
@@ -4764,10 +4766,9 @@
% \begin{macro}{\SetDefaultHookLabel}
% \begin{macro}{\PushDefaultHookLabel}
% \begin{macro}{\PopDefaultHookLabel}
-% \begin{macro}{\DeclareDefaultHookLabel}
%
% \fmiinline{Docu task: At some point this code for this should be moved to the
-% label section earlier and here we should keep only the interface commands.}
+% label section earlier and here we should keep only the interface commands.}
%
% \begin{macro}{\@@_curr_name_push:n,\@@_curr_name_push_aux:n}
% \begin{macro}{\@@_curr_name_pop:}
@@ -4829,11 +4830,11 @@
\cs_new_protected:Npn \@@_curr_name_push_aux:n #1
{
\tl_if_blank:nTF {#1}
- { \__kernel_msg_error:nn { hooks } { no-default-label } }
+ { \msg_error:nn { hooks } { no-default-label } }
{
\str_if_eq:nnTF {#1} { top-level }
{
- \__kernel_msg_error:nnnnn { hooks } { set-top-level }
+ \msg_error:nnnnn { hooks } { set-top-level }
{ to } { PushDefaultHookLabel } {#1}
}
{
@@ -4851,7 +4852,7 @@
{
\seq_gpop:NNTF \g_@@_name_stack_seq \l_@@_return_tl
{ \tl_gset_eq:NN \g_@@_hook_curr_name_tl \l_@@_return_tl }
- { \__kernel_msg_error:nn { hooks } { extra-pop-label } }
+ { \msg_error:nn { hooks } { extra-pop-label } }
}
% \end{macrocode}
%
@@ -4866,7 +4867,7 @@
{
\seq_gpop:NNT \g_@@_name_stack_seq \l_@@_return_tl
{
- \__kernel_msg_error:nnx { hooks } { missing-pop-label }
+ \msg_error:nnx { hooks } { missing-pop-label }
{ \g_@@_hook_curr_name_tl }
\tl_gset_eq:NN \g_@@_hook_curr_name_tl \l_@@_return_tl
\@@_end_document_label_check:
@@ -4884,7 +4885,7 @@
{
\seq_if_empty:NTF \g_@@_name_stack_seq
{
- \__kernel_msg_error:nnnnn { hooks } { set-top-level }
+ \msg_error:nnnnn { hooks } { set-top-level }
{ for } { SetDefaultHookLabel } {#1}
}
{ \exp_args:Nx \@@_set_default_label:n { \@@_make_name:n {#1} } }
@@ -4893,16 +4894,11 @@
{
\str_if_eq:nnTF {#1} { top-level }
{
- \__kernel_msg_error:nnnnn { hooks } { set-top-level }
+ \msg_error:nnnnn { hooks } { set-top-level }
{ to } { SetDefaultHookLabel } {#1}
}
{ \tl_gset:Nn \g_@@_hook_curr_name_tl {#1} }
}
-\NewDocumentCommand \DeclareDefaultHookLabel { m }
- {
- \__kernel_msg_error:nn { hooks } { ddhl-deprecated }
- \SetDefaultHookLabel {#1}
- }
% \end{macrocode}
%
% The label is only automatically updated with \cs{@onefilewithoptions}
@@ -4942,7 +4938,6 @@
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
%
%
%
diff --git a/Master/texmf-dist/source/latex-dev/base/ltoutput.dtx b/Master/texmf-dist/source/latex-dev/base/ltoutput.dtx
index 69bfa1f036b..b1b3a240965 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltoutput.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltoutput.dtx
@@ -37,7 +37,7 @@
%<*driver>
% \fi
\ProvidesFile{ltoutput.dtx}
- [2020/12/06 v1.4f LaTeX Kernel (Output Routine)]
+ [2021/05/05 v1.4g LaTeX Kernel (Output Routine)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltoutput.dtx}
@@ -1134,7 +1134,7 @@
\global \advance \@colht \@tempdima
\ifx \@dbltoplist \@empty
\else
- \@latexerr{Float(s) lost}\@ehb
+ \@latex@error{Float(s) lost}\@ehb
\let \@dbltoplist \@empty
\fi
\@cons \@dbltoplist \@currbox
@@ -1525,7 +1525,7 @@
\global \@colroom \@colht
\ifx \@currlist\@empty
\else
- \@latexerr{Float(s) lost}\@ehb
+ \@latex@error{Float(s) lost}\@ehb
\global \let \@currlist \@empty
\fi
\@makefcolumn\@deferlist
@@ -3920,9 +3920,9 @@
%</trace>
\@tempskipa#2\relax
\ifdim \@tempskipa>.5\maxdimen
- \@latexerr{Suggested\space extra\space height\space
- (\the\@tempskipa)\space dangerously\space
- large}\@eha
+ \@latex@error{Suggested\space extra\space height\space
+ (\the\@tempskipa)\space dangerously\space
+ large}\@eha
\else
\ifdim \vsize<.5\maxdimen
%<*trace>
@@ -3940,8 +3940,8 @@
\fi
%</trace>
\else
- \@latexerr{Page\space height\space already\space
- too\space large}\@eha
+ \@latex@error{Page\space height\space already\space
+ too\space large}\@eha
\fi
\fi
}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltpara.dtx b/Master/texmf-dist/source/latex-dev/base/ltpara.dtx
index ad503b68e25..5ab52a5e9bc 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltpara.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltpara.dtx
@@ -14,8 +14,8 @@
%%% From File: ltpara.dtx
%
% \begin{macrocode}
-\def\ltparaversion{v1.0f}
-\def\ltparadate{2021/04/16}
+\def\ltparaversion{v1.0g}
+\def\ltparadate{2021/05/27}
% \end{macrocode}
%<*driver>
\documentclass{l3doc}
@@ -672,6 +672,8 @@
%<@@=para>
% \end{macrocode}
%
+% \changes{v1.0g}{2021/05/24}{Use \cs{msg_...} instead of \cs{__kernel_msg...}}
+%
%
% \begin{macrocode}
%<*2ekernel|latexrelease>
@@ -751,7 +753,7 @@
% we can detect and report if the \hook{para/before} hook illegally
% changed out of vmode.
% \begin{macrocode}
- \tex_everypar:D { \__kernel_msg_error:nnnn {para}{mode}{before}{vertical} }
+ \tex_everypar:D { \msg_error:nnnn { hooks }{ para-mode }{before}{vertical} }
\@kernel@before@para@before
\hook_use:n {para/before}
% \end{macrocode}
@@ -785,7 +787,7 @@
% If we aren't in horizontal mode any longer the hooks above misbehaved.
% \begin{macrocode}
\if_mode_horizontal: \else:
- \__kernel_msg_error:nnnn {para}{mode}{begin}{vertical} \fi:
+ \msg_error:nnnn { hooks }{ para-mode }{begin}{vertical} \fi:
% \end{macrocode}
% Finally we reinsert the indentation box (unless suppressed) and
% then call \cs{everypar} the way legacy \LaTeX\ code expects it.
@@ -1047,7 +1049,7 @@
% If we haven't been in horizontal mode then the earlier hook
% \hook{para/end} is at fault and we report that.
% \begin{macrocode}
- { \__kernel_msg_error:nnnn {para}{mode}{end}{horizontal} }
+ { \msg_error:nnnn { hooks }{ para-mode }{end}{horizontal} }
% \end{macrocode}
% Finally close out the nested conditionals.
% \begin{macrocode}
@@ -1088,7 +1090,7 @@
\@@_handle_indent:
\the\everypar }
}
- { \__kernel_msg_error:nn {para}{raw} }
+ { \msg_error:nn { kernel }{ raw-para } }
\tex_indent:D
}
% \end{macrocode}
@@ -1101,7 +1103,7 @@
\tex_everypar:D { \g_@@_standard_everypar_tl }
\the\everypar }
}
- { \__kernel_msg_error:nn {para}{raw} }
+ { \msg_error:nn { kernel }{ raw-para } }
\tex_noindent:D
}
% \end{macrocode}
@@ -1158,8 +1160,9 @@
% paragraph.
% The first argument is the hook name second the mode
% it should have stayed in but didn't.
-% \begin{macrocode}
-\__kernel_msg_new:nnnn {para} {mode}
+%
+% \begin{macrocode}
+\msg_new:nnnn { hooks } { para-mode }
{
Illegal~mode~ change~ in~ hook~ 'para/#1'.\\
Hook~ code~ did~ not~ remain~ in~ #2~ mode.
@@ -1168,21 +1171,23 @@
Paragraph~ hooks~ cannot~ change~ the~ TeX~ mode~ without~ causing~
endless~ recursion.~ The~ hook~ code~ in~ 'para/#1'~ needs~ to~ stay~
in~ #2~ mode,~ but~ it~ didn't.~ Examine~ the~ hook~
- code~ with~ \ShowHook~ to~ find~ the~ issue.
+ code~ with~ \iow_char:N \\ShowHook~ to~ find~ the~ issue.
}
% \end{macrocode}
%
% And here is one used in the \enquote{raw} commands when they are
% used outside of vertical mode.
% \begin{macrocode}
-\__kernel_msg_new:nnnn {para} {raw}
+\msg_new:nnnn { kernel } { raw-para }
{
- Paragraph started while not in vertical mode.
+ Not~ in~ vertical~ mode.
}
{
- Starting a paragraph with \RawIndent or \RawNoindent
- (or \para_raw_indent: or \para_raw_noindent:) is only
- allowed if LaTeX is in vertical mode.
+ Starting~ a~ paragraph~ with~ \iow_char:N \\RawIndent~ or~
+ \iow_char:N \\RawNoindent \\
+ (or~ \iow_char:N \\para_raw_indent:~ or~
+ \iow_char:N \\para_raw_noindent:)~ is~ only~ allowed \\
+ if~ LaTeX~ is~ in~ vertical~ mode.
}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltvers.dtx b/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
index fe50d75a8f1..20efb4509e8 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
@@ -112,10 +112,10 @@
%</2ekernel>
%<latexrelease>\edef\latexreleaseversion
%<*2ekernel|latexrelease>
- {2021-06-01}
+ {2021-12-01}
%</2ekernel|latexrelease>
%<*2ekernel>
-\def\patch@level{-3}
+\def\patch@level{0}
% \end{macrocode}
%
% \begin{macro}{\development@branch@name}
diff --git a/Master/texmf-dist/source/latex-dev/firstaid/firstaid.ins b/Master/texmf-dist/source/latex-dev/firstaid/firstaid.ins
index 6a1dbaa853f..cd5ea2006db 100644
--- a/Master/texmf-dist/source/latex-dev/firstaid/firstaid.ins
+++ b/Master/texmf-dist/source/latex-dev/firstaid/firstaid.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 2020,2021
+%% Copyright (C) 2020-2021
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%%
diff --git a/Master/texmf-dist/source/latex-dev/firstaid/latex2e-first-aid-for-external-files.dtx b/Master/texmf-dist/source/latex-dev/firstaid/latex2e-first-aid-for-external-files.dtx
index a74cb79a78f..7eb108418c1 100644
--- a/Master/texmf-dist/source/latex-dev/firstaid/latex2e-first-aid-for-external-files.dtx
+++ b/Master/texmf-dist/source/latex-dev/firstaid/latex2e-first-aid-for-external-files.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020,2021
+%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2021
+%%
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
%
@@ -110,8 +111,8 @@
% \end{macrocode}
%
% \begin{macrocode}
-\def\LaTeXFirstAidDate{2021/02/24}
-\def\LaTeXFirstAidVersion{v1.0k}
+\def\LaTeXFirstAidDate{2021/03/15}
+\def\LaTeXFirstAidVersion{v1.0l}
% \end{macrocode}
%
% \begin{macrocode}
@@ -507,6 +508,44 @@
% \end{macrocode}
%
%
+%
+%
+%
+% \subsection{The \pkg{bigfoot} first aid}
+%
+% The \pkg{bigfoot} packages makes the assumption that two
+% \cs{newinsert} allocations have a recognisable order in their
+% numbers, the second one has a lower number. This was correct in
+% the classic \TeX{} implementation but with the extended
+% allocation possibilities of all modern engines is no longer the
+% case and there is a point where the allocations take a ``jump''
+% breaking the odering assumption. These days we are fairly close
+% to that point and depending on how many packages are loaded
+% before \pkg{bigfoot} the package breaks.
+%
+% This firstaid therefore jumps over the problematical point by
+% pushing the count allocation to a safe value if necessary.
+% \begin{macrocode}
+\AddToHook{file/after/bigfoot.sty}{%
+ \ifnum\count10<\insc@unt
+ \global\count10=\insc@unt
+ \fi
+% \end{macrocode}
+% We also correct a bug that \pkg{bigfoot} tries to shift mark
+% registers, but in \LaTeX{} (at least since 2015) the allocation
+% number is not 266, so it does that to a random number of mark
+% registers (which sometimes blows up depending on the value in 266).
+% \begin{macrocode}
+ \def\FN@allmarks#1{\@elt{#1}%
+ \ifnum#1<\count256 %<--- problem: 266 isn't the counter for marks
+ \expandafter\FN@allmarks\expandafter{\number\numexpr#1+\@ne}%
+ \fi}%
+}
+% \end{macrocode}
+%
+%
+%
+%
% \subsection[Temporary fixes for the kernel (until the next
% patch-level release)]
% {Temporary fixes for the kernel \\
diff --git a/Master/texmf-dist/source/latex-dev/tools/longtable.dtx b/Master/texmf-dist/source/latex-dev/tools/longtable.dtx
index 5569ae3d5c8..457891dac72 100644
--- a/Master/texmf-dist/source/latex-dev/tools/longtable.dtx
+++ b/Master/texmf-dist/source/latex-dev/tools/longtable.dtx
@@ -37,7 +37,7 @@
%<driver> \ProvidesFile{longtable.drv}
% \fi
% \ProvidesFile{longtable.dtx}
- [2021-04-21 v4.15 Multi-page Table package (DPC)]
+ [2021-05-07 v4.16 Multi-page Table package (DPC)]
%
% \iffalse
%<*driver>
@@ -1970,13 +1970,15 @@
% {Call \cs{LT@makecaption} not \cs{LT@mkcaption}}
% \changes{v3.14}{1995/05/24}
% {Add new control argument}
+% \changes{v4.16}{2021/05/07}
+% {use \cs{ext@table} gh/561}
% \begin{macrocode}
\def\LT@c@ption#1[#2]#3{%
\LT@makecaption#1\fnum@table{#3}%
\def\@tempa{#2}%
\ifx\@tempa\@empty\else
{\let\\\space
- \addcontentsline{lot}{table}{\protect\numberline{\thetable}{#2}}}%
+ \addcontentsline{\ext@table}{table}{\protect\numberline{\thetable}{#2}}}%
\fi}
% \end{macrocode}
% \end{macro}