test: update testfiles following fontspec v2.9b changes

- latex3/fontspec@edde403 (add some extra description to the no-script and no-language warnings, 2024-04-16) - latex3/fontspec@b1acf92 (change approach to scripts, 2024-04-20) - latex3/fontspec@844c653 (add newline to warning/error messages to avoid poor line breaking, 2024-04-27)
CTeX-org · May 2, 2024 · 3a253f2 · 3a253f2
1 parent a7fbfb4
commit 3a253f2
Show file tree

Hide file tree

Showing 18 changed files with 144 additions and 101 deletions.
diff --git a/ctex/test/testfiles-contrib/pkuthss.tlg b/ctex/test/testfiles-contrib/pkuthss.tlg
@@ -54,7 +54,8 @@ Completed box being shipped out [2]
 ....\hbox(0.0+0.0)x449.55322
 ....\special{color pop}
 .\kern 0.0
-Package fontspec Warning: Font "FandolFang-Regular" does not contain requested Script "CJK".
+Package fontspec Warning: 
+(fontspec)                Script 'CJK' not explicitly supported within font 'FandolFang-Regular'. Check the typeset output, and if it is okay then ignore this warning. Otherwise a different font should be chosen.
 Completed box being shipped out [1]
 \vbox(715.87135+0.0)x451.26056
 .\hbox(0.0+0.0)x0.0

diff --git a/ctex/test/testfiles/fonts01.luatex.tlg b/ctex/test/testfiles/fonts01.luatex.tlg
@@ -12,7 +12,8 @@ LaTeX Font Warning: Font shape `LTJY3/FandolSong-Regular(0)/bx/it' undefined
 LaTeX Font Info:    Font shape `LTJY3/FandolSong-Regular(0)/bx/it' in size <10.53937> not available
 (Font)              Font shape `LTJY3/FandolSong-Regular(0)/b/n' tried instead on input line ....
 (load cache: extra_fandolhei-regular.luc)(load cache: extra_lmsans10-regular.luc)(load cache: extra_fandolhei-bold.luc)
-Package fontspec Info: Font family 'FandolHei-Regular(0)' created for font 'FandolHei-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},BoldFont={FandolHei-Bold},LTJFONTUID=2].
+Package fontspec Info: 
+(fontspec)             Font family 'FandolHei-Regular(0)' created for font 'FandolHei-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},BoldFont={FandolHei-Bold},LTJFONTUID=2].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
@@ -36,7 +37,8 @@ LaTeX Font Warning: Font shape `LTJY3/FandolHei-Regular(0)/bx/it' undefined
 LaTeX Font Info:    Font shape `LTJY3/FandolHei-Regular(0)/bx/it' in size <10.53937> not available
 (Font)              Font shape `LTJY3/FandolHei-Regular(0)/b/n' tried instead on input line ....
 (load cache: extra_fandolfang-regular.luc)(load cache: extra_lmmono10-regular.luc)
-Package fontspec Info: Font family 'FandolFang-Regular(0)' created for font 'FandolFang-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},LTJFONTUID=3].
+Package fontspec Info: 
+(fontspec)             Font family 'FandolFang-Regular(0)' created for font 'FandolFang-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},LTJFONTUID=3].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
@@ -351,7 +353,8 @@ Completed box being shipped out [1]
 ============================================================
 TEST 2: CJK font commands
 ============================================================
-Package fontspec Info: Font family 'FandolSong-Regular(1)' created for font 'FandolSong-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},BoldFont={FandolSong-Bold},LTJFONTUID=4].
+Package fontspec Info: 
+(fontspec)             Font family 'FandolSong-Regular(1)' created for font 'FandolSong-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},BoldFont={FandolSong-Bold},LTJFONTUID=4].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
@@ -367,7 +370,8 @@ LaTeX Font Warning: Font shape `LTJY3/FandolSong-Regular(1)/bx/it' undefined
 (Font)              using `LTJY3/FandolSong-Regular(1)/bx/n' instead on input line ....
 LaTeX Font Info:    Font shape `LTJY3/FandolSong-Regular(1)/bx/it' in size <10.53937> not available
 (Font)              Font shape `LTJY3/FandolSong-Regular(1)/b/n' tried instead on input line ....
