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

Frank Mittelbach frank.mittelbach at latex-project.org
Tue Nov 5 13:46:43 CET 2019


Repository : https://github.com/latex3/latex2e
On branch  : textcomp
Link       : https://github.com/latex3/latex2e/commit/ddc13532e0f6762451e04cbc8dd3b73ea1603eb7

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

commit ddc13532e0f6762451e04cbc8dd3b73ea1603eb7
Merge: 01160298 bcc5cc43
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Tue Nov 5 13:46:43 2019 +0100

    Merge branch 'develop' into textcomp
    
    # Conflicts:
    #       base/testfiles/sx172785.luatex.tlg
    #       base/testfiles/sx172785.xetex.tlg
    #       required/tools/testfiles/tlb2968.xetex.tlg


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

ddc13532e0f6762451e04cbc8dd3b73ea1603eb7
 .gitattributes                                     |     1 +
 base/changes.txt                                   |    41 +
 base/classes.dtx                                   |    10 +-
 base/doc.dtx                                       |    24 +-
 base/doc/latexchanges.tex                          |     7 +
 base/{ => doc}/lb2.err                             |     0
 base/{ => doc}/lgc2.err                            |     0
 base/doc/ltnews.tex                                |     4 +-
 base/doc/ltnews31.tex                              |   248 +
 base/{ => doc}/manual.err                          |     0
 base/{ => doc}/tlc2.err                            |     0
 base/{ => doc}/webcomp.err                         |     0
 base/format.ins                                    |     6 +-
 base/ltclass.dtx                                   |    12 +-
 base/ltdirchk.dtx                                  |    45 +-
 base/{ltpageno.dtx => ltexpl.dtx}                  |    74 +-
 base/ltfiles.dtx                                   |    30 +-
 base/ltfinal.dtx                                   |    10 +-
 base/ltluatex.dtx                                  |     7 +-
 base/ltmiscen.dtx                                  |    42 +-
 base/ltsect.dtx                                    |     2 +-
 base/lttab.dtx                                     |     8 +-
 base/ltvers.dtx                                    |     2 +-
 base/nfssfont.dtx                                  |     6 +-
 base/testfiles/github-0192.lvt                     |    21 +
 .../testfiles/github-0192.tlg                      |    79 +-
 base/testfiles/github-0198.lvt                     |    22 +
 .../tlb2215.tlg => testfiles/github-0198.tlg}      |     0
 base/testfiles/github-0201.lvt                     |    14 +
 .../{github-0060.luatex.tlg => github-0201.tlg}    |     0
 base/testfiles/github-0202.lvt                     |    20 +
 base/testfiles/{tlb1783b.tlg => github-0202.tlg}   |    10 +-
 base/testfiles/github-0205.luatex.tlg              |   134 +
 base/testfiles/github-0205.lvt                     |    28 +
 base/testfiles/github-0205.tlg                     |   101 +
 base/testfiles/github-0205.xetex.tlg               |   119 +
 base/testfiles/github-robust-0123.luatex.tlg       |     6 +-
 base/testfiles/github-robust-0123.tlg              |     6 +-
 base/testfiles/github-robust-0123.xetex.tlg        |     6 +-
 base/testfiles/sx172785.luatex.tlg                 |     5 +-
 base/testfiles/sx172785.tlg                        |     2 +
 base/testfiles/sx172785.xetex.tlg                  |     5 +-
 base/testfiles/tlb-latexrelease-003.luatex.tlg     |     4 +
 base/testfiles/tlb-latexrelease-003.tlg            |     4 +
 base/testfiles/tlb-latexrelease-003.xetex.tlg      |     4 +
 base/testfiles/tlb-syntonly-001.luatex.tlg         |     2 +-
 build-config.lua                                   |    22 +-
 required/amsmath/README.md                         |     2 +-
 required/amsmath/amsldoc.tex                       |    11 +-
 required/amsmath/amsmath.dtx                       |     2 +-
 required/amsmath/build.lua                         |     2 +-
 required/amsmath/changes.txt                       |     8 +
 required/graphics/changes.txt                      |    10 +
 required/graphics/graphics.dtx                     |    88 +-
 required/graphics/testfiles/braces-compat-01.lvt   |    45 +
 required/graphics/testfiles/braces-compat-01.tlg   |    25 +
 .../graphics/testfiles/braces-compat-01.xetex.tlg  |    25 +
 .../{cat.eps => testfiles/support/foo.bar.eps}     |     0
 .../graphics/testfiles/support/foo.bar.png         |   Bin
 .../testfiles/utf8-filenames-001.luatex.tlg        |     2 +
 required/graphics/testfiles/utf8-filenames-001.tlg |     2 +
 .../testfiles/utf8-filenames-001.xetex.tlg         |     2 +
 .../testfiles/utf8-filenames-002.luatex.tlg        |     2 +
 required/graphics/testfiles/utf8-filenames-002.tlg |     2 +
 .../testfiles/utf8-filenames-002.xetex.tlg         |     2 +
 required/tools/changes.txt                         |    15 +
 required/tools/multicol.dtx                        |    29 +-
 required/tools/shellesc.dtx                        |    82 +-
 .../tools/testfiles-search/support/nameref-new.sty |   449 -
 .../testfiles-search/support/nameref-orig.sty      |   530 -
 .../tools/testfiles-search/support/nameref.sty     |   542 -
 required/tools/testfiles/github-0190.lvt           |    65 +
 .../tools/testfiles/github-0190.tlg                |     9 +-
 .../tools/testfiles/tlb-shellesc-001.luatex.tlg    |     3 +
 required/tools/testfiles/tlb2968.luatex.tlg        |     2 +
 required/tools/testfiles/tlb2968.tlg               |     2 +
 required/tools/testfiles/tlb2968.xetex.tlg         |     5 +-
 required/tools/xr.dtx                              |     2 +-
 support/etex.sty                                   |   507 +
 support/test209.tex                                |     8 +
 support/test2e.tex                                 |     8 +
 support/texlive.sh                                 |     4 +-
 texmf/tex/latex/l3backend/l3backend-dvipdfmx.def   |   647 +
 texmf/tex/latex/l3backend/l3backend-dvips.def      |  1196 +
 texmf/tex/latex/l3backend/l3backend-dvisvgm.def    |   528 +
 texmf/tex/latex/l3backend/l3backend-pdfmode.def    |   751 +
 texmf/tex/latex/l3backend/l3backend-xdvipdfmx.def  |   693 +
 texmf/tex/latex/l3kernel/expl3-code.tex            | 29284 +++++++++++++++++++
 texmf/tex/latex/l3kernel/expl3-generic.tex         |    94 +
 texmf/tex/latex/l3kernel/expl3.ltx                 |   139 +
 texmf/tex/latex/l3kernel/expl3.lua                 |   146 +
 texmf/tex/latex/l3kernel/expl3.sty                 |   161 +
 texmf/tex/latex/l3kernel/l3debug.def               |   990 +
 texmf/tex/latex/l3kernel/l3deprecation.def         |   246 +
 texmf/tex/latex/l3kernel/l3doc.cls                 |  2360 ++
 texmf/tex/latex/l3kernel/l3docstrip.tex            |    90 +
 texmf/tex/latex/l3kernel/l3str-enc-iso88591.def    |    29 +
 texmf/tex/latex/l3kernel/l3str-enc-iso885910.def   |    75 +
 texmf/tex/latex/l3kernel/l3str-enc-iso885911.def   |   120 +
 texmf/tex/latex/l3kernel/l3str-enc-iso885913.def   |    85 +
 texmf/tex/latex/l3kernel/l3str-enc-iso885914.def   |    60 +
 texmf/tex/latex/l3kernel/l3str-enc-iso885915.def   |    37 +
 texmf/tex/latex/l3kernel/l3str-enc-iso885916.def   |    69 +
 texmf/tex/latex/l3kernel/l3str-enc-iso88592.def    |    86 +
 texmf/tex/latex/l3kernel/l3str-enc-iso88593.def    |    64 +
 texmf/tex/latex/l3kernel/l3str-enc-iso88594.def    |    79 +
 texmf/tex/latex/l3kernel/l3str-enc-iso88595.def    |   123 +
 texmf/tex/latex/l3kernel/l3str-enc-iso88596.def    |   109 +
 texmf/tex/latex/l3kernel/l3str-enc-iso88597.def    |   108 +
 texmf/tex/latex/l3kernel/l3str-enc-iso88598.def    |    96 +
 texmf/tex/latex/l3kernel/l3str-enc-iso88599.def    |    35 +
 111 files changed, 40442 insertions(+), 1743 deletions(-)

