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

[Frank Mittelbach]

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

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

commit 21abaf6b9ea40cbebbbce5d4e05f8d4c5884a8f8
Merge: 1153bd62 956fb970
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sun Nov 24 20:05:22 2019 +0100

    Merge branch 'develop' into nfssaxes
    
    # Conflicts:
    #       required/graphics/color.dtx


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

21abaf6b9ea40cbebbbce5d4e05f8d4c5884a8f8
 base/changes.txt                                   |  5 +++
 base/doc/ltnews31.tex                              |  4 +++
 base/ltoutenc.dtx                                  | 19 ++++++++--
 base/testfiles/github-0199.luatex.tlg              | 10 ++++++
 base/testfiles/github-0199.lvt                     | 33 +++++++++++++++++
 base/testfiles/github-0199.tlg                     | 13 +++++++
 base/testfiles/github-0199.xetex.tlg               | 10 ++++++
 base/testfiles/{tlb2054.tlg => tlb2054.luatex.tlg} |  3 +-
 base/testfiles/tlb2054.tlg                         |  3 +-
 required/graphics/changes.txt                      |  5 +++
 required/graphics/color.dtx                        | 42 +++++++++++++++-------
 required/graphics/testfiles/robust-color-gh208.lvt | 14 ++++++++
 .../graphics/testfiles/robust-color-gh208.tlg      |  5 +--
 required/tools/changes.txt                         |  4 +++
 14 files changed, 149 insertions(+), 21 deletions(-)