-Package fontspec Info: Font family 'FandolHei-Regular(1)' created for font 'FandolHei-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},BoldFont={FandolHei-Bold},LTJFONTUID=5].
+Package fontspec Info: 
+(fontspec)             Font family 'FandolHei-Regular(1)' created for font 'FandolHei-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},BoldFont={FandolHei-Bold},LTJFONTUID=5].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
@@ -383,7 +387,8 @@ LaTeX Font Warning: Font shape `LTJY3/FandolHei-Regular(1)/bx/it' undefined
 (Font)              using `LTJY3/FandolHei-Regular(1)/bx/n' instead on input line ....
 LaTeX Font Info:    Font shape `LTJY3/FandolHei-Regular(1)/bx/it' in size <10.53937> not available
 (Font)              Font shape `LTJY3/FandolHei-Regular(1)/b/n' tried instead on input line ....
-Package fontspec Info: Font family 'FandolFang-Regular(1)' created for font 'FandolFang-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},LTJFONTUID=6].
+Package fontspec Info: 
+(fontspec)             Font family 'FandolFang-Regular(1)' created for font 'FandolFang-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},LTJFONTUID=6].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
@@ -395,7 +400,8 @@ LaTeX Font Warning: Font shape `LTJY3/FandolFang-Regular(1)/m/it' undefined
 (Font)              using `LTJY3/FandolFang-Regular(1)/m/n' instead on input line ....
 LaTeX Font Warning: Font shape `LTJY3/FandolFang-Regular(1)/bx/it' undefined
 (Font)              using `LTJY3/FandolFang-Regular(1)/bx/n' instead on input line ....
-Package fontspec Info: Font family 'FandolKai-Regular(0)' created for font 'FandolKai-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},LTJFONTUID=7].
+Package fontspec Info: 
+(fontspec)             Font family 'FandolKai-Regular(0)' created for font 'FandolKai-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},LTJFONTUID=7].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              

diff --git a/ctex/test/testfiles/fonts01.tlg b/ctex/test/testfiles/fonts01.tlg
@@ -6,14 +6,16 @@ TEST 1: LaTeX font commands
 ============================================================
 LaTeX Font Warning: Font shape `TU/FandolSong-Regular(0)/b/it' undefined
 (Font)              using `TU/FandolSong-Regular(0)/b/n' instead on input line ....
-Package fontspec Warning: Font "FandolHei-Regular" does not contain requested Script "CJK".
-Package fontspec Info: Font family 'FandolHei-Regular(0)' created for font 'FandolHei-Regular' with options [Script={CJK},Extension={.otf},BoldFont={FandolHei-Bold}].
+Package fontspec Warning: 
+(fontspec)                Script 'CJK' not explicitly supported within font 'FandolHei-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 'FandolHei-Regular(0)' created for font 'FandolHei-Regular' with options [Script={CJK},Extension={.otf},BoldFont={FandolHei-Bold}].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[FandolHei-Regular.otf]/OT:language=dflt;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[FandolHei-Regular.otf]/OT:script=hani;language=dflt;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
-(fontspec)             - 'bold' (b/n) with NFSS spec.: <->"[FandolHei-Bold.otf]/OT:language=dflt;"
+(fontspec)             - 'bold' (b/n) with NFSS spec.: <->"[FandolHei-Bold.otf]/OT:script=hani;language=dflt;"
 (fontspec)             - 'bold small caps'  (b/sc) with NFSS spec.: 
 LaTeX Font Info:    Font shape `TU/lmss/m/it' in size <10.53937> not available
 (Font)              Font shape `TU/lmss/m/sl' tried instead on input line ....
@@ -23,12 +25,14 @@ LaTeX Font Info:    Font shape `TU/lmss/bx/it' in size <10.53937> not available
 (Font)              Font shape `TU/lmss/bx/sl' tried instead on input line ....
 LaTeX Font Warning: Font shape `TU/FandolHei-Regular(0)/b/it' undefined
 (Font)              using `TU/FandolHei-Regular(0)/b/n' instead on input line ....
