More test adjustments

latex3 · Jul 14, 2023 · 60bf34b · 60bf34b
1 parent ac32435
commit 60bf34b
Show file tree

Hide file tree

Showing 8 changed files with 1,375 additions and 1,366 deletions.
diff --git a/testfiles-harf/arabic.tlg b/testfiles-harf/arabic.tlg
diff --git a/testfiles-harf/color.tlg b/testfiles-harf/color.tlg
@@ -2,22 +2,22 @@ This is a generated file for the l3build validation system.
 Don't change this file in any respect.
 Package fontspec Info: Font family 'Amiri(1)' created for font 'Amiri' with
 (fontspec)             options
-(fontspec)             [Ligatures=TeX,Extension=.ttf,UprightFont=*-Regular,ItalicFont=*-Slanted,BoldFont=*-Bold,BoldItalicFont=*-BoldSlanted,Renderer=Harfbuzz,Script=Arabic,Color=FF000080].
+(fontspec)             [Ligatures=TeX,Renderer=Harfbuzz,Script=Arabic,Color=FF000080].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[Amiri-Regular.ttf]:mode=harf;script=arab;language=dflt;+tlig;color=FF000080;"
+(fontspec)             <->"Amiri:mode=harf;script=arab;language=dflt;+tlig;color=FF000080;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 (fontspec)             - 'bold' (b/n) with NFSS spec.:
-(fontspec)             <->"[Amiri-Bold.ttf]:mode=harf;script=arab;language=dflt;+tlig;color=FF000080;"
+(fontspec)             <->"Amiri/B:mode=harf;script=arab;language=dflt;+tlig;color=FF000080;"
 (fontspec)             - 'bold small caps'  (b/sc) with NFSS spec.: 
 (fontspec)             - 'italic' (m/it) with NFSS spec.:
-(fontspec)             <->"[Amiri-Slanted.ttf]:mode=harf;script=arab;language=dflt;+tlig;color=FF000080;"
+(fontspec)             <->"Amiri/I:mode=harf;script=arab;language=dflt;+tlig;color=FF000080;"
 (fontspec)             - 'italic small caps'  (m/scit) with NFSS spec.: 
 (fontspec)             - 'bold italic' (b/it) with NFSS spec.:
-(fontspec)             <->"[Amiri-BoldSlanted.ttf]:mode=harf;script=arab;language=dflt;+tlig;color=FF000080;"
+(fontspec)             <->"Amiri/BI:mode=harf;script=arab;language=dflt;+tlig;color=FF000080;"
 (fontspec)             - 'bold italic small caps'  (b/scit) with NFSS spec.: 
 Inserting `luaotfload.color_handler' in `post_linebreak_filter'.
 Inserting `luaotfload.color_handler' in `hpack_filter'.
@@ -42,34 +42,34 @@ Completed box being shipped out [1]
 .....\localleftbox=null
 .....\localrightbox=null
 ....\hbox(0.0+0.0)x15.0, direction TLT
-....\TU/Amiri(0)/m/n/10 "ق" 120C69 +0:+0
-....\TU/Amiri(0)/m/n/10 "ل" 120C63 +0:+0
-....\TU/Amiri(0)/m/n/10 "ب" 120C03 +0:+0
-....\TU/Amiri(0)/m/n/10 "ي" 120EB0 +0:+0
+....\TU/Amiri(0)/m/n/10 "ق" 120A6F +0:+0
+....\TU/Amiri(0)/m/n/10 "ل" 120A69 +0:+0
+....\TU/Amiri(0)/m/n/10 "ب" 120A0A +0:+0
+....\TU/Amiri(0)/m/n/10 "ي" 120CB1 +0:+0
 ....\glue(\spaceskip) 2.92 plus 1.46 minus 0.97333
 ....\pdfcolorstack 0 push {1 0 0 rg}
 ....\pdfcolorstack 1 push {/TransGs0.502 gs}
-....\TU/Amiri(1)/m/n/10 "ت" 120813 +0:+0
-....\TU/Amiri(1)/m/n/10 "ل" 12091F +0:+0
-....\TU/Amiri(1)/m/n/10 "و" 120996 +0:+0
-....\TU/Amiri(1)/m/n/10 "ن" 120839 +0:+0
+....\TU/Amiri(1)/m/n/10 "ت" 120628 +0:+0
+....\TU/Amiri(1)/m/n/10 "ل" 120733 +0:+0
+....\TU/Amiri(1)/m/n/10 "و" 1207A8 +0:+0
+....\TU/Amiri(1)/m/n/10 "ن" 12064E +0:+0
 ....\glue(\spaceskip) 2.92 plus 1.46 minus 0.97333
