Adapt testfiles for fontspec changes

latex3 · May 1, 2024 · 2a57441 · 2a57441
1 parent 21a1e01
commit 2a57441
Show file tree

Hide file tree

Showing 15 changed files with 1,206 additions and 1,289 deletions.
diff --git a/testfiles-harf/arabic-gr.tlg b/testfiles-harf/arabic-gr.tlg
diff --git a/testfiles-harf/arabic.tlg b/testfiles-harf/arabic.tlg
@@ -1176,12 +1176,18 @@ Completed box being shipped out [1]
 ....\glue 0.0 plus 1.0fil
 ....\TU/Amiri(0)/m/n/10 "1" 0031 +0:+0
 ....\glue 0.0 plus 1.0fil
-Package fontspec Info: Amiri scale = 1.6.
-Package fontspec Info: Amiri scale = 1.6.
-Package fontspec Info: Amiri/B scale = 1.6.
-Package fontspec Info: Amiri/I scale = 1.6.
-Package fontspec Info: Amiri/BI scale = 1.6.
-Package fontspec Info: Font family 'Amiri(1)' created for font 'Amiri' with options [Renderer=Harfbuzz,Script=Arabic,Scale=1.6].
+Package fontspec Info: 
+(fontspec)             Amiri scale = 1.6.
+Package fontspec Info: 
+(fontspec)             Amiri scale = 1.6.
+Package fontspec Info: 
+(fontspec)             Amiri/B scale = 1.6.
+Package fontspec Info: 
+(fontspec)             Amiri/I scale = 1.6.
+Package fontspec Info: 
+(fontspec)             Amiri/BI scale = 1.6.
+Package fontspec Info: 
+(fontspec)             Font family 'Amiri(1)' created for font 'Amiri' with options [Renderer=Harfbuzz,Script=Arabic,Scale=1.6].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
@@ -2268,9 +2274,12 @@ Completed box being shipped out [2]
 ....\glue 0.0 plus 1.0fil
 ....\TU/Amiri(0)/m/n/10 "2" 0032 +0:+0
 ....\glue 0.0 plus 1.0fil
-Package fontspec Info: ArefRuqaa-Regular scale = 1.2.
-Package fontspec Info: ArefRuqaa-Regular scale = 1.2.
-Package fontspec Info: Font family 'ArefRuqaa-Regular.ttf(0)' created for font 'ArefRuqaa-Regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic,Scale=1.2].
+Package fontspec Info: 
+(fontspec)             ArefRuqaa-Regular scale = 1.2.
+Package fontspec Info: 
+(fontspec)             ArefRuqaa-Regular scale = 1.2.
+Package fontspec Info: 
+(fontspec)             Font family 'ArefRuqaa-Regular.ttf(0)' created for font 'ArefRuqaa-Regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic,Scale=1.2].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
@@ -4522,7 +4531,8 @@ Completed box being shipped out [3]
 ....\glue 0.0 plus 1.0fil
 ....\TU/Amiri(0)/m/n/10 "3" 0033 +0:+0
 ....\glue 0.0 plus 1.0fil
-Package fontspec Info: Font family 'NotoNastaliqUrdu-Regular.ttf(0)' created for font 'NotoNastaliqUrdu-Regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic].
+Package fontspec Info: 
+(fontspec)             Font family 'NotoNastaliqUrdu-Regular.ttf(0)' created for font 'NotoNastaliqUrdu-Regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              

diff --git a/testfiles-harf/color.tlg b/testfiles-harf/color.tlg
@@ -1,6 +1,7 @@
 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 options [Ligatures=TeX,Renderer=Harfbuzz,Script=Arabic,Color=FF000080].
+Package fontspec Info: 
+(fontspec)             Font family 'Amiri(1)' created for font 'Amiri' with options [Ligatures=TeX,Renderer=Harfbuzz,Script=Arabic,Color=FF000080].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              

diff --git a/testfiles-harf/discretionaries.tlg b/testfiles-harf/discretionaries.tlg
@@ -1,6 +1,7 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-Package fontspec Info: Font family 'NotoSerifCJK-Regular.ttc(1)' created for font 'NotoSerifCJK-Regular.ttc' with options [Ligatures=TeX,Renderer=Harfbuzz,Script=Latin,KpseOnly,Ligatures=TeXOff].
+Package fontspec Info: 
+(fontspec)             Font family 'NotoSerifCJK-Regular.ttc(1)' created for font 'NotoSerifCJK-Regular.ttc' with options [Ligatures=TeX,Renderer=Harfbuzz,Script=Latin,KpseOnly,Ligatures=TeXOff].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
@@ -12,13 +13,15 @@ Package fontspec Info: Font family 'NotoSerifCJK-Regular.ttc(1)' created for fon
 (fontspec)             - 'italic small caps'  (m/scit) with NFSS spec.: 
 (fontspec)             - 'bold italic' (b/it) with NFSS spec.: <->"kpse:NotoSerifCJK-Regular.ttc:mode=harf;script=latn;language=dflt;-tlig;"
 (fontspec)             - 'bold italic small caps'  (b/scit) with NFSS spec.: 
