[latex3-commits] [git/LaTeX3-latex3-latex2e] gh337: Merge branch 'develop' (c4e0a272)

[Johannes Braams]

Repository : https://github.com/latex3/latex2e
On branch  : gh337
Link       : https://github.com/latex3/latex2e/commit/c4e0a272d140ea23d31f2dffbe4cfa526b51e21c

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

commit c4e0a272d140ea23d31f2dffbe4cfa526b51e21c
Merge: 1625863c afe5678f
Author: Johannes Braams <texniek at braams.xs4all.nl>
Date:   Sun Jul 12 12:32:54 2020 +0200

    Merge branch 'develop'
    
    Conflicts:
            base/changes.txt


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

c4e0a272d140ea23d31f2dffbe4cfa526b51e21c
 base/changes.txt                               | 11 +++++--
 base/ltexpl.dtx                                | 11 ++++++-
 base/ltfinal.dtx                               | 10 +++++-
 required/tools/changes.txt                     |  6 ++++
 required/tools/testfiles/github-0222-input.lvt | 43 ++++++++++++++++++++++++++
 required/tools/testfiles/github-0222-input.tlg | 10 ++++++
 required/tools/verbatim.dtx                    | 29 +++++++++++++----
 7 files changed, 110 insertions(+), 10 deletions(-)

diff --cc base/changes.txt
index aea05608,2581782c..1bf27c15
--- a/base/changes.txt
+++ b/base/changes.txt
@@@ -6,11 -6,14 +6,18 @@@ completeness or accuracy and it contain
  are not part of the distribution.
  ================================================================================
  
+ 2020-07-08  Joseph Wright  <joseph.wright at latex-project.org>
+ 
+ 	* ltexpl.dtx:
+ 	Add hook \@expl at finalise@setup@@
+ 
+ 	* ltfinal.dtx:
+ 	Execute hook \@expl at finalise@setup@@
+ 
 +2020-07-07  Johannes Braams  <Johannes.Braams at latex-project.org>
 +
- 	* docstrip.dtx: Merge the @@-module fuinctionality of
++	* docstrip.dtx: Merge the @@-module functionality of
 +	l3docstrip.dtx into docstrip.dtx (gh/337)
- 
  2020-07-04  Marcel Krüger  <Marcel.Krueger at latex-project.org>
  
  	* ltoutenc.dtx: