[latex3-commits] [git/LaTeX3-latex3-latex2e] nfssaxes: Merge branch 'develop' into nfssaxes (db61e49e)

Frank Mittelbach frank.mittelbach at latex-project.org
Mon Nov 11 18:13:18 CET 2019


Repository : https://github.com/latex3/latex2e
On branch  : nfssaxes
Link       : https://github.com/latex3/latex2e/commit/db61e49ea857e2dfb544c9430269a23022e5c9fb

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

commit db61e49ea857e2dfb544c9430269a23022e5c9fb
Merge: 24624ca1 a08e8b54
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Mon Nov 11 18:13:18 2019 +0100

    Merge branch 'develop' into nfssaxes
    
    # Conflicts:
    #       base/build.lua
    #       build-config.lua


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

db61e49ea857e2dfb544c9430269a23022e5c9fb
 base/build.lua                                     |   6 +-
 base/changes.txt                                   |  45 +++++-
 base/doc.dtx                                       |  17 +-
 base/doc/latexchanges.tex                          |   5 +
 base/latexrelease.ins                              |   1 +
 base/ltclass.dtx                                   |  22 +--
 base/ltexpl.dtx                                    |  16 +-
 base/ltfiles.dtx                                   |   7 +-
 base/ltmiscen.dtx                                  |  11 +-
 .../github-0205.luatex.tlg                         |  94 ++++++-----
 base/{testfiles => testfiles-TU}/github-0205.lvt   |   0
 .../github-0205.tlg}                               |  82 +++++-----
 .../github-0205.lvt                                |   0
 .../github-0205.tlg                                |   0
 base/testfiles-legacy/utf8-test-001.tlg            |   2 +-
 base/testfiles/tlb-filename-01.lvt                 |  13 ++
 .../{github-0094.tlg => tlb-filename-01.tlg}       |   8 +-
 base/testfiles/tlb-latexrelease-003.luatex.tlg     |   2 +
 base/testfiles/tlb-latexrelease-003.tlg            |   2 +
 base/testfiles/tlb-latexrelease-003.xetex.tlg      |   2 +
 build-config.lua                                   |  17 +-
 required/amsmath/README.md                         |   2 +-
 required/graphics/README.md                        |   2 +-
 required/graphics/changes.txt                      |   4 +
 required/tools/README.md                           |   2 +-
 required/tools/build.lua                           |   5 +-
 required/tools/changes.txt                         |  21 ++-
 {base => required/tools}/config-TU.lua             |   0
 {base => required/tools}/config-legacy.lua         |   0
 required/tools/shellesc.dtx                        |   4 +-
 required/tools/testfiles-TU/github-0212.luatex.tlg | 180 +++++++++++++++++++++
 .../tools/testfiles-TU/github-0212.lvt             |  12 +-
 required/tools/testfiles-TU/github-0212.tlg        | 150 +++++++++++++++++
 .../tools/testfiles-legacy/github-0212.lvt         |   4 +-
 .../tools/testfiles-legacy/github-0212.tlg         |  65 +++-----
 required/tools/verbatim.dtx                        |  10 +-
 36 files changed, 620 insertions(+), 193 deletions(-)






More information about the latex3-commits mailing list