Skip to content

Commit ebfc64a

Browse files
committed
glyph_name 添加前缀 u 以符合 adobe .fea 文件规范的要求
1 parent 546c362 commit ebfc64a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/pixel_font_knife/glyph_file_util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def glyph_name(self) -> str:
6060
if self.code_point == -1:
6161
return '.notdef'
6262

63-
name = f'{self.code_point:04X}'
63+
name = f'u{self.code_point:04X}'
6464
if len(self.flavors) > 0:
6565
name = f'{name}-{self.flavors[0].upper()}'
6666
return name

tests/test_glyph_file_util.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ def test_glyph_file_3():
2525
glyph_file = GlyphFile.load(Path('4E00.png'))
2626
assert glyph_file.code_point == 0x4E00
2727
assert len(glyph_file.flavors) == 0
28-
assert glyph_file.glyph_name == '4E00'
28+
assert glyph_file.glyph_name == 'u4E00'
2929

3030

3131
def test_glyph_file_4():
3232
glyph_file = GlyphFile.load(Path('4E00 A,b,C,b,a.png'))
3333
assert glyph_file.code_point == 0x4E00
3434
assert glyph_file.flavors == ['a', 'b', 'c']
35-
assert glyph_file.glyph_name == '4E00-A'
35+
assert glyph_file.glyph_name == 'u4E00-A'
3636

3737

3838
def test_glyph_file_5(glyphs_dir: Path):
@@ -90,12 +90,12 @@ def test_context(glyphs_dir: Path):
9090
assert group_6aa4.get_file('zh_tr') is group_6aa4.get_file('ko')
9191

9292
assert glyph_file_util.get_character_mapping(context) == {
93-
0x4E11: '4E11',
94-
0x6AA4: '6AA4',
93+
0x4E11: 'u4E11',
94+
0x6AA4: 'u6AA4',
9595
}
9696
assert glyph_file_util.get_character_mapping(context, 'zh_cn') == {
97-
0x4E11: '4E11-ZH_CN',
98-
0x6AA4: '6AA4',
97+
0x4E11: 'u4E11-ZH_CN',
98+
0x6AA4: 'u6AA4',
9999
}
100100

101101
assert [glyph_file.file_path for glyph_file in glyph_file_util.get_glyph_sequence(context, [None, 'zh_cn', 'zh_hk'])] == [

0 commit comments

Comments
 (0)