test(fonts): Update expected output of font tests

sile-typesetter · Feb 24, 2021 · 8b3760e · 8b3760e
1 parent cb678eb
commit 8b3760e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 14 deletions.
diff --git a/tests/font-features-cvXX.expected b/tests/font-features-cvXX.expected
@@ -3,27 +3,27 @@ Begin page
 Mx 	14.8819
 My 	30.4442
 Set font 	Gentium Plus;10;400;;normal;;LTR
-T	858	(һ)
+T	858 w=5.5176	(һ)
 Mx 	23.0701
-T	1306	(ồ)
+T	1306 w=5.0293	(ồ)
 Mx 	14.8819
 My 	42.4442
 Set font 	Gentium Plus;10;400;;normal;+cv75;+cv81;LTR
-T	859	(һ)
+T	859 w=5.2148	(һ)
 Mx 	22.7674
-T	1307	(ồ)
+T	1307 w=5.0293	(ồ)
 Mx 	14.8819
 My 	54.4442
 Set font 	Gentium Plus;10;400;;normal;+cv75;+cv81;+cv75;-cv81;LTR
-T	858	(һ)
+T	858 w=5.5176	(һ)
 Mx 	23.0701
 Set font 	Gentium Plus;10;400;;normal;+cv75;+cv81;-cv75;+cv81;LTR
-T	1306	(ồ)
+T	1306 w=5.0293	(ồ)
 Mx 	14.8819
 My 	66.4442
 Set font 	Gentium Plus;10;400;;normal;+cv75;+cv81;-cv75;-cv81;LTR
-T	858	(һ)
+T	858 w=5.5176	(һ)
 Mx 	23.0701
-T	1306	(ồ)
+T	1306 w=5.0293	(ồ)
 End page
 Finish
diff --git a/tests/font-features.expected b/tests/font-features.expected
@@ -3,16 +3,36 @@ Begin page
 Mx 	14.8819
 My 	27.2752
 Set font 	Gentium Plus;10;400;;normal;+smcp;LTR
-T	54 3871 3490 3850 3850 38 3490 3964 4007	(SmallCaps)
+T	54 3871 3490 3850 3850 38 3490 3964 4007 w=47.2266	(SmallCaps)
 My 	39.2752
-T	54 3871 3490 3850 3850 38 3490 3964 4007	(SmallCaps)
+T	54 3871 3490 3850 3850 38 3490 3964 4007 w=47.2266	(SmallCaps)
 My 	51.2752
-Set font 	Gentium Plus;10;400;;normal;+hlig;+dlig;LTR
-T	47 76 74 68 87 88 85 72 86	(Ligatures)
+Set font 	Gentium Plus;10;400;;normal;+dlig;+hlig;LTR
+Mx 	4.7607
+Mx 	2.7100
+Mx 	4.8779
+Mx 	4.5898
+Mx 	3.4424
+Mx 	5.2979
+Mx 	3.8086
+Mx 	4.6191
+Mx 	3.8623
+T	47 a=4.7607 76 a=2.7100 74 a=4.8779 68 a=4.5898 87 a=3.4424 88 a=5.2979 85 a=3.9600 72 a=4.6191 86 a=3.8623	(Ligatures)
+Mx 	14.8819
 My 	63.2752
-T	47 76 74 68 87 88 85 72 86	(Ligatures)
+Mx 	4.7607
+Mx 	2.7100
+Mx 	4.8779
+Mx 	4.5898
+Mx 	3.4424
+Mx 	5.2979
+Mx 	3.8086
+Mx 	4.6191
+Mx 	3.8623
+T	47 a=4.7607 76 a=2.7100 74 a=4.8779 68 a=4.5898 87 a=3.4424 88 a=5.2979 85 a=3.9600 72 a=4.6191 86 a=3.8623	(Ligatures)
+Mx 	14.8819
 My 	75.2752
 Set font 	Gentium Plus;10;400;;normal;;LTR
-T	49 82 85 80 68 79	(Normal)
+T	49 82 85 80 68 79 w=30.8105	(Normal)
 End page
 Finish