[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Merge branch 'hotfix/205+212' into develop (5cdd07f1)

Frank Mittelbach frank.mittelbach at latex-project.org
Sun Nov 10 22:03:26 CET 2019


Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/5cdd07f16486cb8f9f084838fc444b9e360fd04b

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

commit 5cdd07f16486cb8f9f084838fc444b9e360fd04b
Merge: 6e22a4ca 4b41051a
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sun Nov 10 22:03:26 2019 +0100

    Merge branch 'hotfix/205+212' into develop
    
    # Conflicts:
    #       base/README.md
    #       base/ltmiscen.dtx
    #       base/ltvers.dtx
    #       required/graphics/README.md
    #       required/tools/README.md


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

5cdd07f16486cb8f9f084838fc444b9e360fd04b
 base/build.lua                                     |   4 +-
 base/changes.txt                                   |  18 ++++
 base/doc.dtx                                       |  17 ++--
 .../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 +-
 required/amsmath/README.md                         |   2 +-
 required/graphics/README.md                        |   2 +-
 required/tools/README.md                           |   2 +-
 required/tools/build.lua                           |   5 +-
 required/tools/changes.txt                         |  13 ++-
 {base => required/tools}/config-TU.lua             |   0
 {base => required/tools}/config-legacy.lua         |   0
 .../tools/testfiles-TU/github-0212.luatex.tlg      | 102 +++++++++++----------
 .../tools/testfiles-TU/github-0212.lvt             |   4 +-
 .../tools/testfiles-TU/github-0212.tlg             |  92 +++++++++----------
 .../tools/testfiles-legacy/github-0212.lvt         |   4 +-
 .../tools/testfiles-legacy/github-0212.tlg         |  65 +++++--------
 required/tools/verbatim.dtx                        |  10 +-
 22 files changed, 269 insertions(+), 249 deletions(-)

diff --cc base/changes.txt
index 41bcc4b0,54d25d64..743f2866
--- a/base/changes.txt
+++ b/base/changes.txt
@@@ -4,30 -4,25 +4,48 @@@ completeness or accuracy and it contain
  are not part of the distribution.
  =======================================================================
  
 +2019-11-02  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 +
 +	* ltmiscen.dtx: Make \\ and \@centercr robust in all situations (gh/203)
 +	* ltspace.dtx:  Make \\ and \@normalcr robust in all situations (gh/203)
 +
 +2019-10-18  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 +
 +	* ltclass.dtx (section{Implementation}): Initialize
 +	\...-h@@k only when loading the package or class (gh/198)
 +
 +#########################
 +# 2019-10-01 PL 3 Release
 +#########################
 +
 +2019-11-10  David Carlisle  <David.Carlisle at latex-project.org>
 +
 +	* ltmiscen.dtx: fix special comment catcodes (gh/202)
 +
 +2019-11-09  David Carlisle  <David.Carlisle at latex-project.org>
 +
 +	* ltfiles.dtx: More filename normalisation: expand before
 +          removing quotes.
 +
  #########################
+ # 2019-10-01 PL 3 Release
+ #########################
+ 
+ 2019-11-10  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+ 
+ 	* doc.dtx: gh/205 wasn't correctly fixed in PL2
+ 	Put the definition into the right command :-( (gh/205)
+ 
+ 2019-11-10  David Carlisle  <David.Carlisle at latex-project.org>
+ 
+ 	* ltmiscen.dtx: fix special comment catcodes (gh/202)
+ 
+ 2019-11-09  David Carlisle  <David.Carlisle at latex-project.org>
+ 
+ 	* ltfiles.dtx: More filename normalisation: expand before
+           removing quotes.
+ 
+ #########################
  # 2019-10-01 PL 2 Release
  #########################
  
diff --cc required/amsmath/README.md
index 868efe52,868efe52..e10fadce
--- a/required/amsmath/README.md
+++ b/required/amsmath/README.md
@@@ -1,7 -1,7 +1,7 @@@
  The amsmath bundle for LaTeX
  ============================
  
--Release 2019-10-01 patch level 1
++Release 2020-02-01 pre-release 1
  
  Overview
  --------
diff --cc required/graphics/README.md
index e33be171,6567a09f..8934f815
--- a/required/graphics/README.md
+++ b/required/graphics/README.md
@@@ -1,7 -1,7 +1,7 @@@
  The LaTeX `graphics` bundle
  ===========================
  
- Release 2019-10-01 pre-release 1
 -Release 2019-10-01 patch level 2
++Release 2020-02-01 pre-release 1
  
  Overview
  --------
diff --cc required/tools/README.md
index e30982da,85af33dc..8f283041
--- a/required/tools/README.md
+++ b/required/tools/README.md
@@@ -1,7 -1,7 +1,7 @@@
  The LaTeX `tools` bundle
  ========================
  
- Release 2019-10-01 pre-release 1
 -Release 2019-11-08
++Release 2020-02-01 pre-release 1
  
  Overview
  --------
diff --cc required/tools/build.lua
index 887a6ded,1a9dba4e..755f4b82
--- a/required/tools/build.lua
+++ b/required/tools/build.lua
@@@ -19,15 -19,10 +19,14 @@@ unpackfiles  = {"tools.ins"
  
  sourcefiles  = {"*.dtx", "*.ins", "*-????-??-??.sty"}
  
 -checkdeps = {maindir .. "/base", maindir .. "/required/graphics"}
 +checkdeps =
 +  {
 +    maindir .. "/base",
 +    maindir .. "/required/graphics"
 +  }
  
- -- Allow for test searching the tree
- checkconfigs = {"build","config-search"}
- 
+ -- Allow for TU and other tests test
+ checkconfigs = {"build","config-TU","config-legacy","config-search"}
  
  -- Load the common settings for the LaTeX2e repo
  dofile (maindir .. "/build-config.lua")
diff --cc required/tools/changes.txt
index b28a7b3c,895ef169..ababafd4
--- a/required/tools/changes.txt
+++ b/required/tools/changes.txt
@@@ -6,15 -5,19 +5,27 @@@ completeness or accuracy and it contain
  are not part of the distribution.
  =======================================================================
  
+ 2019-11-10  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+ 
+ 	* verbatim.dtx: support \vervisiblespace with luatex and xetex (gh/212)
+ 
+ #########################
+ # 2019-11-08 Release
+ #########################
+ 
+ 2019-11-08  David Carlisle  <David.Carlisle at latex-project.org>
+ 
+ 	* (shellesc): restore the original catcode of _ to _ not to "
+ 
  #########################
 +# 2019-11-08 Release
 +#########################
 +
 +2019-11-08  David Carlisle  <David.Carlisle at latex-project.org>
 +
 +	* (shellesc): restore the original catcode of _ to _ not to "
 +
 +#########################
  # 2019-10-01 PL 2 Release
  #########################
  





More information about the latex3-commits mailing list