Adapt testfiles for l3build changes

latex3 · Feb 14, 2024 · 3e61939 · 3e61939
1 parent cb1a8de
commit 3e61939
Show file tree

Hide file tree

Showing 9 changed files with 203 additions and 456 deletions.
diff --git a/testfiles-harf/arabic.tlg b/testfiles-harf/arabic.tlg
@@ -1176,23 +1176,17 @@ 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: Font family 'Amiri(1)' created for font 'Amiri' with
-(fontspec)             options [Renderer=Harfbuzz,Script=Arabic,Scale=1.6].
+Package fontspec Info: 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
-(fontspec)             series/shapes:
+(fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->s*[1.6]"Amiri:mode=harf;script=arab;language=dflt;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->s*[1.6]"Amiri:mode=harf;script=arab;language=dflt;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
-(fontspec)             - 'bold' (b/n) with NFSS spec.:
-(fontspec)             <->s*[1.6]"Amiri/B:mode=harf;script=arab;language=dflt;"
+(fontspec)             - 'bold' (b/n) with NFSS spec.: <->s*[1.6]"Amiri/B:mode=harf;script=arab;language=dflt;"
 (fontspec)             - 'bold small caps'  (b/sc) with NFSS spec.: 
-(fontspec)             - 'italic' (m/it) with NFSS spec.:
-(fontspec)             <->s*[1.6]"Amiri/I:mode=harf;script=arab;language=dflt;"
+(fontspec)             - 'italic' (m/it) with NFSS spec.: <->s*[1.6]"Amiri/I:mode=harf;script=arab;language=dflt;"
 (fontspec)             - 'italic small caps'  (m/scit) with NFSS spec.: 
-(fontspec)             - 'bold italic' (b/it) with NFSS spec.:
-(fontspec)             <->s*[1.6]"Amiri/BI:mode=harf;script=arab;language=dflt;"
+(fontspec)             - 'bold italic' (b/it) with NFSS spec.: <->s*[1.6]"Amiri/BI:mode=harf;script=arab;language=dflt;"
 (fontspec)             - 'bold italic small caps'  (b/scit) with NFSS spec.: 
 LaTeX Font Info:    Font shape `TU/Amiri(1)/m/n' will be
 (Font)              scaled to size 16.00006pt on input line ....
@@ -2269,15 +2263,11 @@ 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: Font family 'ArefRuqaa-Regular.ttf(0)' created for font
-(fontspec)             'ArefRuqaa-Regular.ttf' with options
-(fontspec)             [Renderer=Harfbuzz,Script=Arabic,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].
 (fontspec)              
-(fontspec)              This font family consists of the following NFSS
-(fontspec)             series/shapes:
+(fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->s*[1.2]"[ArefRuqaa-Regular.ttf]:mode=harf;script=arab;language=dflt;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->s*[1.2]"[ArefRuqaa-Regular.ttf]:mode=harf;script=arab;language=dflt;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 LaTeX Font Info:    Font shape `TU/ArefRuqaa-Regular.ttf(0)/m/n' will be
 (Font)              scaled to size 11.99997pt on input line ....
@@ -4525,15 +4515,11 @@ 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
-(fontspec)             for font 'NotoNastaliqUrdu-Regular.ttf' with options
-(fontspec)             [Renderer=Harfbuzz,Script=Arabic].
+Package fontspec Info: 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
-(fontspec)             series/shapes:
+(fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[NotoNastaliqUrdu-Regular.ttf]:mode=harf;script=arab;language=dflt;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[NotoNastaliqUrdu-Regular.ttf]:mode=harf;script=arab;language=dflt;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Completed box being shipped out [4]
 \vbox(633.0+0.06)x407.0, direction TLT

diff --git a/testfiles-harf/color.tlg b/testfiles-harf/color.tlg
@@ -1,23 +1,16 @@
 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,Renderer=Harfbuzz,Script=Arabic,Color=FF000080].
+Package fontspec Info: 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
-(fontspec)             series/shapes:
+(fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"Amiri:mode=harf;script=arab;language=dflt;+tlig;color=FF000080;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"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/B:mode=harf;script=arab;language=dflt;+tlig;color=FF000080;"
+(fontspec)             - 'bold' (b/n) with NFSS spec.: <->"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/I:mode=harf;script=arab;language=dflt;+tlig;color=FF000080;"
+(fontspec)             - 'italic' (m/it) with NFSS spec.: <->"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/BI:mode=harf;script=arab;language=dflt;+tlig;color=FF000080;"
+(fontspec)             - 'bold italic' (b/it) with NFSS spec.: <->"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'.

diff --git a/testfiles-harf/discretionaries.tlg b/testfiles-harf/discretionaries.tlg
@@ -1,43 +1,28 @@
 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
-(fontspec)             font 'NotoSerifCJK-Regular.ttc' with options
-(fontspec)             [Ligatures=TeX,Renderer=Harfbuzz,Script=Latin,Ligatures=TeXOff].
+Package fontspec Info: Font family 'NotoSerifCJK-Regular.ttc(1)' created for font 'NotoSerifCJK-Regular.ttc' with options [Ligatures=TeX,Renderer=Harfbuzz,Script=Latin,Ligatures=TeXOff].
 (fontspec)              
-(fontspec)              This font family consists of the following NFSS
-(fontspec)             series/shapes:
+(fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[NotoSerifCJK-Regular.ttc]:mode=harf;script=latn;language=dflt;-tlig;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[NotoSerifCJK-Regular.ttc]:mode=harf;script=latn;language=dflt;-tlig;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
-(fontspec)             - 'bold' (b/n) with NFSS spec.:
-(fontspec)             <->"[NotoSerifCJK-Regular.ttc]:mode=harf;script=latn;language=dflt;-tlig;"
+(fontspec)             - 'bold' (b/n) with NFSS spec.: <->"[NotoSerifCJK-Regular.ttc]:mode=harf;script=latn;language=dflt;-tlig;"
 (fontspec)             - 'bold small caps'  (b/sc) with NFSS spec.: 
-(fontspec)             - 'italic' (m/it) with NFSS spec.:
-(fontspec)             <->"[NotoSerifCJK-Regular.ttc]:mode=harf;script=latn;language=dflt;-tlig;"
+(fontspec)             - 'italic' (m/it) with NFSS spec.: <->"[NotoSerifCJK-Regular.ttc]:mode=harf;script=latn;language=dflt;-tlig;"
 (fontspec)             - 'italic small caps'  (m/scit) with NFSS spec.: 
-(fontspec)             - 'bold italic' (b/it) with NFSS spec.:
-(fontspec)             <->"[NotoSerifCJK-Regular.ttc]:mode=harf;script=latn;language=dflt;-tlig;"
+(fontspec)             - 'bold italic' (b/it) with NFSS spec.: <->"[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
-(fontspec)             'lmroman10-regular.otf' with options
-(fontspec)             [Renderer=Harfbuzz,Script=Latin,Ligatures=Discretionary,Ligatures=TeX].
+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].
 (fontspec)              
-(fontspec)              This font family consists of the following NFSS
-(fontspec)             series/shapes:
+(fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[lmroman10-regular.otf]:mode=harf;script=latn;language=dflt;+dlig;+tlig;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[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
-(fontspec)             'lmroman10-regular.otf' with options
-(fontspec)             [Renderer=Harfbuzz,Script=Latin,Ligatures=Discretionary,Ligatures=TeX,Ligatures=TeXOff].
+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,Ligatures=TeXOff].
 (fontspec)              
-(fontspec)              This font family consists of the following NFSS
-(fontspec)             series/shapes:
+(fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[lmroman10-regular.otf]:mode=harf;script=latn;language=dflt;+dlig;-tlig;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[lmroman10-regular.otf]:mode=harf;script=latn;language=dflt;+dlig;-tlig;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0, direction TLT

diff --git a/testfiles-harf/scripts.tlg b/testfiles-harf/scripts.tlg
@@ -1,58 +1,37 @@
 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
-(fontspec)                Script "Greek".
-Package fontspec Info: Font family 'amiri-regular.ttf(1)' created for font
-(fontspec)             'amiri-regular.ttf' with options
-(fontspec)             [Ligatures=TeX,Renderer=Harfbuzz,Script=Latin,Script=Greek].
+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].
 (fontspec)              
-(fontspec)              This font family consists of the following NFSS
-(fontspec)             series/shapes:
+(fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[amiri-regular.ttf]:mode=harf;script=latn;language=dflt;+tlig;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[amiri-regular.ttf]:mode=harf;script=latn;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
-(fontspec)             'amiri-regular.ttf' with options
-(fontspec)             [Renderer=Harfbuzz,Script=Arabic,Language=Arabic].
+Package fontspec Info: 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
-(fontspec)             series/shapes:
+(fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[amiri-regular.ttf]:mode=harf;script=arab;language=ARA;"
+(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
-(fontspec)             'amiri-regular.ttf' with options
-(fontspec)             [Renderer=Harfbuzz,Script=Arabic,Language=Urdu].
+Package fontspec Info: 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
-(fontspec)             series/shapes:
+(fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[amiri-regular.ttf]:mode=harf;script=arab;language=URD;"
+(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
-(fontspec)             'amiri-regular.ttf' with options
-(fontspec)             [Renderer=Harfbuzz,Script=Arabic,Language=Sindhi].
+Package fontspec Info: 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
-(fontspec)             series/shapes:
+(fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[amiri-regular.ttf]:mode=harf;script=arab;language=SND;"
+(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
-(fontspec)             'amiri-regular.ttf' with options
-(fontspec)             [Renderer=Harfbuzz,Script=Arabic,Language=Kashmiri].
+Package fontspec Info: 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
-(fontspec)             series/shapes:
+(fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[amiri-regular.ttf]:mode=harf;script=arab;language=KSH;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[amiri-regular.ttf]:mode=harf;script=arab;language=KSH;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Completed box being shipped out [1]
 \vbox(633.0+0.03)x407.0, direction TLT

diff --git a/testfiles/add-uppercase-feature.tlg b/testfiles/add-uppercase-feature.tlg
@@ -1,15 +1,11 @@
 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
-(fontspec)             'DejaVuSans.ttf' with options
-(fontspec)             [Ligatures=TeX,RawFeature=+vircase].
+Package fontspec Info: 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
-(fontspec)             series/shapes:
+(fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[DejaVuSans.ttf]:mode=node;script=latn;language=dflt;+tlig;+vircase;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[DejaVuSans.ttf]:mode=node;script=latn;language=dflt;+tlig;+vircase;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0, direction TLT