[latex3-commits] [git/LaTeX3-latex3-latex2e] gh697: Merge branch 'develop' into gh697 (2cb622c8)

[GitHub]

Repository : https://github.com/latex3/latex2e
On branch  : gh697
Link       : https://github.com/latex3/latex2e/commit/2cb622c86a0678040bc9dacf9abbae4516e97734

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

commit 2cb622c86a0678040bc9dacf9abbae4516e97734
Merge: 01b415be 645514b6
Author: Phelype Oleinik <phelype.oleinik at latex-project.org>
Date:   Wed Oct 20 22:40:16 2021 -0300

    Merge branch 'develop' into gh697


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

2cb622c86a0678040bc9dacf9abbae4516e97734
 base/changes.txt                                   |  6 +++
 base/ltpara.dtx                                    | 14 ++++-
 base/testfiles-legacy/github-0255-2019.tlg         |  1 -
 base/testfiles/github-0327-rollback.luatex.tlg     |  3 --
 base/testfiles/github-0327-rollback.tlg            |  3 --
 base/testfiles/github-0327-rollback.xetex.tlg      |  3 --
 base/testfiles/tlb-utf8-dec-cp1252-2017.luatex.tlg |  1 -
 base/testfiles/tlb-utf8-dec-cp1252-2017.tlg        |  1 -
 base/testfiles/tlb-utf8-dec-cp1252-2017.xetex.tlg  |  1 -
 base/testfiles/tlb-utf8-dec-utf8-2017.luatex.tlg   |  1 -
 base/testfiles/tlb-utf8-dec-utf8-2017.tlg          |  1 -
 base/testfiles/tlb-utf8-dec-utf8-2017.xetex.tlg    |  1 -
 .../tlb-utf8-undec-cp1252-2017.luatex.tlg          |  1 -
 base/testfiles/tlb-utf8-undec-cp1252-2017.tlg      |  1 -
 .../testfiles/tlb-utf8-undec-cp1252-2017.xetex.tlg |  1 -
 base/testfiles/tlb-utf8-undec-utf8-2017.luatex.tlg |  1 -
 base/testfiles/tlb-utf8-undec-utf8-2017.tlg        |  1 -
 base/testfiles/tlb-utf8-undec-utf8-2017.xetex.tlg  |  1 -
 base/testfiles/tlb0057.luatex.tlg                  |  3 --
 base/testfiles/tlb0057.tlg                         |  3 --
 base/testfiles/tlb0084.tlg                         |  5 --
 base/testfiles/tlb0480.luatex.tlg                  |  2 -
 base/testfiles/tlb0480.tlg                         |  2 -
 base/testfiles/tlb2583.tlg                         |  2 -
 base/testfiles/tlb3855-20170101.luatex.tlg         |  2 -
 base/testfiles/tlb3855-20170101.tlg                |  2 -
 base/testfiles/vlatex03.luatex.tlg                 | 48 ------------------
 base/testfiles/vlatex03.tlg                        | 48 ------------------
 base/testfiles/vlatex06.luatex.tlg                 | 59 ----------------------
 base/testfiles/vlatex06.tlg                        | 59 ----------------------
 base/testfiles/vtl2e03.luatex.tlg                  | 49 ------------------
 base/testfiles/vtl2e03.tlg                         | 49 ------------------
 .../tools/testfiles-search/tlb-varioref-005.tlg    | 20 --------
 required/tools/testfiles/tlb2149.tlg               |  1 -
 34 files changed, 18 insertions(+), 378 deletions(-)

diff --cc base/changes.txt
index b78dd4f3,49326538..c8c36aa9
--- a/base/changes.txt
+++ b/base/changes.txt
@@@ -6,11 -6,12 +6,17 @@@ completeness or accuracy and it contain
  are not part of the distribution.
  ================================================================================
  
 +2021-10-20 Phelype Oleinik  <phelype.oleinik at latex-project.org>
 +
 +	* ltcmdhooks.dtx (subsubsection{Patching by expansion and redefinition}):
 +	Fix patching of commands that contain parameter tokens (gh/697)
 +
+ 2021-10-19  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+ 
+ 	* ltpara.dtx (subsection{The error messages}):
+ 	Remove content from \tex_everypar:D (aka \everypar) on rollback.
+ 	Without it rollback is not functioning in all cases (gh/695).
+ 
  2021-10-16  David Carlisle  <David.Carlisle at latex-project.org>
  
  	* ltoutenc.dtx: guard spacefactor setting in accents gh/643