further adjustment to docstrip guards for encoding defaults

latex3 · Sep 25, 2018 · 9d15b5b · 9d15b5b
1 parent 202c157
commit 9d15b5b
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 55 deletions.
diff --git a/base/fontdef.dtx b/base/fontdef.dtx
@@ -398,7 +398,8 @@
 \newcommand\ttdefault{cmtt}
 \else
 \newcommand\encodingdefault{TU}
-\newcommand\rmdefault{lmr}\fontfamily{\rmdefault}
+\newcommand\rmdefault{lmr}
+\fontfamily{\rmdefault}
 \newcommand\sfdefault{lmss}
 \newcommand\ttdefault{lmtt}
 \fi
@@ -407,20 +408,27 @@
 %<latexrelease>                 {\encodingdefault}{TU encoding default}%
 %<latexrelease>\ifx\Umathchar\@undefined
 %<latexrelease>\renewcommand\encodingdefault{OT1}
+%<latexrelease>\fontencoding{\encodingdefault}
 %<latexrelease>\renewcommand\rmdefault{cmr}
+%<latexrelease>\fontfamily{\rmdefault}
 %<latexrelease>\renewcommand\sfdefault{cmss}
 %<latexrelease>\renewcommand\ttdefault{cmtt}
 %<latexrelease>\else
 %<latexrelease>\renewcommand\encodingdefault{TU}
-%<latexrelease>\renewcommand\rmdefault{lmr}\fontfamily{\rmdefault}
+%<latexrelease>%done in everyjob\fontencoding{\encodingdefault}
+%<latexrelease>\renewcommand\rmdefault{lmr}
+%<latexrelease>\fontfamily{\rmdefault}
 %<latexrelease>\renewcommand\sfdefault{lmss}
 %<latexrelease>\renewcommand\ttdefault{lmtt}
 %<latexrelease>\fi
 %<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{0000/00/00}%
 %<latexrelease>                 {\encodingdefault}{TU encoding default}%
+%<latexrelease>\fontencoding{OT1}
 %<latexrelease>\renewcommand\encodingdefault{OT1}
+%<latexrelease>\fontencoding{\encodingdefault}
 %<latexrelease>\renewcommand\rmdefault{cmr}
+%<latexrelease>\fontfamily{\rmdefault}
 %<latexrelease>\renewcommand\sfdefault{cmss}
 %<latexrelease>\renewcommand\ttdefault{cmtt}
 %<latexrelease>\EndIncludeInRelease

diff --git a/base/testfiles-TU/tu-composites01.luatex.tlg b/base/testfiles-TU/tu-composites01.luatex.tlg
@@ -18,7 +18,7 @@ TESTING \k
 TESTING \^
 TESTING \~
 TESTING \textcommabelow
-(load luc: ../lmroman5-regular.luc) [1
+[1
 Missing character: There is no ̧ (U+0327) in font [lmroman10-regular]:+tlig;!
 Missing character: There is no ̧ (U+0327) in font [lmroman10-regular]:+tlig;!
 Missing character: There is no ̧ (U+0327) in font [lmroman10-regular]:+tlig;!

diff --git a/base/testfiles-TU/tu-tl2e7.luatex.tlg b/base/testfiles-TU/tu-tl2e7.luatex.tlg
@@ -2,7 +2,6 @@ This is a generated file for the LaTeX2e validation system.
 Don't change this file in any respect.
 Format: LaTeX2e<2017/01/01>
 Main Class: article
-(load luc: ../lmroman12-regular.luc)(load luc: ../lmroman12-bold.luc)
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0, direction TLT
 .\glue 16.0
@@ -26,7 +25,7 @@ Completed box being shipped out [1]
 .....\TU/lmr/bx/n/14.4 1
 .....\glue 14.4
 ....\TU/lmr/bx/n/14.4 T
-....\kern-1.35359
+....\kern-1.35359 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 s
 ....\TU/lmr/bx/n/14.4 t
@@ -37,9 +36,9 @@ Completed box being shipped out [1]
 ....\TU/lmr/bx/n/14.4 g
 ....\TU/lmr/bx/n/14.4 r
 ....\TU/lmr/bx/n/14.4 a
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 v
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\glue(\spaceskip) 5.4 plus 2.7 minus 1.8
 ....\TU/lmr/bx/n/14.4 a
@@ -49,7 +48,7 @@ Completed box being shipped out [1]
 ....\TU/lmr/bx/n/14.4 c
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 n
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 t
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -108,7 +107,7 @@ ne \ETC.}
 .....\TU/lmr/bx/n/14.4 2
 .....\glue 14.4
 ....\TU/lmr/bx/n/14.4 T
-....\kern-1.35359
+....\kern-1.35359 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 s
 ....\TU/lmr/bx/n/14.4 t
@@ -129,7 +128,7 @@ ne \ETC.}
 ....\TU/lmr/bx/n/14.4 c
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 n
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 t
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -216,7 +215,7 @@ ne \ETC.}
 .....\TU/lmr/bx/n/14.4 3
 .....\glue 14.4
 ....\TU/lmr/bx/n/14.4 T
