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

[Frank Mittelbach]

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

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

commit cc4a261b6dd07e98d36b0e4ee3591cdf6864ad81
Merge: a0bac60e b556b34f
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sun Oct 13 17:42:29 2019 +0200

    Merge branch 'develop' into nfssaxes
    
    # Conflicts:
    #       required/graphics/changes.txt


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

cc4a261b6dd07e98d36b0e4ee3591cdf6864ad81
 .gitattributes                                     |   1 +
 base/changes.txt                                   |   8 ++++
 base/doc/latexchanges.tex                          |   7 +++
 base/ltfiles.dtx                                   |  11 ++++-
 base/ltvers.dtx                                    |   2 +-
 base/nfssfont.dtx                                  |   6 ++-
 required/amsmath/README.md                         |   2 +-
 required/amsmath/build.lua                         |   2 +-
 required/amsmath/changes.txt                       |   8 ++++
 required/graphics/changes.txt                      |   4 ++
 required/graphics/graphics.dtx                     |  35 ++++++++++++++-
 required/graphics/testfiles/braces-compat-01.lvt   |  48 +++++++++++++++++++++
 .../graphics/testfiles/braces-compat-01.tlg        |   0
 .../{cat.eps => testfiles/support/foo.bar.eps}     |   0
 .../graphics/testfiles/support/foo.bar.png         | Bin
 15 files changed, 126 insertions(+), 8 deletions(-)

diff --cc required/graphics/changes.txt
index b4783449,71e91fc8..9132c86a
--- a/required/graphics/changes.txt
+++ b/required/graphics/changes.txt
@@@ -4,11 -4,10 +4,15 @@@ completeness or accuracy and it contain
  are not part of the distribution.
  =======================================================================
  
 +2019-10-09  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 +
 +	* color.dtx (section{Default Colour}):
 +	Make \normalcolor robust
 +
+ 2019-10-08  David Carlisle  <David.Carlisle at latex-project.org>
+ 
+ 	* graphics.dtx: fallback definitions of \set at curr@file etc added
+ 
  #########################
  # 2019-10-01 Release
  #########################