[latex3-commits] [git/LaTeX3-latex3-latex2e] gh648: Merge branch 'develop' into gh648 (1577e47e)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex2e
On branch  : gh648
Link       : https://github.com/latex3/latex2e/commit/1577e47e70518426b8571d71e06a6747d90d2141

>---------------------------------------------------------------

commit 1577e47e70518426b8571d71e06a6747d90d2141
Merge: 7d5e6a4d 398758e3
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Fri Aug 27 22:37:22 2021 -0300

    Merge branch 'develop' into gh648


>---------------------------------------------------------------

1577e47e70518426b8571d71e06a6747d90d2141
 base/changes.txt                                   |   25 +
 base/doc/ltnews34.tex                              |   82 +-
 base/generic-hook-tasks.md                         |   23 +
 base/lterror.dtx                                   |   15 +-
 base/ltfilehook.dtx                                |   11 +-
 base/lthooks.dtx                                   |  677 +++++++-----
 base/ltpara.dtx                                    |   12 +-
 base/testfiles-ltcmd/ltcmd004.luatex.tlg           |  102 +-
 base/testfiles-ltcmd/ltcmd004.tlg                  |  102 +-
 base/testfiles-ltcmd/ltcmd005.luatex.tlg           |   51 +-
 base/testfiles-ltcmd/ltcmd005.tlg                  |   51 +-
 base/testfiles-lthooks/filehook-008.tlg            |  240 ++--
 base/testfiles-lthooks/ltcmdhooks-008.lvt          |   12 +-
 base/testfiles-lthooks/ltcmdhooks-008.tlg          |   25 +-
 base/testfiles-lthooks/lthooks-024.tlg             |   60 +-
 ...ks-029.lvt => lthooks-029-deprecated-after.lvt} |   27 +-
 ...ks-029.tlg => lthooks-029-deprecated-after.tlg} |   14 +-
 ...s-029.lvt => lthooks-029-deprecated-before.lvt} |   10 +
 ...s-029.tlg => lthooks-029-deprecated-before.tlg} |   54 +-
 ...{lthooks-029.lvt => lthooks-029-deprecated.lvt} |   14 +-
 ...{lthooks-029.tlg => lthooks-029-deprecated.tlg} |   26 +-
 base/testfiles-lthooks/lthooks-029.lvt             |   60 +-
 base/testfiles-lthooks/lthooks-029.tlg             |   92 +-
 ...ks-errors.lvt => lthooks-errors-deprecated.lvt} |    6 +-
 ...ks-errors.tlg => lthooks-errors-deprecated.tlg} |   41 +-
 base/testfiles-lthooks/lthooks-errors.lvt          |   16 +-
 base/testfiles-lthooks/lthooks-errors.tlg          |   57 +-
 base/testfiles/github-0479-often.luatex.tlg        |    4 +-
 base/testfiles/github-0479-often.tlg               |    4 +-
 base/testfiles/github-0479-often.xetex.tlg         |    4 +-
 base/testfiles/github-0587.lvt                     |   16 +
 base/testfiles/{tlb0372.tlg => github-0587.tlg}    |   16 +-
 base/update-lthooks-tests.sh                       |    2 +
 required/amsmath/README.md                         |    4 +-
 required/amsmath/amsldoc.tex                       |    7 +-
 required/amsmath/amsopn.dtx                        |    6 +-
 required/amsmath/amstext.dtx                       |    6 +-
 required/graphics/changes.txt                      |    4 +
 required/tools/longtable.dtx                       |    9 +-
 required/tools/testfiles/github-0637.lvt           |   12 +
 .../tools/testfiles/github-0637.tlg                |    0
 texmf/tex/latex/l3kernel/expl3-code.tex            | 1142 +++++++++-----------
 texmf/tex/latex/l3kernel/expl3-generic.tex         |    2 +-
 texmf/tex/latex/l3kernel/expl3.ltx                 |    2 +-
 texmf/tex/latex/l3kernel/expl3.sty                 |    2 +-
 texmf/tex/latex/l3kernel/l3debug.def               |   26 +-
 texmf/tex/latex/l3packages/xparse/xparse.sty       |    6 +-
 47 files changed, 1647 insertions(+), 1532 deletions(-)

diff --cc base/changes.txt
index 26bb7b87,48031151..c2869a4b
--- a/base/changes.txt
+++ b/base/changes.txt
@@@ -6,11 -6,32 +6,36 @@@ completeness or accuracy and it contain
  are not part of the distribution.
  ================================================================================
  
