[latex3-commits] [git/LaTeX3-latex3-latex2e] metadata: Resolve conflict with updates on develop (67f93610)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : metadata
Link       : https://github.com/latex3/latex2e/commit/67f93610bb6652dfbf517b130bffbcd834f1feb2

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

commit 67f93610bb6652dfbf517b130bffbcd834f1feb2
Merge: 5776b181 26d2e4bb
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Wed Dec 15 15:04:46 2021 +0100

    Resolve conflict with updates on develop


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

67f93610bb6652dfbf517b130bffbcd834f1feb2
 base/changes.txt                                 |  4 ++
 base/doc/ltnews35.tex                            |  7 ++-
 base/testfiles-legacy/github-0730.lvt            | 12 ++++
 base/testfiles-legacy/github-0730.tlg            | 33 ++++++++++
 base/utf8ienc.dtx                                |  7 ++-
 required/graphics/changes.txt                    |  4 ++
 required/graphics/color.dtx                      | 14 +++--
 texmf/tex/latex/l3backend/l3backend-dvipdfmx.def |  2 +-
 texmf/tex/latex/l3backend/l3backend-dvips.def    |  2 +-
 texmf/tex/latex/l3backend/l3backend-dvisvgm.def  | 80 ++++++++++++------------
 texmf/tex/latex/l3backend/l3backend-luatex.def   |  2 +-
 texmf/tex/latex/l3backend/l3backend-pdftex.def   |  2 +-
 texmf/tex/latex/l3backend/l3backend-xetex.def    |  2 +-
 13 files changed, 116 insertions(+), 55 deletions(-)

diff --cc base/changes.txt
index 105b8859,f49223dd..11c089d8
--- a/base/changes.txt
+++ b/base/changes.txt
@@@ -6,13 -6,10 +6,17 @@@ completeness or accuracy and it contain
  are not part of the distribution.
  ================================================================================
  
 +2021-12-13  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 +
 +	* ltmeta.dtx:
 +	First version of this module added implementing an interface to
 +	\DocumentMetadata. At the moment the actual code is outside the
 +	format and only loaded if the command is called.
 +
+ 2021-12-13  David Carlisle  <David.Carlisle at latex-project.org>
+ 
+ 	* utf8ienc.dtx:  Use hex 80 not A0 to test for single byte UTF-8 github/730
+ 
  2021-12-12  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
  
  	* doc.dtx (subsection[Dealing with the change history]):