-Package fontspec Warning: Font "FandolFang-Regular" does not contain requested Script "CJK".
-Package fontspec Info: Font family 'FandolFang-Regular(0)' created for font 'FandolFang-Regular' with options [Script={CJK},Extension={.otf}].
+Package fontspec Warning: 
+(fontspec)                Script 'CJK' not explicitly supported within font 'FandolFang-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 'FandolFang-Regular(0)' created for font 'FandolFang-Regular' with options [Script={CJK},Extension={.otf}].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[FandolFang-Regular.otf]/OT:language=dflt;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[FandolFang-Regular.otf]/OT:script=hani;language=dflt;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 LaTeX Font Info:    Font shape `TU/lmtt/bx/n' in size <10.53937> not available
 (Font)              Font shape `TU/lmtt/b/n' tried instead on input line ....
@@ -249,27 +253,33 @@ Completed box being shipped out [1]
 ============================================================
 TEST 2: CJK font commands
 ============================================================
-Package fontspec Warning: Font "FandolSong-Regular" does not contain requested Script "CJK".
-Package fontspec Info: Font family 'FandolSong-Regular(1)' created for font 'FandolSong-Regular' with options [Script={CJK},Extension={.otf},BoldFont={FandolSong-Bold}].
+Package fontspec Warning: 
+(fontspec)                Script 'CJK' not explicitly supported within font 'FandolSong-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 'FandolSong-Regular(1)' created for font 'FandolSong-Regular' with options [Script={CJK},Extension={.otf},BoldFont={FandolSong-Bold}].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[FandolSong-Regular.otf]/OT:language=dflt;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[FandolSong-Regular.otf]/OT:script=hani;language=dflt;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
-(fontspec)             - 'bold' (b/n) with NFSS spec.: <->"[FandolSong-Bold.otf]/OT:language=dflt;"
+(fontspec)             - 'bold' (b/n) with NFSS spec.: <->"[FandolSong-Bold.otf]/OT:script=hani;language=dflt;"
 (fontspec)             - 'bold small caps'  (b/sc) with NFSS spec.: 
 LaTeX Font Warning: Font shape `TU/FandolSong-Regular(1)/m/it' undefined
 (Font)              using `TU/FandolSong-Regular(1)/m/n' instead on input line ....
 LaTeX Font Warning: Font shape `TU/FandolSong-Regular(1)/b/it' undefined
 (Font)              using `TU/FandolSong-Regular(1)/b/n' instead on input line ....
-Package fontspec Warning: Font "FandolHei-Regular" does not contain requested Script "CJK".
-Package fontspec Warning: Font "FandolFang-Regular" does not contain requested Script "CJK".
-Package fontspec Warning: Font "FandolKai-Regular" does not contain requested Script "CJK".
-Package fontspec Info: Font family 'FandolKai-Regular(0)' created for font 'FandolKai-Regular' with options [Script={CJK},Extension={.otf}].
+Package fontspec Warning: 
+(fontspec)                Script 'CJK' not explicitly supported within font 'FandolHei-Regular'. Check the typeset output, and if it is okay then ignore this warning. Otherwise a different font should be chosen.
+Package fontspec Warning: 
+(fontspec)                Script 'CJK' not explicitly supported within font 'FandolFang-Regular'. Check the typeset output, and if it is okay then ignore this warning. Otherwise a different font should be chosen.
+Package fontspec Warning: 
+(fontspec)                Script 'CJK' not explicitly supported within font 'FandolKai-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 'FandolKai-Regular(0)' created for font 'FandolKai-Regular' with options [Script={CJK},Extension={.otf}].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[FandolKai-Regular.otf]/OT:language=dflt;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[FandolKai-Regular.otf]/OT:script=hani;language=dflt;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 LaTeX Font Warning: Font shape `TU/FandolKai-Regular(0)/b/n' undefined
 (Font)              using `TU/FandolKai-Regular(0)/m/n' instead on input line ....

diff --git a/ctex/test/testfiles/fonts02.tlg b/ctex/test/testfiles/fonts02.tlg
@@ -9,7 +9,8 @@ TEST 1: Engine name
 ============================================================
 TEST 2: LaTeX font commands
 ============================================================
-Package fontspec Info: Font family 'NotoSansCJKSC(0)' created for font 'Noto Sans CJK SC' with options [Script={CJK},UprightFont={*},BoldItalicFont={* Bold},BoldFont={* Bold},ItalicFont={*}].
+Package fontspec Info: 
+(fontspec)             Font family 'NotoSansCJKSC(0)' created for font 'Noto Sans CJK SC' with options [Script={CJK},UprightFont={*},BoldItalicFont={* Bold},BoldFont={* Bold},ItalicFont={*}].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
@@ -241,7 +242,8 @@ Completed box being shipped out [1]
 ============================================================
 TEST 3: CJK font commands
 ============================================================
-Package fontspec Info: Font family 'NotoSerifCJKTC(0)' created for font 'Noto Serif CJK TC' with options [Script={CJK},UprightFont={*},BoldItalicFont={* Bold},BoldFont={* Bold},ItalicFont={*}].
+Package fontspec Info: 
+(fontspec)             Font family 'NotoSerifCJKTC(0)' created for font 'Noto Serif CJK TC' with options [Script={CJK},UprightFont={*},BoldItalicFont={* Bold},BoldFont={* Bold},ItalicFont={*}].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
@@ -253,7 +255,8 @@ Package fontspec Info: Font family 'NotoSerifCJKTC(0)' created for font 'Noto Se
 (fontspec)             - 'italic small caps'  (m/scit) with NFSS spec.: 
 (fontspec)             - 'bold italic' (b/it) with NFSS spec.: <->"Noto Serif CJK TC Bold/OT:script=hani;language=dflt;"
 (fontspec)             - 'bold italic small caps'  (b/scit) with NFSS spec.: 
-Package fontspec Info: Font family 'NotoSansCJKTC(0)' created for font 'Noto Sans CJK TC' with options [Script={CJK},UprightFont={*},BoldItalicFont={* Bold},BoldFont={* Bold},ItalicFont={*}].
+Package fontspec Info: 
+(fontspec)             Font family 'NotoSansCJKTC(0)' created for font 'Noto Sans CJK TC' with options [Script={CJK},UprightFont={*},BoldItalicFont={* Bold},BoldFont={* Bold},ItalicFont={*}].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              

diff --git a/ctex/test/testfiles/github472-04.luatex.tlg b/ctex/test/testfiles/github472-04.luatex.tlg
@@ -8,7 +8,8 @@ TEST 1: \tableofcontents with tocloft
 LaTeX Font Info:    Font shape `LTJY3/FandolSong-Regular(0)/bx/n' in size <15.05624> not available
 (Font)              Font shape `LTJY3/FandolSong-Regular(0)/b/n' tried instead on input line ....
 (github472-04.toc(load cache: extra_fandolhei-regular.luc)(load cache: extra_lmsans10-regular.luc)(load cache: extra_fandolhei-bold.luc)
-Package fontspec Info: Font family 'FandolHei-Regular(0)' created for font 'FandolHei-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},BoldFont={FandolHei-Bold},LTJFONTUID=2].
+Package fontspec Info: 
+(fontspec)             Font family 'FandolHei-Regular(0)' created for font 'FandolHei-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},BoldFont={FandolHei-Bold},LTJFONTUID=2].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              

diff --git a/ctex/test/testfiles/github472-04.tlg b/ctex/test/testfiles/github472-04.tlg
@@ -5,14 +5,16 @@ Author: Xiangdong Zeng
 TEST 1: \tableofcontents with tocloft
 ============================================================
 (github472-04.toc
-Package fontspec Warning: Font "FandolHei-Regular" does not contain requested Script "CJK".
-Package fontspec Info: Font family 'FandolHei-Regular(0)' created for font 'FandolHei-Regular' with options [Script={CJK},Extension={.otf},BoldFont={FandolHei-Bold}].
+Package fontspec Warning: 
+(fontspec)                Script 'CJK' not explicitly supported within font 'FandolHei-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 'FandolHei-Regular(0)' created for font 'FandolHei-Regular' with options [Script={CJK},Extension={.otf},BoldFont={FandolHei-Bold}].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)              
-(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[FandolHei-Regular.otf]/OT:language=dflt;"
+(fontspec)             - 'normal' (m/n) with NFSS spec.: <->"[FandolHei-Regular.otf]/OT:script=hani;language=dflt;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
-(fontspec)             - 'bold' (b/n) with NFSS spec.: <->"[FandolHei-Bold.otf]/OT:language=dflt;"
+(fontspec)             - 'bold' (b/n) with NFSS spec.: <->"[FandolHei-Bold.otf]/OT:script=hani;language=dflt;"
 (fontspec)             - 'bold small caps'  (b/sc) with NFSS spec.: 
 LaTeX Font Info:    External font `cmex10' loaded for size
 (Font)              <10.53937> on input line ....

diff --git a/ctex/test/testfiles/heading08.luatex.tlg b/ctex/test/testfiles/heading08.luatex.tlg
@@ -7,7 +7,8 @@ TEST 1: .../format
 ============================================================
 第一章
 (load cache: extra_fandolhei-regular.luc)(load cache: extra_lmsans10-regular.luc)(load cache: extra_fandolhei-bold.luc)
-Package fontspec Info: Font family 'FandolHei-Regular(0)' created for font 'FandolHei-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},BoldFont={FandolHei-Bold},LTJFONTUID=2].
+Package fontspec Info: 
+(fontspec)             Font family 'FandolHei-Regular(0)' created for font 'FandolHei-Regular' with options [NFSSEncoding=LTJY3,JFM=zh_CN/quanjiao,Extension={.otf},BoldFont={FandolHei-Bold},LTJFONTUID=2].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS series/shapes:
 (fontspec)