-Package fontspec Info: Font family 'lmroman10-regular.otf(0)' created for font 'lmroman10-regular.otf' with options [Renderer=Harfbuzz,Script=Latin,Ligatures=Discretionary,Ligatures=TeX,KpseOnly].
+Package fontspec Info: 
+(fontspec)             Font family 'lmroman10-regular.otf(0)' created for font 'lmroman10-regular.otf' with options [Renderer=Harfbuzz,Script=Latin,Ligatures=Discretionary,Ligatures=TeX,KpseOnly].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"kpse:lmroman10-regular.otf:mode=harf;script=latn;language=dflt;+dlig;+tlig;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
-Package fontspec Info: Font family 'lmroman10-regular.otf(1)' created for font 'lmroman10-regular.otf' with options [Renderer=Harfbuzz,Script=Latin,Ligatures=Discretionary,Ligatures=TeX,KpseOnly,Ligatures=TeXOff].
+Package fontspec Info: 
+(fontspec)             Font family 'lmroman10-regular.otf(1)' created for font 'lmroman10-regular.otf' with options [Renderer=Harfbuzz,Script=Latin,Ligatures=Discretionary,Ligatures=TeX,KpseOnly,Ligatures=TeXOff].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              

diff --git a/testfiles-harf/scripts.tlg b/testfiles-harf/scripts.tlg
@@ -1,33 +1,39 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-Package fontspec Warning: Font "amiri-regular" does not contain requested Script "Greek".
-Package fontspec Info: Font family 'amiri-regular.ttf(1)' created for font 'amiri-regular.ttf' with options [Ligatures=TeX,Renderer=Harfbuzz,Script=Latin,Script=Greek].
+Package fontspec Warning: 
+(fontspec)                Script 'Greek' not explicitly supported within font 'amiri-regular'. Check the typeset output, and if it is okay then ignore this warning. Otherwise a different font should be chosen.
+Package fontspec Info: 
+(fontspec)             Font family 'amiri-regular.ttf(1)' created for font 'amiri-regular.ttf' with options [Ligatures=TeX,Renderer=Harfbuzz,Script=Latin,Script=Greek].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[amiri-regular.ttf]:mode=harf;script=latn;language=dflt;+tlig;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[amiri-regular.ttf]:mode=harf;script=grek;language=dflt;+tlig;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 LaTeX Font Warning: Font shape `TU/amiri-regular.ttf(0)/m/it' undefined
 (Font)              using `TU/amiri-regular.ttf(0)/m/n' instead on input line ....
-Package fontspec Info: Font family 'amiri-regular.ttf(2)' created for font 'amiri-regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic,Language=Arabic].
+Package fontspec Info: 
+(fontspec)             Font family 'amiri-regular.ttf(2)' created for font 'amiri-regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic,Language=Arabic].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[amiri-regular.ttf]:mode=harf;script=arab;language=ARA;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
-Package fontspec Info: Font family 'amiri-regular.ttf(3)' created for font 'amiri-regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic,Language=Urdu].
+Package fontspec Info: 
+(fontspec)             Font family 'amiri-regular.ttf(3)' created for font 'amiri-regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic,Language=Urdu].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[amiri-regular.ttf]:mode=harf;script=arab;language=URD;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
-Package fontspec Info: Font family 'amiri-regular.ttf(4)' created for font 'amiri-regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic,Language=Sindhi].
+Package fontspec Info: 
+(fontspec)             Font family 'amiri-regular.ttf(4)' created for font 'amiri-regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic,Language=Sindhi].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[amiri-regular.ttf]:mode=harf;script=arab;language=SND;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
-Package fontspec Info: Font family 'amiri-regular.ttf(5)' created for font 'amiri-regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic,Language=Kashmiri].
+Package fontspec Info: 
+(fontspec)             Font family 'amiri-regular.ttf(5)' created for font 'amiri-regular.ttf' with options [Renderer=Harfbuzz,Script=Arabic,Language=Kashmiri].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
@@ -53,14 +59,14 @@ Completed box being shipped out [1]
 .....\localleftbox=null
 .....\localrightbox=null
 ....\hbox(0.0+0.0)x15.0, direction TLT
-....\TU/amiri-regular.ttf(1)/m/n/10 "T" 0054 +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 "T" 0054 +0:+0
 ....\kern-1.66702
 ....\hbox(6.48+0.04)x5.73, shifted 2.165, direction TLT