-....\TU/Amiri(1)/m/n/10 "ك" 121531 +0:+0
-....\TU/Amiri(1)/m/n/10 "ل" 12151D +0:+0
-....\TU/Amiri(1)/m/n/10 "ه" 1208DD +0:+0
+....\TU/Amiri(1)/m/n/10 "ك" 121325 +0:+0
+....\TU/Amiri(1)/m/n/10 "ل" 121311 +0:+0
+....\TU/Amiri(1)/m/n/10 "ه" 1206F1 +0:+0
 ....\glue(\spaceskip) 2.92 plus 1.46 minus 0.97333
 ....\pdfcolorstack 0 pop
 ....\pdfcolorstack 1 pop
-....\TU/Amiri(0)/m/n/10 "ب" 120820 +0:+0
-....\TU/Amiri(0)/m/n/10 "ل" 12091F +0:+0
-....\TU/Amiri(0)/m/n/10 "و" 120996 +0:+0
-....\TU/Amiri(0)/m/n/10 "ن" 120839 +0:+0
+....\TU/Amiri(0)/m/n/10 "ب" 120635 +0:+0
+....\TU/Amiri(0)/m/n/10 "ل" 120733 +0:+0
+....\TU/Amiri(0)/m/n/10 "و" 1207A8 +0:+0
+....\TU/Amiri(0)/m/n/10 "ن" 12064E +0:+0
 ....\glue(\spaceskip) 2.92 plus 1.46 minus 0.97333
-....\TU/Amiri(0)/m/n/10 "ا" 120E04 +0:+0
-....\TU/Amiri(0)/m/n/10 "ل" 120DFF +0:+0
-....\TU/Amiri(0)/m/n/10 "ح" 120FDE +0:+0
-....\TU/Amiri(0)/m/n/10 "ب" 1210B8 +0:+0
-....\TU/Amiri(0)/m/n/10 "." 120785 +0:+0
+....\TU/Amiri(0)/m/n/10 "ا" 120C08 +0:+0
+....\TU/Amiri(0)/m/n/10 "ل" 120C03 +0:+0
+....\TU/Amiri(0)/m/n/10 "ح" 120DDC +0:+0
+....\TU/Amiri(0)/m/n/10 "ب" 120EB3 +0:+0
+....\TU/Amiri(0)/m/n/10 "." 002E +0:+0
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0

diff --git a/testfiles-harf/discretionaries.tlg b/testfiles-harf/discretionaries.tlg
@@ -816,4 +816,4 @@ Completed box being shipped out [1]
 ....\glue 0.0 plus 1.0fil
 ....\TU/NotoSerifCJK-Regular.ttc(0)/m/n/10 "1" 12F357 +0:+0
 ....\glue 0.0 plus 1.0fil
-2 hlist, 1 rule, 1 dir, 3 kern, 1 glyph, 2 attribute, 49 glue_spec, 2 attribute_list (discretionaries.aux)
+2 hlist, 1 rule, 1 dir, 3 kern, 1 glyph, 2 attribute, 50 glue_spec, 2 attribute_list (discretionaries.aux)
diff --git a/testfiles-harf/pngemoji.tpf b/testfiles-harf/pngemoji.tpf
diff --git a/testfiles-harf/scripts.tlg b/testfiles-harf/scripts.tlg
@@ -108,25 +108,25 @@ Completed box being shipped out [1]
 ....\glue(\rightskip) 0.0
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\parskip) 0.0
-...\glue(\baselineskip) 2.62502
-...\hbox(7.17+3.86)x345.0, glue set 317.84fil, direction TLT
+...\glue(\baselineskip) 2.77501
+...\hbox(7.02+1.46)x345.0, glue set 321.9fil, direction TLT
 ....\localpar
 .....\localinterlinepenalty=0
 .....\localbrokenpenalty=0
 .....\localleftbox=null
 .....\localrightbox=null
 ....\hbox(0.0+0.0)x15.0, direction TLT
-....\TU/amiri-regular.ttf(1)/m/n/10 "(" 0028 +0:+0
+....\TU/amiri-regular.ttf(1)/m/n/10 "(" 1219DC +0:+0
 ....\kern0.0 (italic)
 ....\TU/amiri-regular.ttf(1)/m/n/10 "f" 0066 +0:+0
 ....\kern0.0 (italic)
-....\TU/amiri-regular.ttf(1)/m/n/10 ")" 0029 +0:+0
+....\TU/amiri-regular.ttf(1)/m/n/10 ")" 1219DD +0:+0
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\parskip) 0.0
-...\glue(\baselineskip) 2.3
+...\glue(\baselineskip) 4.7
 ...\hbox(5.84+1.15)x345.0, glue set 271.49994fil, direction TLT
 ....\localpar
 .....\localinterlinepenalty=0
@@ -184,10 +184,10 @@ Completed box being shipped out [1]
 ....\TU/amiri-regular.ttf(3)/m/n/10 "۱" 06F1 +0:+0
 ....\TU/amiri-regular.ttf(3)/m/n/10 "۲" 06F2 +0:+0
 ....\TU/amiri-regular.ttf(3)/m/n/10 "۳" 06F3 +0:+0
