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

Johannes Braams texniek at braams.xs4all.nl
Sat Jul 25 17:16:22 CEST 2020


Repository : https://github.com/latex3/latex2e
On branch  : gh356
Link       : https://github.com/latex3/latex2e/commit/eb4b898f44a41707c142c16921e8d264be38185f

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

commit eb4b898f44a41707c142c16921e8d264be38185f
Merge: 8ed77b6f a91ede24
Author: Johannes Braams <texniek at braams.xs4all.nl>
Date:   Sat Jul 25 17:16:22 2020 +0200

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


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

eb4b898f44a41707c142c16921e8d264be38185f
 base/README.md                                     |    2 +-
 base/changes.txt                                   |    5 +
 base/doc/ltnews32.tex                              |   21 +
 base/ltfilehook.dtx                                |    4 +-
 base/ltfinal.dtx                                   |    4 +-
 base/lthooks.dtx                                   |    6 +-
 base/ltvers.dtx                                    |    2 +-
 .../github-0069.lvt => testfiles/github-0354.lvt}  |   14 +-
 base/testfiles/github-0354.tlg                     |   13 +
 required/graphics/README.md                        |    2 +-
 required/tools/README.md                           |    2 +-
 required/tools/array.dtx                           |   45 +-
 required/tools/changes.txt                         |   11 +
 required/tools/testfiles-TU/github-0352.luatex.tlg |  230 ++++
 required/tools/testfiles-TU/github-0352.lvt        |   39 +
 required/tools/testfiles-TU/github-0352.tlg        |  140 +++
 required/tools/testfiles/github-0322.lvt           |   63 +
 .../tools/testfiles/github-0322.tlg                |    6 +-
 required/tools/varioref.dtx                        |   87 +-
 texmf/tex/latex/l3kernel/expl3-code.tex            | 1308 +++++++++-----------
 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               |    6 +
 texmf/tex/latex/l3kernel/l3deprecation.def         |  163 ---
 texmf/tex/latex/l3kernel/l3doc.cls                 |    2 +-
 26 files changed, 1226 insertions(+), 955 deletions(-)

diff --cc base/changes.txt
index cf8fc5b8,1ef6f2cd..5be0fd1f
--- a/base/changes.txt
+++ b/base/changes.txt
@@@ -6,11 -6,11 +6,16 @@@ completeness or accuracy and it contain
  are not part of the distribution.
  ================================================================================
  
+ 2020-07-16  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+ 
+ 	* ltmiscen.dtx: \begin should not be long for better
+ 	error recovery (gh/354)
+ 
 +2020-07-10  Johannes Braams  <Johannes.Braams at latex-project.org>
 +
 +	* ltfiles.dtx: Prevent \input{} from trying to load
 +	csnameendcsname.tex (gh/356)
 +
  2020-07-09  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
  
  	* lthooks.dtx, ltshipout.dtx, ltfilehook.dtx:





More information about the latex3-commits mailing list.