-.....\TU/amiri-regular.ttf(1)/m/n/10 "E" 0045 +0:+0
+.....\TU/amiri-regular.ttf(0)/m/n/10 "E" 0045 +0:+0
 ....\kern-1.25
-....\TU/amiri-regular.ttf(1)/m/n/10 "X" 0058 +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 "X" 0058 +0:+0
 ....\glue(\spaceskip) 2.92 plus 1.46 minus 0.97333
-....\TU/amiri-regular.ttf(1)/m/n/10 "=" 003D +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 "=" 003D +0:+0
 ....\glue(\spaceskip) 2.92 plus 1.46 minus 0.97333
 ....\TU/amiri-regular.ttf(1)/m/n/10 "τ" 03C4 +0:+0
 ....\TU/amiri-regular.ttf(1)/m/n/10 "τ" 120000 +0:+0
@@ -73,15 +79,15 @@ Completed box being shipped out [1]
 ....\TU/amiri-regular.ttf(1)/m/n/10 "χ" 120000 +0:+0
 ....\pdfliteral page <lua data reference ...>
 ....\glue(\spaceskip) 2.92 plus 1.46 minus 0.97333
-....\TU/amiri-regular.ttf(1)/m/n/10 "i" 0069 +0:+0
-....\TU/amiri-regular.ttf(1)/m/n/10 "n" 006E +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 "i" 0069 +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 "n" 006E +0:+0
 ....\glue(\spaceskip) 2.92 plus 1.46 minus 0.97333
-....\TU/amiri-regular.ttf(1)/m/n/10 "G" 0047 +0:+0
-....\TU/amiri-regular.ttf(1)/m/n/10 "r" 0072 +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 "G" 0047 +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 "r" 0072 +0:+0
 ....\kern-0.04 (font)
-....\TU/amiri-regular.ttf(1)/m/n/10 "e" 0065 +0:+0
-....\TU/amiri-regular.ttf(1)/m/n/10 "e" 0065 +0:+0
-....\TU/amiri-regular.ttf(1)/m/n/10 "k" 006B +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 "e" 0065 +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 "e" 0065 +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 "k" 006B +0:+0
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -95,11 +101,11 @@ Completed box being shipped out [1]
 .....\localleftbox=null
 .....\localrightbox=null
 ....\hbox(0.0+0.0)x15.0, direction TLT
-....\TU/amiri-regular.ttf(1)/m/n/10 "(" 1219DC +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 "(" 1219DC +0:+0
 ....\kern0.0 (italic)
-....\TU/amiri-regular.ttf(1)/m/n/10 "f" 0066 +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 "f" 0066 +0:+0
 ....\kern0.0 (italic)
-....\TU/amiri-regular.ttf(1)/m/n/10 ")" 1219DD +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 ")" 1219DD +0:+0
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
@@ -226,11 +232,11 @@ Completed box being shipped out [1]
 ..\hbox(6.27+0.03)x345.0, direction TLT
 ...\hbox(6.27+0.03)x345.0, glue set 169.84fil, direction TLT
 ....\glue 0.0 plus 1.0fil
-....\TU/amiri-regular.ttf(1)/m/n/10 "1" 0031 +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 "1" 0031 +0:+0
 ....\glue 0.0 plus 1.0fil
-Missing character: There is no τ (U+03C4) in font [amiri-regular.ttf]:mode=harf;script=latn;language=dflt;+tlig;!
-Missing character: There is no ε (U+03B5) in font [amiri-regular.ttf]:mode=harf;script=latn;language=dflt;+tlig;!
-Missing character: There is no χ (U+03C7) in font [amiri-regular.ttf]:mode=harf;script=latn;language=dflt;+tlig;!
+Missing character: There is no τ (U+03C4) in font [amiri-regular.ttf]:mode=harf;script=grek;language=dflt;+tlig;!
+Missing character: There is no ε (U+03B5) in font [amiri-regular.ttf]:mode=harf;script=grek;language=dflt;+tlig;!
+Missing character: There is no χ (U+03C7) in font [amiri-regular.ttf]:mode=harf;script=grek;language=dflt;+tlig;!
 Completed box being shipped out [2]
 \vbox(633.0+0.0)x407.0, direction TLT
 .\glue 16.0
@@ -382,7 +388,7 @@ Completed box being shipped out [2]
 ..\hbox(6.27+0.0)x345.0, direction TLT
 ...\hbox(6.27+0.0)x345.0, glue set 169.84fil, direction TLT
 ....\glue 0.0 plus 1.0fil