-....\TU/amiri-regular.ttf(3)/m/n/10 "۴" 1207A1 +0:+0
+....\TU/amiri-regular.ttf(3)/m/n/10 "۴" 1205B7 +0:+0
 ....\TU/amiri-regular.ttf(3)/m/n/10 "۵" 06F5 +0:+0
-....\TU/amiri-regular.ttf(3)/m/n/10 "۶" 1207A2 +0:+0
-....\TU/amiri-regular.ttf(3)/m/n/10 "۷" 1207A3 +0:+0
+....\TU/amiri-regular.ttf(3)/m/n/10 "۶" 1205B8 +0:+0
+....\TU/amiri-regular.ttf(3)/m/n/10 "۷" 1205B9 +0:+0
 ....\TU/amiri-regular.ttf(3)/m/n/10 "۸" 06F8 +0:+0
 ....\TU/amiri-regular.ttf(3)/m/n/10 "۹" 06F9 +0:+0
 ....\penalty 10000
@@ -209,8 +209,8 @@ Completed box being shipped out [1]
 ....\TU/amiri-regular.ttf(4)/m/n/10 "۳" 06F3 +0:+0
 ....\TU/amiri-regular.ttf(4)/m/n/10 "۴" 06F4 +0:+0
 ....\TU/amiri-regular.ttf(4)/m/n/10 "۵" 06F5 +0:+0
-....\TU/amiri-regular.ttf(4)/m/n/10 "۶" 1207A2 +0:+0
-....\TU/amiri-regular.ttf(4)/m/n/10 "۷" 1207A3 +0:+0
+....\TU/amiri-regular.ttf(4)/m/n/10 "۶" 1205B8 +0:+0
+....\TU/amiri-regular.ttf(4)/m/n/10 "۷" 1205B9 +0:+0
 ....\TU/amiri-regular.ttf(4)/m/n/10 "۸" 06F8 +0:+0
 ....\TU/amiri-regular.ttf(4)/m/n/10 "۹" 06F9 +0:+0
 ....\penalty 10000
@@ -230,10 +230,10 @@ Completed box being shipped out [1]
 ....\TU/amiri-regular.ttf(5)/m/n/10 "۱" 06F1 +0:+0
 ....\TU/amiri-regular.ttf(5)/m/n/10 "۲" 06F2 +0:+0
 ....\TU/amiri-regular.ttf(5)/m/n/10 "۳" 06F3 +0:+0
-....\TU/amiri-regular.ttf(5)/m/n/10 "۴" 1207A1 +0:+0
+....\TU/amiri-regular.ttf(5)/m/n/10 "۴" 1205B7 +0:+0
 ....\TU/amiri-regular.ttf(5)/m/n/10 "۵" 06F5 +0:+0
-....\TU/amiri-regular.ttf(5)/m/n/10 "۶" 1207A2 +0:+0
-....\TU/amiri-regular.ttf(5)/m/n/10 "۷" 1207A3 +0:+0
+....\TU/amiri-regular.ttf(5)/m/n/10 "۶" 1205B8 +0:+0
+....\TU/amiri-regular.ttf(5)/m/n/10 "۷" 1205B9 +0:+0
 ....\TU/amiri-regular.ttf(5)/m/n/10 "۸" 06F8 +0:+0
 ....\TU/amiri-regular.ttf(5)/m/n/10 "۹" 06F9 +0:+0
 ....\penalty 10000

diff --git a/testfiles-latex-TU/tu-composites01.tlg b/testfiles-latex-TU/tu-composites01.tlg
@@ -382,3 +382,7 @@ Missing character: There is no ̨ (U+0328) in font [lmroman10-regular]:+tlig;!
 Missing character: There is no ̨ (U+0328) in font [lmroman10-regular]:+tlig;!
 Missing character: There is no ̨ (U+0328) in font [lmroman10-regular]:+tlig;!
 ] (tu-composites01.aux)
+ ***********
+LaTeX2e <2023-06-01> patch level 1
+L3 programming layer <2023-06-30>
+ ***********
diff --git a/testfiles-latex-TU/tu-composites02.tlg b/testfiles-latex-TU/tu-composites02.tlg
@@ -199,3 +199,7 @@ l. ...\test{y}
 ! OK.
 l. ...\test{z}
 (tu-composites02.aux)
+ ***********
+LaTeX2e <2023-06-01> patch level 1
+L3 programming layer <2023-06-30>
+ ***********
diff --git a/testfiles-latex-TU/tu-tl2e7.tlg b/testfiles-latex-TU/tu-tl2e7.tlg
@@ -1386,3 +1386,7 @@ Completed box being shipped out [2]
 ....\glue 0.0 plus 1.0fil
 Missing character: There is no ̧ (U+0327) in font [lmroman10-regular]:+tlig;!
 (tu-tl2e7.aux)
+ ***********
+LaTeX2e <2023-06-01> patch level 1
+L3 programming layer <2023-06-30>
+ ***********