-....\kern-1.35359
+....\kern-1.35359 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 s
 ....\TU/lmr/bx/n/14.4 t
@@ -225,11 +224,11 @@ ne \ETC.}
 ....\TU/lmr/bx/n/14.4 f
 ....\glue(\spaceskip) 5.4 plus 2.7 minus 1.8
 ....\TU/lmr/bx/n/14.4 c
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 h
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 c
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 k
 ....\glue(\spaceskip) 5.4 plus 2.7 minus 1.8
 ....\TU/lmr/bx/n/14.4 a
@@ -239,7 +238,7 @@ ne \ETC.}
 ....\TU/lmr/bx/n/14.4 c
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 n
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 t
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -304,7 +303,7 @@ ne \ETC.}
 .....\TU/lmr/bx/n/14.4 4
 .....\glue 14.4
 ....\TU/lmr/bx/n/14.4 T
-....\kern-1.35359
+....\kern-1.35359 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 s
 ....\TU/lmr/bx/n/14.4 t
@@ -316,7 +315,7 @@ ne \ETC.}
 ....\TU/lmr/bx/n/14.4 r
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 v
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\glue(\spaceskip) 5.4 plus 2.7 minus 1.8
 ....\TU/lmr/bx/n/14.4 a
@@ -326,7 +325,7 @@ ne \ETC.}
 ....\TU/lmr/bx/n/14.4 c
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 n
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 t
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -371,7 +370,7 @@ ne \ETC.}
 .....\TU/lmr/bx/n/14.4 5
 .....\glue 14.4
 ....\TU/lmr/bx/n/14.4 T
-....\kern-1.35359
+....\kern-1.35359 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 s
 ....\TU/lmr/bx/n/14.4 t
@@ -393,7 +392,7 @@ ne \ETC.}
 ....\TU/lmr/bx/n/14.4 c
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 n
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 t
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -430,7 +429,7 @@ ne \ETC.}
 .....\TU/lmr/bx/n/14.4 6
 .....\glue 14.4
 ....\TU/lmr/bx/n/14.4 T
-....\kern-1.35359
+....\kern-1.35359 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 s
 ....\TU/lmr/bx/n/14.4 t
@@ -459,7 +458,7 @@ ne \ETC.}
 ....\TU/lmr/bx/n/14.4 c
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 n
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 t
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -518,7 +517,7 @@ ne \ETC.}
 .....\TU/lmr/bx/n/14.4 7
 .....\glue 14.4
 ....\TU/lmr/bx/n/14.4 T
-....\kern-1.35359
+....\kern-1.35359 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 s
 ....\TU/lmr/bx/n/14.4 t
@@ -537,7 +536,7 @@ ne \ETC.}
 ....\TU/lmr/bx/n/14.4 c
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 n
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 t
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -586,7 +585,7 @@ ne \ETC.}
 .....\TU/lmr/bx/n/14.4 8
 .....\glue 14.4
 ....\TU/lmr/bx/n/14.4 T
-....\kern-1.35359
+....\kern-1.35359 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 s
 ....\TU/lmr/bx/n/14.4 t
@@ -615,7 +614,7 @@ ne \ETC.}
 ....\TU/lmr/bx/n/14.4 c
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 n
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 t
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -660,7 +659,7 @@ ne \ETC.}
 .....\TU/lmr/bx/n/14.4 9
 .....\glue 14.4
 ....\TU/lmr/bx/n/14.4 T
-....\kern-1.35359
+....\kern-1.35359 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 s
 ....\TU/lmr/bx/n/14.4 t
@@ -681,7 +680,7 @@ ne \ETC.}
 ....\TU/lmr/bx/n/14.4 c
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 n
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 t
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -731,7 +730,7 @@ ne \ETC.}
 .....\TU/lmr/bx/n/14.4 0
 .....\glue 14.4
 ....\TU/lmr/bx/n/14.4 T
-....\kern-1.35359
+....\kern-1.35359 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 s
 ....\TU/lmr/bx/n/14.4 t
@@ -755,7 +754,7 @@ ne \ETC.}
 ....\TU/lmr/bx/n/14.4 c
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 n
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 t
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -842,7 +841,7 @@ Completed box being shipped out [2]
 .....\TU/lmr/bx/n/14.4 1
 .....\glue 14.4
 ....\TU/lmr/bx/n/14.4 T
