[latex3-commits] [git/LaTeX3-latex3-latex2e] gh818: Merge branch 'develop' into gh818 (2009137f)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : gh818
Link       : https://github.com/latex3/latex2e/commit/2009137f08ba8a06352a847beec4df20aedb5f59

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

commit 2009137f08ba8a06352a847beec4df20aedb5f59
Merge: f27392b6 6ed8c299
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu May 19 10:27:46 2022 +0200

    Merge branch 'develop' into gh818
    
    # Conflicts:
    #       base/changes.txt
    #       base/lthooks.dtx


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

2009137f08ba8a06352a847beec4df20aedb5f59
 base/changes.txt                                                     | 5 +++++
 base/ltdefns.dtx                                                     | 4 ++--
 base/lthooks.dtx                                                     | 4 ++--
 base/ltpara.dtx                                                      | 4 ++--
 base/testfiles-lthooks/{shipout-000.lvt => lthooks-032.lvt}          | 5 +++--
 .../tlb-dox013.tlg => testfiles-lthooks/lthooks-032.tlg}             | 2 +-
 base/update-lthooks-tests.sh                                         | 1 +
 7 files changed, 16 insertions(+), 9 deletions(-)

diff --cc base/update-lthooks-tests.sh
index aed91e18,493f2fcb..3b49584d
--- a/base/update-lthooks-tests.sh
+++ b/base/update-lthooks-tests.sh
@@@ -85,7 -85,6 +85,8 @@@ l3build save -cconfig-lthooks 
     lthooks-029 \
     lthooks-029-deprecated \
     lthooks-030 \
 +   lthooks-031 \
++   lthooks-032 \
     lthooks-errors \
     lthooks-errors-deprecated \
     lthooks-etoolbox \