-....\TU/amiri-regular.ttf(1)/m/n/10 "2" 0032 +0:+0
+....\TU/amiri-regular.ttf(0)/m/n/10 "2" 0032 +0:+0
 ....\glue 0.0 plus 1.0fil
 2 hlist, 1 rule, 1 dir, 3 kern, 1 glyph, 2 attribute, 48 glue_spec, 2 attribute_list (scripts.aux)
 LaTeX Font Warning: Some font shapes were not available, defaults substituted.
diff --git a/testfiles-harf/story.tlg b/testfiles-harf/story.tlg
@@ -1,20 +1,25 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-Package fontspec Info: Font family 'lmroman10-bold.otf(0)' created for font 'lmroman10-bold.otf' with options [Renderer=Harfbuzz,Script=Latin].
+Package fontspec Info: 
+(fontspec)             Font family 'lmroman10-bold.otf(0)' created for font 'lmroman10-bold.otf' with options [Renderer=Harfbuzz,Script=Latin].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[lmroman10-bold.otf]:mode=harf;script=latn;language=dflt;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
-Package fontspec Info: Font family 'lmromanslant10-regular.otf(0)' created for font 'lmromanslant10-regular.otf' with options [Renderer=Harfbuzz,Script=Latin].
+Package fontspec Info: 
+(fontspec)             Font family 'lmromanslant10-regular.otf(0)' created for font 'lmromanslant10-regular.otf' with options [Renderer=Harfbuzz,Script=Latin].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[lmromanslant10-regular.otf]:mode=harf;script=latn;language=dflt;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
-Package fontspec Info: lmroman12-regular scale = 1.2.
-Package fontspec Info: lmroman12-regular scale = 1.2.
-Package fontspec Info: Font family 'lmroman12-regular.otf(0)' created for font 'lmroman12-regular.otf' with options [Renderer=Harfbuzz,Script=Latin,Scale=1.2].
+Package fontspec Info: 
+(fontspec)             lmroman12-regular scale = 1.2.
+Package fontspec Info: 
+(fontspec)             lmroman12-regular scale = 1.2.
+Package fontspec Info: 
+(fontspec)             Font family 'lmroman12-regular.otf(0)' created for font 'lmroman12-regular.otf' with options [Renderer=Harfbuzz,Script=Latin,Scale=1.2].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
@@ -387,7 +392,8 @@ Completed box being shipped out [1]
 ....\glue 0.0 plus 1.0fil
 ....\TU/lmroman10-regular.otf(0)/m/n/10 "1" 0031 +0:+0
 ....\glue 0.0 plus 1.0fil
-Package fontspec Info: Font family 'lmroman10-regular.otf(1)' created for font 'lmroman10-regular.otf' with options [Ligatures=TeX,Renderer=Harfbuzz,Script=Latin].
+Package fontspec Info: 
+(fontspec)             Font family 'lmroman10-regular.otf(1)' created for font 'lmroman10-regular.otf' with options [Ligatures=TeX,Renderer=Harfbuzz,Script=Latin].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              

diff --git a/testfiles-latex-TU/tu-composites01.tlg b/testfiles-latex-TU/tu-composites01.tlg
@@ -384,5 +384,5 @@ Missing character: There is no ̨ (U+0328) in font [lmroman10-regular]:+tlig;!
 ] (tu-composites01.aux)
  ***********
 LaTeX2e <2023-11-01> patch level 1
-L3 programming layer <2024-03-14>
+L3 programming layer <2024-04-11>
  ***********
diff --git a/testfiles-latex-TU/tu-composites02.tlg b/testfiles-latex-TU/tu-composites02.tlg
@@ -201,5 +201,5 @@ l. ...\test{z}
 (tu-composites02.aux)
  ***********
 LaTeX2e <2023-11-01> patch level 1
-L3 programming layer <2024-03-14>
+L3 programming layer <2024-04-11>
  ***********
diff --git a/testfiles-latex-TU/tu-tl2e7.tlg b/testfiles-latex-TU/tu-tl2e7.tlg
@@ -1388,5 +1388,5 @@ Missing character: There is no ̧ (U+0327) in font [lmroman10-regular]:+tlig;!
 (tu-tl2e7.aux)
  ***********
 LaTeX2e <2023-11-01> patch level 1
-L3 programming layer <2024-03-14>
+L3 programming layer <2024-04-11>
  ***********
diff --git a/testfiles/add-uppercase-feature.tlg b/testfiles/add-uppercase-feature.tlg
@@ -1,7 +1,8 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
 luaotfload | aux : font no 19 (nil) does not define feature smcp for script latn with language dflt
-Package fontspec Info: Font family 'DejaVuSans.ttf(1)' created for font 'DejaVuSans.ttf' with options [Ligatures=TeX,RawFeature=+vircase].
+Package fontspec Info: 
+(fontspec)             Font family 'DejaVuSans.ttf(1)' created for font 'DejaVuSans.ttf' with options [Ligatures=TeX,RawFeature=+vircase].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)