-....\kern-1.35359
+....\kern-1.35359 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 s
 ....\TU/lmr/bx/n/14.4 t
@@ -870,7 +869,7 @@ Completed box being shipped out [2]
 ....\TU/lmr/bx/n/14.4 c
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 n
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 t
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -908,7 +907,7 @@ ne \ETC.}
 .....\TU/lmr/bx/n/14.4 2
 .....\glue 14.4
 ....\TU/lmr/bx/n/14.4 T
-....\kern-1.35359
+....\kern-1.35359 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 s
 ....\TU/lmr/bx/n/14.4 t
@@ -931,7 +930,7 @@ ne \ETC.}
 ....\TU/lmr/bx/n/14.4 c
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 n
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 t
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -981,7 +980,7 @@ ne \ETC.}
 .....\TU/lmr/bx/n/14.4 3
 .....\glue 14.4
 ....\TU/lmr/bx/n/14.4 T
-....\kern-1.35359
+....\kern-1.35359 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 s
 ....\TU/lmr/bx/n/14.4 t
@@ -1008,7 +1007,7 @@ ne \ETC.}
 ....\TU/lmr/bx/n/14.4 c
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 n
-....\kern-0.4464
+....\kern-0.4464 (font)
 ....\TU/lmr/bx/n/14.4 t
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
@@ -1048,7 +1047,7 @@ ne \ETC.}
 .....\TU/lmr/bx/n/14.4 4
 .....\glue 14.4
 ....\TU/lmr/bx/n/14.4 T
-....\kern-1.35359
+....\kern-1.35359 (font)
 ....\TU/lmr/bx/n/14.4 e
 ....\TU/lmr/bx/n/14.4 s
 ....\TU/lmr/bx/n/14.4 t

diff --git a/base/testfiles/tlb-utf8-dec-cp1252-2017.lvt b/base/testfiles/tlb-utf8-dec-cp1252-2017.lvt
@@ -1,6 +1,6 @@
 \input{test2e}
-\RequirePackage[2017-12-31]{latexrelease}
-% declared cp1252, 2017 release
+\RequirePackage[2016-12-31]{latexrelease}
+% declared cp1252, pre 2017 release
 \documentclass{article}
 \usepackage[T1]{fontenc}
 

diff --git a/base/testfiles/tlb-utf8-dec-cp1252-2017.xetex.tlg b/base/testfiles/tlb-utf8-dec-cp1252-2017.xetex.tlg
@@ -13,7 +13,7 @@ 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 527.9436fil
+..\vbox(550.0+0.0)x345.0, glue set 526.24281fil
 ...\write-{}
 ...\glue(\topskip) 1.08551
 ...\hbox(8.91449+0.0)x345.0, glue set 292.78687fil
@@ -43,7 +43,6 @@ Completed box being shipped out [1]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
-...\glue -1.70097
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0
 ...\glue 0.0 plus 0.0001fil

diff --git a/base/testfiles/tlb-utf8-dec-utf8-2017.lvt b/base/testfiles/tlb-utf8-dec-utf8-2017.lvt
@@ -1,6 +1,6 @@
 \input{test2e}
-\RequirePackage[2017-12-31]{latexrelease}
-% declared UTF-8, 2017 release
+\RequirePackage[2016-12-31]{latexrelease}
+% declared UTF-8, pre 2017 release
 \documentclass{article}
 \usepackage[T1]{fontenc}
 

diff --git a/base/testfiles/tlb-utf8-undec-cp1252-2017.luatex.tlg b/base/testfiles/tlb-utf8-undec-cp1252-2017.luatex.tlg
@@ -2,12 +2,12 @@ This is a generated file for the LaTeX2e validation system.
 Don't change this file in any respect.
 ! String contains an invalid utf-8 sequence.
 l. ...a
-    �  x �o
+    �  x �^^@
 A funny symbol that I can't read has just been (re)read.
 Just continue, I'll change it to 0xFFFD.
 ! String contains an invalid utf-8 sequence.
 l. ...a�  x
-         �o
+         �^^@
 A funny symbol that I can't read has just been (re)read.
 Just continue, I'll change it to 0xFFFD.
 Completed box being shipped out [1]

diff --git a/base/testfiles/tlb-utf8-undec-cp1252-2017.lvt b/base/testfiles/tlb-utf8-undec-cp1252-2017.lvt
@@ -1,6 +1,6 @@
 \input{test2e}
-\RequirePackage[2017-12-31]{latexrelease}
-% undeclared cp1252, 2017 release
+\RequirePackage[2016-12-31]{latexrelease}
+% undeclared cp1252, pre 2017 release
 \documentclass{article}
 \usepackage[T1]{fontenc}