diff --cc required/graphics/testfiles/utf8-filenames-002.tlg
index 79bde18a,8a7fc21f..e07d027d
--- a/required/graphics/testfiles/utf8-filenames-002.tlg
+++ b/required/graphics/testfiles/utf8-filenames-002.tlg
@@@ -87,8 -84,9 +87,10 @@@ latexrelease.sty    ....-..-.. v... LaT
     t1enc.dfu    ....-..-.. v... UTF-8 support for inputenc
    ot1enc.dfu    ....-..-.. v... UTF-8 support for inputenc
    omsenc.dfu    ....-..-.. v... UTF-8 support for inputenc
 +  ts1enc.dfu    ....-..-.. v... UTF-8 support for inputenc
    test2e.tex
+    expl3.sty    ....-..-.. L3 programming layer (loader) 
+ l3backend-dvips.def    ....-..-.. L3 backend support: dvips
  graphicx.sty    ....-..-.. v... Enhanced LaTeX Graphics (DPC,SPQR)
    keyval.sty    ....-..-.. v... key=value parser (DPC)
  graphics.sty    ....-..-.. v... Standard LaTeX Graphics (DPC,SPQR)
diff --cc required/tools/testfiles/tlb2968.luatex.tlg
index 26e6d593,92e8abf4..99358ef3
--- a/required/tools/testfiles/tlb2968.luatex.tlg
+++ b/required/tools/testfiles/tlb2968.luatex.tlg
@@@ -336,9 -336,9 +336,11 @@@ en\ETC.
  \indexentry{![=\verb!*+!\![+|usage}{1}
  (tlb2968.aux)
   *File List*
 +  ts1enc.def    ....-..-.. v... (jk/car/fm) Standard LaTeX file
 +  ts1lmr.fd    ....-..-.. v... Font defs for Latin Modern
    test2e.tex
+    expl3.sty    ....-..-.. L3 programming layer (loader) 
+ l3backend-dvips.def    ....-..-.. L3 backend support: dvips
   article.cls    ....-..-.. v... Standard LaTeX document class
    size10.clo    ....-..-.. v... Standard LaTeX file (size option)
       doc.sty    ....-..-.. v... Standard LaTeX documentation package (FMi)
diff --cc required/tools/testfiles/tlb2968.tlg
index f18e014e,1a5cf39e..c99a744e
--- a/required/tools/testfiles/tlb2968.tlg
+++ b/required/tools/testfiles/tlb2968.tlg
@@@ -289,10 -289,9 +289,12 @@@ Completed box being shipped out [1
  \indexentry{![=\verb!*+!\![+|usage}{1}
  (tlb2968.aux)
   *File List*
 +  ts1enc.def    ....-..-.. v... (jk/car/fm) Standard LaTeX file
 +  ts1enc.dfu    ....-..-.. v... UTF-8 support for inputenc
 +  ts1cmr.fd    ....-..-.. v... Standard LaTeX font definitions
    test2e.tex
+    expl3.sty    ....-..-.. L3 programming layer (loader) 
+ l3backend-dvips.def    ....-..-.. L3 backend support: dvips
   article.cls    ....-..-.. v... Standard LaTeX document class
    size10.clo    ....-..-.. v... Standard LaTeX file (size option)
       doc.sty    ....-..-.. v... Standard LaTeX documentation package (FMi)





More information about the latex3-commits mailing list