Skip to content

Commit ac954e3

Browse files
authored
core: Manually fix the descent of the built-in NotoSans font
* core: Manually fix the descent of the built-in NotoSans font * tests: Revert expected output of stage3d_fractal and stage3d_texture to something closer to before
1 parent def8bf7 commit ac954e3

File tree

5 files changed

+19
-4
lines changed

5 files changed

+19
-4
lines changed

core/assets/notosans.subset.ttf.gz

133 Bytes
Binary file not shown.

core/assets/update-font.sh

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,26 @@ pyftsubset --unicodes=2200-22FF NotoSansMath-Regular-NoTable.ttf
2323
echo "6. Merging fonts"
2424
pyftmerge NotoSans-Regular.subset.ttf NotoSansMath-Regular-NoTable.subset.ttf
2525

26-
echo "7. Zipping result"
26+
27+
echo "7. Fixing up descent"
28+
29+
ttx merged.ttf
30+
31+
if ! grep -q 'descent value="-423"' merged.ttx ; then
32+
echo "ERROR: Need Update descent value!"
33+
exit 1
34+
fi
35+
36+
sed -i -e 's/descent value="-423"/descent value="-293"/' merged.ttx
37+
sed -i -e 's/sTypoDescender value="-423"/sTypoDescender value="-293"/' merged.ttx
38+
ttx merged.ttx
39+
mv merged#1.ttf merged.ttf
40+
41+
echo "8. Zipping result"
2742
# Pure gzip (no headers or other sections)
2843
cat merged.ttf | gzip --best --no-name | tail --bytes=+11 | head --bytes=-8 > notosans.subset.ttf.gz
2944

3045
echo "DONE: Created notosans.subset.ttf.gz"
3146

32-
echo "8. Removing artifacts"
33-
rm *.ttf
47+
echo "9. Removing artifacts"
48+
rm *.ttf *.ttx
70 Bytes
Loading

tests/tests/swfs/avm2/stage3d_fractal/test.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ num_frames = 2
22

33
[image_comparisons.output]
44
tolerance = 2
5-
max_outliers = 25
5+
max_outliers = 85
66

77
[player_options]
88
max_execution_duration = { secs = 1000, nanos = 0 }
-20.3 KB
Loading

0 commit comments

Comments
 (0)