+ 2021-08-27  Joseph Wright  <Joseph.Wright at latex-project.org>
+ 
+ 	* ltfilehook.dtx:
+ 	Use \msg_... instead of \__kernel_msg... commands for normalized
+ 	error and warning commands.
+ 
 -       * ltfilehooks.dtx, lthooks.dtx, ltpara.dtx:
 -       Internal changes to message names
++	* ltfilehooks.dtx, lthooks.dtx, ltpara.dtx:
++	Internal changes to message names
++
 +2021-08-25  Phelype Oleinik  <phelype.oleinik at latex-project.org>
 +
 +	* lthooks.dtx, ltcmdhooks.dtx, ltfilehook.dtx, ltclass.dtx, ltfiles.dtx:
 +	Standardise generic hook names (gh/648).
  
+ 2021-08-20  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+ 
+ 	* lthooks.dtx:
+ 	Documentation updates for generic hook commands (gh/638).
+ 
+ 	Deprecate \hook_disable:n, \hook_provide:n,
 -        \hook_provide_reversed:n, \hook_provide_pair:nn,
 -        \DisableHook, \ProvideHook, \ProvideReversedHook,
 -        and \ProvideMirroredHookPair.
++	\hook_provide_reversed:n, \hook_provide_pair:nn,
++	\DisableHook, \ProvideHook, \ProvideReversedHook,
++	and \ProvideMirroredHookPair.
+ 
+ 	Instead: \hook_activate_generic:n, \hook_disable_generic:n,
+ 	\ActivateGenericHook and \DisableGenericHook.
+ 
+ 	* lterror.dtx (subsection{Specific errors}):
+ 	Improve \@badend error message (gh/587)
+ 
 -
  2021-08-12  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
  
  	* lthooks.dtx (subsubsection{Generic hooks for all environments}):
diff --cc base/lthooks.dtx
index 87a68571,afacfd71..0a37a0ba
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@@ -4957,16 -4847,7 +5123,15 @@@
    }
  %    \end{macrocode}
  %
 +%    \begin{macrocode}
 +\msg_new:nnn { hooks } { generic-deprecated }
 +  {
 +    Generic~hook~'#1/#2/#3'~is~deprecated. \\
 +    Use~hook~'#1/#3/#2'~instead.
 +  }
 +%    \end{macrocode}
 +%
  %
- %
  %  \subsection{\LaTeXe{} package interface commands}
  %
  %
diff --cc base/testfiles-lthooks/ltcmdhooks-008.tlg
index 46515468,8d884121..7dc519a5
--- a/base/testfiles-lthooks/ltcmdhooks-008.tlg
+++ b/base/testfiles-lthooks/ltcmdhooks-008.tlg
@@@ -128,8 -130,9 +130,9 @@@ For immediate help type H <return>
  l. ...\AddToHookNext{\foo}{after}
                                   \ShowHook{\foo}
  The hook 'env/foo/before' you tried to add code to was previously disabled
- with \hook_disable:n or \DisableHook, so it cannot have code added to it.
+ with \hook_disable_generic:n or \DisableGenericHook, so it cannot have code
+ added to it.
 --> The hook 'env/foo/before':
 +-> The generic hook 'env/foo/before':
  > The hook is not declared.
  > The hook is disabled.
  > The hook is empty.
@@@ -148,8 -151,9 +151,9 @@@ For immediate help type H <return>
  l. ...\AddToHook{\foo}{after}
                                   \ShowHook{\foo}
  The hook 'cmd/test/before' you tried to add code to was previously disabled
- with \hook_disable:n or \DisableHook, so it cannot have code added to it.
+ with \hook_disable_generic:n or \DisableGenericHook, so it cannot have code
+ added to it.
 --> The hook 'cmd/test/before':
 +-> The generic hook 'cmd/test/before':
  > The hook is not declared.
  > The hook is disabled.
  > The hook is empty.
@@@ -174,8 -178,9 +178,9 @@@ For immediate help type H <return>
   ...                                              
  l. ...\AddToHook{\foo}{\ERROR 3}
  The hook 'cmd/mycmd/after' you tried to add code to was previously disabled
- with \hook_disable:n or \DisableHook, so it cannot have code added to it.
+ with \hook_disable_generic:n or \DisableGenericHook, so it cannot have code
+ added to it.
 --> The hook 'cmd/mycmd/after':
 +-> The generic hook 'cmd/mycmd/after':
  > The hook is not declared.
  > The hook is disabled.
  > Code chunks: