[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Merge branch 'master' into develop (luaoftload works correctly on develop); setup need updating on master (fbe98155)
Frank Mittelbach
frank.mittelbach at latex-project.org
Sun Nov 10 23:43:41 CET 2019
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/fbe98155616beed14400099b695900e3b121289e
>---------------------------------------------------------------
commit fbe98155616beed14400099b695900e3b121289e
Merge: e6dfb66b b32b2628
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Sun Nov 10 23:43:41 2019 +0100
Merge branch 'master' into develop
(luaoftload works correctly on develop); setup need updating on master
>---------------------------------------------------------------
fbe98155616beed14400099b695900e3b121289e
required/tools/testfiles-TU/github-0212.luatex.tlg | 46 +++++++++++++++++++++-
required/tools/testfiles-TU/github-0212.lvt | 8 ++++
required/tools/testfiles-TU/github-0212.tlg | 41 ++++++++++++++++++-
3 files changed, 91 insertions(+), 4 deletions(-)
diff --cc required/tools/testfiles-TU/github-0212.luatex.tlg
index 61b3ba38,91ea71a0..10d1e54e
--- a/required/tools/testfiles-TU/github-0212.luatex.tlg
+++ b/required/tools/testfiles-TU/github-0212.luatex.tlg
@@@ -1,5 -1,12 +1,12 @@@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
+ > \encodingdefault=\long macro:
-->OT1.
++->TU.
+ l. ...\show\encodingdefault
+ > \f at encoding=macro:
-->OT1.
++->TU.
+ <recently read> \f at encoding
+ l. ...\expandafter\show\csname f at encoding\endcsname
> \verbvisiblespace=macro:
->\protect \verbvisiblespace .
l. ...\show\verbvisiblespace
@@@ -16,10 -23,10 +23,10 @@@ Completed box being shipped out [1
...\hbox(0.0+0.0)x345.0, direction TLT
..\glue 25.0
..\glue(\lineskip) 0.0
- ..\vbox(550.0+0.0)x345.0, glue set 495.94702fil, direction TLT
+ ..\vbox(550.0+0.0)x345.0, glue set 473.94937fil, direction TLT
...\write-{}
-...\glue(\topskip) 3.05556
-...\hbox(6.94444+1.11111)x345.0, glue set 265.22253fil, direction TLT
+...\glue(\topskip) 3.06
+...\hbox(6.94+1.11111)x345.0, glue set 265.22fil, direction TLT
....\localpar
.....\localinterlinepenalty=0
.....\localbrokenpenalty=0
@@@ -129,7 -142,42 +136,42 @@@
...\penalty 0
...\penalty -51
...\glue 10.0 plus 3.0 minus 5.0
- ...\glue -1.11111
+ ...\glue -11.11111 plus -3.0 minus -5.0
+ ...\penalty -51
+ ...\glue 1.11111
+ ...\glue 10.0 plus 3.0 minus 5.0
+ ...\glue 0.0 plus 1.0
+ ...\glue(\parskip) 0.0
-...\glue(\baselineskip) 6.58334
-...\hbox(4.30554+0.0)x345.0, glue set 313.50027fil, direction TLT
++...\glue(\baselineskip) 6.57889
++...\hbox(4.31+0.0)x345.0, glue set 313.5fil, direction TLT
+ ....\localpar
+ .....\localinterlinepenalty=0
+ .....\localbrokenpenalty=0
+ .....\localleftbox=null
+ .....\localrightbox=null
+ ....\hbox(0.0+0.0)x0.0, direction TLT
+ .....\glue 0.0
+ .....\glue 0.0
+ .....\glue -5.0
+ .....\hbox(0.0+0.0)x0.0, direction TLT
+ .....\glue 5.0
+ ....\penalty 10000
-....\glue(\spaceskip) 5.24995
++....\glue(\spaceskip) 5.25
+ ....\penalty 10000
-....\glue(\spaceskip) 5.24995
-....\OT1/cmtt/m/n/10 x
++....\glue(\spaceskip) 5.25
++....\TU/lmtt/m/n/10 x
+ ....\penalty 10000
-....\glue(\spaceskip) 5.24995
++....\glue(\spaceskip) 5.25
+ ....\penalty 10000
-....\glue(\spaceskip) 5.24995
-....\OT1/cmtt/m/n/10 x
++....\glue(\spaceskip) 5.25
++....\TU/lmtt/m/n/10 x
+ ....\hbox(0.0+0.0)x0.0, direction TLT
+ ....\penalty 10000
+ ....\glue(\parfillskip) 0.0 plus 1.0fil
+ ....\glue(\rightskip) 0.0
+ ...\penalty 0
+ ...\penalty -51
+ ...\glue 10.0 plus 3.0 minus 5.0
...\glue 0.0 plus 1.0fil
...\glue 0.0
...\glue 0.0 plus 0.0001fil
diff --cc required/tools/testfiles-TU/github-0212.tlg
index a1ab263f,0fa4b523..08832cd4
--- a/required/tools/testfiles-TU/github-0212.tlg
+++ b/required/tools/testfiles-TU/github-0212.tlg
@@@ -1,5 -1,12 +1,12 @@@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
+ > \encodingdefault=\long macro:
-->OT1.
++->TU.
+ l. ...\show\encodingdefault
+ > \f at encoding=macro:
-->OT1.
++->TU.
+ <recently read> \f at encoding
+ l. ...\expandafter\show\csname f at encoding\endcsname
> \verbvisiblespace=macro:
->\protect \verbvisiblespace .
l. ...\show\verbvisiblespace
@@@ -16,10 -23,10 +23,10 @@@ Completed box being shipped out [1
...\hbox(0.0+0.0)x345.0
..\glue 25.0
..\glue(\lineskip) 0.0
- ..\vbox(550.0+0.0)x345.0, glue set 495.94702fil
+ ..\vbox(550.0+0.0)x345.0, glue set 473.94937fil
...\write-{}
-...\glue(\topskip) 3.05556
-...\hbox(6.94444+1.11111)x345.0, glue set 265.22255fil
+...\glue(\topskip) 3.06
+...\hbox(6.94+1.11111)x345.0, glue set 265.22fil
....\hbox(0.0+0.0)x15.0
....\hbox(0.0+0.0)x0.0
....\setlanguage1 (hyphenmin 2,3)
@@@ -104,7 -129,37 +111,37 @@@
...\penalty 0
...\penalty -51
...\glue 10.0 plus 3.0 minus 5.0
- ...\glue -1.11111
+ ...\glue -11.11111 plus -3.0 minus -5.0
+ ...\penalty -51
+ ...\glue 1.11111
+ ...\glue 10.0 plus 3.0 minus 5.0
+ ...\glue 0.0 plus 1.0
+ ...\glue(\parskip) 0.0
-...\glue(\baselineskip) 6.58334
-...\hbox(4.30554+0.0)x345.0, glue set 313.50027fil
++...\glue(\baselineskip) 6.57889
++...\hbox(4.31+0.0)x345.0, glue set 313.5fil
+ ....\hbox(0.0+0.0)x0.0
+ .....\glue 0.0
+ .....\glue 0.0
+ .....\glue -5.0
+ .....\hbox(0.0+0.0)x0.0
+ .....\glue 5.0
+ ....\penalty 10000
-....\glue 5.24995
++....\glue 5.25
+ ....\penalty 10000
-....\glue 5.24995
-....\OT1/cmtt/m/n/10 x
++....\glue 5.25
++....\TU/lmtt/m/n/10 x
+ ....\penalty 10000
-....\glue 5.24995
++....\glue 5.25
+ ....\penalty 10000
-....\glue 5.24995
-....\OT1/cmtt/m/n/10 x
++....\glue 5.25
++....\TU/lmtt/m/n/10 x
+ ....\hbox(0.0+0.0)x0.0
+ ....\penalty 10000
+ ....\glue(\parfillskip) 0.0 plus 1.0fil
+ ....\glue(\rightskip) 0.0
+ ...\penalty 0
+ ...\penalty -51
+ ...\glue 10.0 plus 3.0 minus 5.0
...\glue 0.0 plus 1.0fil
...\glue 0.0
...\glue 0.0 plus 0.0001fil
More information about the latex3-commits
mailing list