[latex3-commits] [git/LaTeX3-latex3-latex2e] marks: Merge branch 'develop' into marks (981c7b65)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : marks
Link       : https://github.com/latex3/latex2e/commit/981c7b65bcc7decf4b9dc22c591c465b341f3a34

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

commit 981c7b65bcc7decf4b9dc22c591c465b341f3a34
Merge: a28b2fec 0cebd9a4
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Apr 7 14:48:21 2022 +0200

    Merge branch 'develop' into marks
    
    # Conflicts:
    #       base/changes.txt


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

981c7b65bcc7decf4b9dc22c591c465b341f3a34
 base/changes.txt                                   | 10 +++
 base/doc/ltnews35.tex                              | 37 ++++++++---
 base/ltfilehook.dtx                                | 76 +++++++++++-----------
 base/ltfiles.dtx                                   | 69 +++++++++++++++++++-
 base/lthooks.dtx                                   | 11 +++-
 base/testfiles-lthooks/filehook-013.lvt            | 38 +++++++++++
 base/testfiles-lthooks/filehook-013.tlg            | 13 ++++
 base/testfiles-lthooks/ltcmdhooks-001.tlg          |  1 +
 base/testfiles-lthooks/lthooks-000.tlg             |  1 +
 base/testfiles-lthooks/lthooks-001.tlg             |  3 +
 base/testfiles-lthooks/lthooks-002.tlg             |  3 +
 base/testfiles-lthooks/lthooks-003.tlg             |  2 +
 base/testfiles-lthooks/lthooks-004.tlg             |  2 +
 base/testfiles-lthooks/lthooks-005.tlg             |  2 +
 base/testfiles-lthooks/lthooks-006.tlg             |  2 +
 base/testfiles-lthooks/lthooks-007.tlg             |  3 +
 base/testfiles-lthooks/lthooks-008.tlg             |  2 +
 base/testfiles-lthooks/lthooks-009.tlg             |  1 +
 base/testfiles-lthooks/lthooks-011.tlg             |  4 ++
 base/testfiles-lthooks/lthooks-013.tlg             |  1 +
 base/testfiles-lthooks/lthooks-021.tlg             |  1 +
 base/testfiles-lthooks/lthooks-legacy.tlg          |  1 +
 base/testfiles-lthooks2/lthooks2-002.tlg           |  1 +
 base/testfiles-lthooks2/lthooks2-005.tlg           |  2 +
 base/testfiles/github-0479-often.luatex.tlg        |  3 +-
 base/testfiles/github-0479-often.tlg               |  3 +-
 base/testfiles/github-0479-often.xetex.tlg         |  3 +-
 .../tlb-latexrelease-rollback-003-often.luatex.tlg |  6 +-
 .../tlb-latexrelease-rollback-003-often.tlg        |  6 +-
 .../tlb-latexrelease-rollback-003-often.xetex.tlg  |  6 +-
 ...tlb-latexrelease-rollback-2020-10-01.luatex.tlg |  3 +-
 .../tlb-latexrelease-rollback-2020-10-01.tlg       |  3 +-
 .../tlb-latexrelease-rollback-2020-10-01.xetex.tlg |  3 +-
 ...tlb-latexrelease-rollback-2021-06-01.luatex.tlg |  3 +-
 .../tlb-latexrelease-rollback-2021-06-01.tlg       |  3 +-
 .../tlb-latexrelease-rollback-2021-06-01.xetex.tlg |  3 +-
 ...tlb-latexrelease-rollback-2021-11-15.luatex.tlg |  3 +-
 .../tlb-latexrelease-rollback-2021-11-15.tlg       |  3 +-
 .../tlb-latexrelease-rollback-2021-11-15.xetex.tlg |  3 +-
 ...lb-latexrelease-rollback-2022-06-01.luatex.tlg} |  2 +
 ...vt => tlb-latexrelease-rollback-2022-06-01.lvt} |  2 +-
 ...lg => tlb-latexrelease-rollback-2022-06-01.tlg} |  2 +
 ...tlb-latexrelease-rollback-2022-06-01.xetex.tlg} |  2 +
 base/testfiles/tlb-rollback-004-often.luatex.tlg   |  3 +-
 base/testfiles/tlb-rollback-004-often.tlg          |  3 +-
 base/testfiles/tlb-rollback-004-often.xetex.tlg    |  3 +-
 base/testfiles/tlb-rollback-005.luatex.tlg         |  3 +-
 base/testfiles/tlb-rollback-005.tlg                |  3 +-
 base/testfiles/tlb-rollback-005.xetex.tlg          |  3 +-
 base/update-lthooks-tests.sh                       |  1 +
 base/update-rollback-tests.sh                      |  1 +
 51 files changed, 291 insertions(+), 77 deletions(-)

diff --cc base/changes.txt
index ba7a799d,470c1134..313072a6
--- a/base/changes.txt
+++ b/base/changes.txt
@@@ -6,19 -6,16 +6,29 @@@ completeness or accuracy and it contain
  are not part of the distribution.
  ================================================================================
  
 +2022-04-03  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 +
 +	* ltmarks.dtx: New module to implement new marks mechanism
 +
 +	* ltpage.dtx (section| command.):
 +	Updates to \markboth and \markright to interface with new mark mechanism
 +
 +	* ltoutput.dtx (subsection{Floats}):
 +	Interface with new mark mechanism
 +
 +	* ltfinal.dtx (subsection{Typesetting parameters}):
 +	Integration of new mark management interface
 +
+ 2022-04-01  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+ 
+ 	* ltfiles.dtx (section{File Handling}):
+ 	Process include/excluded hook(s) if an include file is bypassed
+ 
+ 	* lthooks.dtx (subsection{Adding or removing hook code}):
+ 	Add support for generic include/.../excluded hooks
+ 
+ 	* ltfilehook.dtx: document include/excluded hooks
+ 
  2022-03-18  Joseph Wright  <joseph.wright at latex-project.org>
  
  	* ltkeys.dtx: