walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[hb-buffer-deserialize] Fixups

This commit is contained in:
Behdad Esfahbod 2023-01-25 14:07:01 -07:00
parent a1101f09ca
commit e973050986
6 changed files with 503 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

735
src/hb-buffer-deserialize-text-glyphs.hh
View File

@ -34,291 +34,282 @@
#line 33 "hb-buffer-deserialize-text-glyphs.hh" #line 33 "hb-buffer-deserialize-text-glyphs.hh"
static const unsigned char _deserialize_text_glyphs_trans_keys[] = { static const unsigned char _deserialize_text_glyphs_trans_keys[] = {
0u, 0u, 9u, 124u, 9u, 124u, 48u, 57u, 9u, 124u, 9u, 124u, 45u, 57u, 48u, 57u, 0u, 0u, 48u, 57u, 45u, 57u, 48u, 57u, 45u, 57u, 48u, 57u, 48u, 57u, 45u, 57u,
9u, 124u, 45u, 57u, 48u, 57u, 9u, 124u, 9u, 124u, 9u, 124u, 48u, 57u, 9u, 124u, 48u, 57u, 44u, 44u, 45u, 57u, 48u, 57u, 44u, 57u, 43u, 124u, 9u, 124u, 9u, 124u,
45u, 57u, 48u, 57u, 44u, 44u, 45u, 57u, 48u, 57u, 9u, 124u, 9u, 124u, 44u, 57u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u,
9u, 124u, 43u, 124u, 9u, 124u, 0u, 0u, 9u, 124u, 0 9u, 124u, 9u, 124u, 9u, 124u, 0
}; };
static const char _deserialize_text_glyphs_key_spans[] = { static const char _deserialize_text_glyphs_key_spans[] = {
0, 116, 116, 10, 116, 116, 13, 10, 0, 10, 13, 10, 13, 10, 10, 13,
116, 13, 10, 116, 116, 116, 10, 116, 10, 1, 13, 10, 14, 82, 116, 116,
13, 10, 1, 13, 10, 116, 116, 14, 116, 116, 116, 116, 116, 116, 116, 116,
116, 82, 116, 0, 116 116, 116, 116
}; };
static const short _deserialize_text_glyphs_index_offsets[] = { static const short _deserialize_text_glyphs_index_offsets[] = {
0, 0, 117, 234, 245, 362, 479, 493, 0, 0, 11, 25, 36, 50, 61, 72,
504, 621, 635, 646, 763, 880, 997, 1008, 86, 97, 99, 113, 124, 139, 222, 339,
1125, 1139, 1150, 1152, 1166, 1177, 1294, 1411, 456, 573, 690, 807, 924, 1041, 1158, 1275,
1426, 1543, 1626, 1743, 1744 1392, 1509, 1626
}; };
static const char _deserialize_text_glyphs_indicies[] = { static const char _deserialize_text_glyphs_indicies[] = {
1, 1, 1, 1, 1, 0, 0, 0, 2, 2, 2, 2, 2, 2,
0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 1, 3, 1, 1, 4,
0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5,
1, 0, 0, 2, 0, 0, 0, 0, 5, 1, 6, 7, 7, 7, 7, 7,
0, 0, 0, 3, 4, 0, 0, 0, 7, 7, 7, 7, 1, 8, 1, 1,
0, 0, 0, 0, 0, 0, 0, 0, 9, 10, 10, 10, 10, 10, 10, 10,
0, 0, 0, 0, 0, 5, 0, 0, 10, 10, 1, 11, 12, 12, 12, 12,
6, 0, 0, 0, 0, 0, 0, 0, 12, 12, 12, 12, 12, 1, 13, 14,
0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14,
0, 0, 0, 0, 0, 0, 0, 0, 1, 15, 1, 1, 16, 17, 17, 17,
0, 0, 0, 0, 7, 8, 0, 0, 17, 17, 17, 17, 17, 17, 1, 18,
0, 0, 0, 0, 0, 0, 0, 0, 19, 19, 19, 19, 19, 19, 19, 19,
0, 0, 0, 0, 0, 0, 0, 0, 19, 1, 20, 1, 21, 1, 1, 22,
0, 0, 0, 0, 0, 0, 0, 0, 23, 23, 23, 23, 23, 23, 23, 23,
0, 0, 0, 0, 9, 0, 11, 11, 23, 1, 24, 25, 25, 25, 25, 25,
11, 11, 11, 10, 10, 10, 10, 10, 25, 25, 25, 25, 1, 20, 1, 1,
10, 10, 10, 10, 10, 10, 10, 10, 1, 19, 19, 19, 19, 19, 19, 19,
10, 10, 10, 10, 10, 11, 10, 10, 19, 19, 19, 1, 26, 26, 1, 1,
12, 10, 10, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1,
13, 4, 10, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1, 1, 26, 1,
10, 10, 10, 10, 10, 10, 10, 10, 1, 26, 1, 1, 1, 1, 1, 1,
10, 10, 14, 10, 10, 15, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1,
10, 10, 10, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1,
10, 10, 10, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1, 26, 26, 1,
10, 10, 10, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1,
10, 16, 17, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1,
10, 10, 10, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1,
10, 10, 10, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1, 26, 1, 28,
10, 10, 10, 10, 10, 10, 10, 10, 28, 28, 28, 28, 27, 27, 27, 27,
10, 18, 10, 19, 20, 20, 20, 20, 27, 27, 27, 27, 27, 27, 27, 27,
20, 20, 20, 20, 20, 4, 21, 21, 27, 27, 27, 27, 27, 27, 28, 27,
21, 21, 21, 4, 4, 4, 4, 4, 27, 29, 27, 27, 27, 27, 27, 27,
4, 4, 4, 4, 4, 4, 4, 4, 27, 30, 1, 27, 27, 27, 27, 27,
4, 4, 4, 4, 4, 21, 4, 4, 27, 27, 27, 27, 27, 27, 27, 27,
4, 4, 4, 4, 4, 4, 4, 4, 27, 27, 27, 31, 27, 27, 32, 27,
4, 4, 4, 4, 4, 4, 4, 4, 27, 27, 27, 27, 27, 27, 27, 27,
4, 4, 4, 4, 4, 4, 4, 4, 27, 27, 27, 27, 27, 27, 27, 27,
4, 4, 4, 4, 4, 4, 4, 4, 27, 27, 27, 27, 27, 27, 27, 27,
4, 4, 4, 4, 4, 4, 4, 4, 27, 27, 33, 1, 27, 27, 27, 27,
4, 4, 4, 4, 4, 4, 4, 4, 27, 27, 27, 27, 27, 27, 27, 27,
4, 4, 4, 4, 4, 4, 4, 4, 27, 27, 27, 27, 27, 27, 27, 27,
4, 4, 22, 4, 4, 4, 4, 4, 27, 27, 27, 27, 27, 27, 27, 27,
4, 4, 4, 4, 4, 4, 4, 4, 27, 27, 28, 27, 34, 34, 34, 34,
4, 4, 4, 4, 4, 4, 4, 4, 34, 26, 26, 26, 26, 26, 26, 26,
4, 4, 4, 4, 4, 4, 4, 4, 26, 26, 26, 26, 26, 26, 26, 26,
4, 23, 4, 24, 24, 24, 24, 24, 26, 26, 26, 34, 26, 26, 35, 26,
4, 4, 4, 4, 4, 4, 4, 4, 26, 26, 26, 26, 26, 26, 36, 1,
4, 4, 4, 4, 4, 4, 4, 4, 26, 26, 26, 26, 26, 26, 26, 26,
4, 4, 24, 4, 4, 4, 4, 4, 26, 26, 26, 26, 26, 26, 26, 26,
4, 4, 4, 4, 4, 4, 4, 4, 37, 26, 26, 38, 26, 26, 26, 26,
4, 4, 4, 4, 4, 4, 4, 4, 26, 26, 26, 26, 26, 26, 26, 26,
4, 4, 4, 4, 4, 4, 4, 4, 26, 26, 26, 26, 26, 26, 26, 26,
4, 4, 4, 4, 4, 4, 4, 4, 26, 26, 26, 26, 26, 26, 26, 39,
4, 4, 4, 4, 4, 4, 4, 4, 1, 26, 26, 26, 26, 26, 26, 26,
4, 4, 4, 4, 4, 4, 4, 4, 26, 26, 26, 26, 26, 26, 26, 26,
4, 4, 4, 4, 4, 4, 4, 25, 26, 26, 26, 26, 26, 26, 26, 26,
4, 4, 4, 4, 4, 4, 4, 4, 26, 26, 26, 26, 26, 26, 26, 40,
4, 4, 4, 4, 4, 4, 4, 4, 26, 41, 41, 41, 41, 41, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 26, 4, 1, 1, 1, 1, 1, 1, 1, 1,
27, 4, 4, 28, 29, 29, 29, 29, 41, 1, 1, 1, 1, 1, 1, 1,
29, 29, 29, 29, 29, 4, 30, 31, 1, 1, 1, 1, 1, 1, 1, 1,
31, 31, 31, 31, 31, 31, 31, 31, 1, 1, 1, 1, 1, 1, 1, 1,
4, 32, 32, 32, 32, 32, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
32, 4, 4, 33, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 34, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 42, 1, 43, 43,
4, 4, 4, 4, 4, 4, 4, 4, 43, 43, 43, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 35, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 43, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 36, 4, 37, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 38, 39, 39, 39, 39, 39, 39, 1, 1, 1, 1, 1, 1, 1, 1,
39, 39, 39, 4, 40, 41, 41, 41, 1, 1, 1, 1, 1, 1, 1, 1,
41, 41, 41, 41, 41, 41, 4, 42, 1, 1, 1, 1, 1, 1, 1, 1,
42, 42, 42, 42, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 42, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 43, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 44, 1, 41, 41, 41, 41, 41,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 41, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 44, 4, 4, 4, 4, 1, 1, 45, 45, 45, 45, 45, 45,
4, 4, 4, 4, 4, 4, 4, 4, 45, 45, 45, 45, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 45, 4, 42, 42, 42, 42, 1, 1, 1, 1, 1, 1, 1, 1,
42, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 42, 4, 4, 43, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 41, 41, 41, 41, 41, 1, 1, 1, 1, 1, 1, 42, 1,
41, 41, 41, 41, 41, 4, 4, 4, 46, 46, 46, 46, 46, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 46,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 47, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 48, 1, 1, 1, 1,
44, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 45, 1, 1, 1, 1, 1, 1, 1, 1,
4, 32, 32, 32, 32, 32, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
32, 4, 4, 33, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 34, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
31, 31, 31, 31, 31, 31, 31, 31, 1, 1, 1, 49, 1, 50, 50, 50,
31, 31, 4, 4, 4, 4, 4, 4, 50, 50, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 50, 1, 1, 51,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 35, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 36, 4, 46, 47, 1, 1, 1, 1, 1, 1, 1, 1,
47, 47, 47, 47, 47, 47, 47, 47, 1, 1, 1, 1, 1, 1, 1, 1,
4, 48, 48, 48, 48, 48, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
48, 4, 4, 49, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 50, 4, 4, 4, 4, 52, 1, 50, 50, 50, 50, 50, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
51, 4, 4, 4, 4, 4, 4, 4, 1, 50, 1, 1, 51, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 12, 12, 12, 12, 12, 12, 12,
4, 4, 4, 4, 4, 52, 4, 4, 12, 12, 12, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 53, 4, 54, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 55, 56, 56, 56, 56, 56, 56, 1, 1, 1, 1, 1, 1, 1, 1,
56, 56, 56, 4, 57, 58, 58, 58, 1, 1, 1, 1, 1, 1, 1, 1,
58, 58, 58, 58, 58, 58, 4, 59, 1, 1, 1, 1, 1, 1, 1, 1,
4, 60, 4, 4, 61, 62, 62, 62, 1, 1, 1, 1, 1, 52, 1, 46,
62, 62, 62, 62, 62, 62, 4, 63, 46, 46, 46, 46, 1, 1, 1, 1,
64, 64, 64, 64, 64, 64, 64, 64, 1, 1, 1, 1, 1, 1, 1, 1,
64, 4, 65, 65, 65, 65, 65, 4, 1, 1, 1, 1, 1, 1, 46, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 47, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 48, 1, 1, 1, 7, 7,
4, 65, 4, 4, 66, 4, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7,
4, 4, 4, 4, 67, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 68, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 49, 1, 53, 53, 53, 53,
4, 4, 4, 4, 4, 4, 4, 4, 53, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 69, 4, 65, 1, 1, 1, 1, 1, 1, 1, 1,
65, 65, 65, 65, 4, 4, 4, 4, 1, 1, 1, 53, 1, 1, 54, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 55, 1,
4, 4, 4, 4, 4, 4, 65, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 66, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 67, 4, 4, 4, 4, 64, 64, 1, 1, 1, 56, 1, 1, 1, 1,
64, 64, 64, 64, 64, 64, 64, 64, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 68, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 57,
4, 4, 4, 4, 4, 4, 4, 4, 1, 58, 58, 58, 58, 58, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 69, 4, 59, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
58, 58, 58, 58, 58, 58, 58, 58, 58, 1, 1, 59, 1, 1, 1, 1,
58, 58, 4, 48, 48, 48, 48, 48, 1, 1, 1, 60, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 48, 4, 4, 49, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 50, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 70, 70, 70, 70, 70, 70, 1, 1, 1, 1, 1, 1, 1, 1,
70, 70, 70, 70, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 51, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 52, 1, 1, 1, 1, 61, 1, 58, 58,
4, 4, 4, 4, 4, 4, 4, 4, 58, 58, 58, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 58, 1, 1,
4, 4, 4, 4, 4, 4, 53, 4, 59, 1, 1, 1, 1, 1, 1, 1,
10, 10, 4, 4, 4, 4, 4, 4, 60, 1, 1, 1, 1, 25, 25, 25,
4, 4, 4, 4, 4, 4, 4, 4, 25, 25, 25, 25, 25, 25, 25, 1,
4, 4, 10, 4, 4, 10, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 10, 10, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 10, 4, 21, 21, 21, 21, 21, 1, 61, 1, 53, 53, 53, 53, 53,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 21, 4, 4, 4, 4, 4, 1, 1, 53, 1, 1, 54, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 55, 1, 1,
4, 4, 71, 71, 71, 71, 71, 71, 1, 1, 62, 62, 62, 62, 62, 62,
71, 71, 71, 71, 4, 4, 4, 4, 62, 62, 62, 62, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 56, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 22, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 23, 4, 1, 1, 1, 1, 1, 1, 57, 1,
4, 1, 1, 1, 1, 1, 0, 0, 0
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
1, 0, 0, 2, 0, 0, 0, 0,
0, 0, 0, 3, 4, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 5, 0, 0,
6, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 7, 8, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 9, 0, 0
}; };
static const char _deserialize_text_glyphs_trans_targs[] = { static const char _deserialize_text_glyphs_trans_targs[] = {
2, 1, 3, 6, 0, 14, 16, 25, 16, 0, 18, 3, 19, 22, 19, 22,
27, 28, 2, 2, 3, 6, 14, 16, 5, 20, 21, 20, 21, 23, 26, 8,
25, 27, 28, 4, 26, 5, 27, 28, 9, 12, 9, 12, 10, 11, 24, 25,
5, 27, 28, 7, 8, 13, 8, 13, 24, 25, 15, 15, 14, 1, 2, 6,
5, 3, 9, 27, 28, 10, 11, 12, 7, 13, 15, 1, 2, 6, 7, 13,
11, 12, 5, 3, 27, 28, 15, 24, 14, 17, 14, 17, 14, 18, 17, 1,
5, 3, 6, 16, 27, 28, 17, 18, 4, 14, 17, 1, 14, 17, 1, 2,
23, 18, 23, 19, 20, 21, 22, 21, 7, 14, 17, 1, 2, 14, 26
22, 5, 3, 6, 27, 28, 24, 26
}; };
static const char _deserialize_text_glyphs_trans_actions[] = { static const char _deserialize_text_glyphs_trans_actions[] = {
1, 2, 3, 3, 0, 3, 3, 1, 1, 0, 1, 1, 1, 1, 0, 0,
2, 2, 0, 4, 5, 5, 5, 5, 1, 1, 1, 0, 0, 1, 1, 1,
0, 4, 4, 6, 6, 7, 7, 7, 1, 1, 0, 0, 2, 1, 1, 1,
0, 0, 0, 6, 6, 6, 0, 0, 0, 0, 0, 4, 3, 5, 5, 5,
8, 9, 9, 8, 8, 6, 6, 6, 5, 4, 6, 7, 7, 7, 7, 0,
0, 0, 10, 11, 10, 10, 6, 6, 6, 8, 8, 0, 0, 0, 9, 10,
12, 13, 13, 13, 12, 12, 6, 6, 10, 9, 11, 12, 11, 13, 14, 14,
6, 0, 0, 14, 6, 6, 6, 0, 14, 13, 15, 16, 16, 15, 0
0, 15, 16, 16, 15, 15, 0, 0
}; };
static const int deserialize_text_glyphs_start = 1; static const char _deserialize_text_glyphs_eof_actions[] = {
static const int deserialize_text_glyphs_first_final = 27; 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 3, 6,
8, 0, 8, 9, 11, 11, 9, 13,
15, 15, 13
};
static const int deserialize_text_glyphs_start = 14;
static const int deserialize_text_glyphs_first_final = 14;
static const int deserialize_text_glyphs_error = 0; static const int deserialize_text_glyphs_error = 0;
static const int deserialize_text_glyphs_en_main = 1; static const int deserialize_text_glyphs_en_main = 14;
#line 98 "hb-buffer-deserialize-text-glyphs.rl" #line 98 "hb-buffer-deserialize-text-glyphs.rl"
@ -331,27 +322,39 @@ _hb_buffer_deserialize_text_glyphs (hb_buffer_t *buffer,
const char **end_ptr, const char **end_ptr,
hb_font_t *font) hb_font_t *font)
{ {
const char *p = buf, *pe = buf + buf_len; const char *p = buf, *pe = buf + buf_len, *eof = pe;
/* Ensure we have positions. */ /* Ensure we have positions. */
(void) hb_buffer_get_glyph_positions (buffer, nullptr); (void) hb_buffer_get_glyph_positions (buffer, nullptr);
while (p < pe && ISSPACE (*p)) while (p < pe && ISSPACE (*p))
p++; p++;
if (p < pe && *p == (buffer->len ? ',' : '[')) if (p < pe && *p == (buffer->len ? '|' : '['))
*end_ptr = ++p; *end_ptr = ++p;
const char *end = strchr ((char *) p, ']');
if (end)
pe = eof = end;
else
{
end = strrchr ((char *) p, '|');
if (end)
pe = eof = end;
else
pe = eof = p;
}
const char *tok = nullptr; const char *tok = nullptr;
int cs; int cs;
hb_glyph_info_t info = {0}; hb_glyph_info_t info = {0};
hb_glyph_position_t pos = {0}; hb_glyph_position_t pos = {0};
#line 343 "hb-buffer-deserialize-text-glyphs.hh" #line 346 "hb-buffer-deserialize-text-glyphs.hh"
{ {
cs = deserialize_text_glyphs_start; cs = deserialize_text_glyphs_start;
} }
#line 346 "hb-buffer-deserialize-text-glyphs.hh" #line 349 "hb-buffer-deserialize-text-glyphs.hh"
{ {
int _slen; int _slen;
int _trans; int _trans;
@ -376,13 +379,13 @@ _resume:
goto _again; goto _again;
switch ( _deserialize_text_glyphs_trans_actions[_trans] ) { switch ( _deserialize_text_glyphs_trans_actions[_trans] ) {
case 6: case 1:
#line 51 "hb-buffer-deserialize-text-glyphs.rl" #line 51 "hb-buffer-deserialize-text-glyphs.rl"
{ {
tok = p; tok = p;
} }
break; break;
case 5: case 7:
#line 55 "hb-buffer-deserialize-text-glyphs.rl" #line 55 "hb-buffer-deserialize-text-glyphs.rl"
{ {
/* TODO Unescape delimiters. */ /* TODO Unescape delimiters. */
@ -392,11 +395,11 @@ _resume:
return false; return false;
} }
break; break;
case 13: case 14:
#line 63 "hb-buffer-deserialize-text-glyphs.rl" #line 63 "hb-buffer-deserialize-text-glyphs.rl"
{ if (!parse_uint (tok, p, &info.cluster )) return false; } { if (!parse_uint (tok, p, &info.cluster )) return false; }
break; break;
case 14: case 2:
#line 64 "hb-buffer-deserialize-text-glyphs.rl" #line 64 "hb-buffer-deserialize-text-glyphs.rl"
{ if (!parse_int (tok, p, &pos.x_offset )) return false; } { if (!parse_int (tok, p, &pos.x_offset )) return false; }
break; break;
@ -404,15 +407,15 @@ _resume:
#line 65 "hb-buffer-deserialize-text-glyphs.rl" #line 65 "hb-buffer-deserialize-text-glyphs.rl"
{ if (!parse_int (tok, p, &pos.y_offset )) return false; } { if (!parse_int (tok, p, &pos.y_offset )) return false; }
break; break;
case 9: case 10:
#line 66 "hb-buffer-deserialize-text-glyphs.rl" #line 66 "hb-buffer-deserialize-text-glyphs.rl"
{ if (!parse_int (tok, p, &pos.x_advance)) return false; } { if (!parse_int (tok, p, &pos.x_advance)) return false; }
break; break;
case 11: case 12:
#line 67 "hb-buffer-deserialize-text-glyphs.rl" #line 67 "hb-buffer-deserialize-text-glyphs.rl"
{ if (!parse_int (tok, p, &pos.y_advance)) return false; } { if (!parse_int (tok, p, &pos.y_advance)) return false; }
break; break;
case 1: case 4:
#line 38 "hb-buffer-deserialize-text-glyphs.rl" #line 38 "hb-buffer-deserialize-text-glyphs.rl"
{ {
hb_memset (&info, 0, sizeof (info)); hb_memset (&info, 0, sizeof (info));
@ -423,7 +426,7 @@ _resume:
tok = p; tok = p;
} }
break; break;
case 4: case 6:
#line 55 "hb-buffer-deserialize-text-glyphs.rl" #line 55 "hb-buffer-deserialize-text-glyphs.rl"
{ {
/* TODO Unescape delimiters. */ /* TODO Unescape delimiters. */
@ -441,7 +444,7 @@ _resume:
*end_ptr = p; *end_ptr = p;
} }
break; break;
case 12: case 13:
#line 63 "hb-buffer-deserialize-text-glyphs.rl" #line 63 "hb-buffer-deserialize-text-glyphs.rl"
{ if (!parse_uint (tok, p, &info.cluster )) return false; } { if (!parse_uint (tok, p, &info.cluster )) return false; }
#line 43 "hb-buffer-deserialize-text-glyphs.rl" #line 43 "hb-buffer-deserialize-text-glyphs.rl"
@ -465,7 +468,7 @@ _resume:
*end_ptr = p; *end_ptr = p;
} }
break; break;
case 8: case 9:
#line 66 "hb-buffer-deserialize-text-glyphs.rl" #line 66 "hb-buffer-deserialize-text-glyphs.rl"
{ if (!parse_int (tok, p, &pos.x_advance)) return false; } { if (!parse_int (tok, p, &pos.x_advance)) return false; }
#line 43 "hb-buffer-deserialize-text-glyphs.rl" #line 43 "hb-buffer-deserialize-text-glyphs.rl"
@ -477,7 +480,7 @@ _resume:
*end_ptr = p; *end_ptr = p;
} }
break; break;
case 10: case 11:
#line 67 "hb-buffer-deserialize-text-glyphs.rl" #line 67 "hb-buffer-deserialize-text-glyphs.rl"
{ if (!parse_int (tok, p, &pos.y_advance)) return false; } { if (!parse_int (tok, p, &pos.y_advance)) return false; }
#line 43 "hb-buffer-deserialize-text-glyphs.rl" #line 43 "hb-buffer-deserialize-text-glyphs.rl"
@ -489,7 +492,143 @@ _resume:
*end_ptr = p; *end_ptr = p;
} }
break; break;
case 7: case 8:
#line 68 "hb-buffer-deserialize-text-glyphs.rl"
{ if (!parse_uint (tok, p, &info.mask )) return false; }
#line 43 "hb-buffer-deserialize-text-glyphs.rl"
{
buffer->add_info (info);
if (unlikely (!buffer->successful))
return false;
buffer->pos[buffer->len - 1] = pos;
*end_ptr = p;
}
break;
case 5:
#line 38 "hb-buffer-deserialize-text-glyphs.rl"
{
hb_memset (&info, 0, sizeof (info));
hb_memset (&pos , 0, sizeof (pos ));
}
#line 51 "hb-buffer-deserialize-text-glyphs.rl"
{
tok = p;
}
#line 55 "hb-buffer-deserialize-text-glyphs.rl"
{
/* TODO Unescape delimiters. */
if (!hb_font_glyph_from_string (font,
tok, p - tok,
&info.codepoint))
return false;
}
break;
case 3:
#line 38 "hb-buffer-deserialize-text-glyphs.rl"
{
hb_memset (&info, 0, sizeof (info));
hb_memset (&pos , 0, sizeof (pos ));
}
#line 51 "hb-buffer-deserialize-text-glyphs.rl"
{
tok = p;
}
#line 55 "hb-buffer-deserialize-text-glyphs.rl"
{
/* TODO Unescape delimiters. */
if (!hb_font_glyph_from_string (font,
tok, p - tok,
&info.codepoint))
return false;
}
#line 43 "hb-buffer-deserialize-text-glyphs.rl"
{
buffer->add_info (info);
if (unlikely (!buffer->successful))
return false;
buffer->pos[buffer->len - 1] = pos;
*end_ptr = p;
}
break;
#line 516 "hb-buffer-deserialize-text-glyphs.hh"
}
_again:
if ( cs == 0 )
goto _out;
if ( ++p != pe )
goto _resume;
_test_eof: {}
if ( p == eof )
{
switch ( _deserialize_text_glyphs_eof_actions[cs] ) {
case 6:
#line 55 "hb-buffer-deserialize-text-glyphs.rl"
{
/* TODO Unescape delimiters. */
if (!hb_font_glyph_from_string (font,
tok, p - tok,
&info.codepoint))
return false;
}
#line 43 "hb-buffer-deserialize-text-glyphs.rl"
{
buffer->add_info (info);
if (unlikely (!buffer->successful))
return false;
buffer->pos[buffer->len - 1] = pos;
*end_ptr = p;
}
break;
case 13:
#line 63 "hb-buffer-deserialize-text-glyphs.rl"
{ if (!parse_uint (tok, p, &info.cluster )) return false; }
#line 43 "hb-buffer-deserialize-text-glyphs.rl"
{
buffer->add_info (info);
if (unlikely (!buffer->successful))
return false;
buffer->pos[buffer->len - 1] = pos;
*end_ptr = p;
}
break;
case 15:
#line 65 "hb-buffer-deserialize-text-glyphs.rl"
{ if (!parse_int (tok, p, &pos.y_offset )) return false; }
#line 43 "hb-buffer-deserialize-text-glyphs.rl"
{
buffer->add_info (info);
if (unlikely (!buffer->successful))
return false;
buffer->pos[buffer->len - 1] = pos;
*end_ptr = p;
}
break;
case 9:
#line 66 "hb-buffer-deserialize-text-glyphs.rl"
{ if (!parse_int (tok, p, &pos.x_advance)) return false; }
#line 43 "hb-buffer-deserialize-text-glyphs.rl"
{
buffer->add_info (info);
if (unlikely (!buffer->successful))
return false;
buffer->pos[buffer->len - 1] = pos;
*end_ptr = p;
}
break;
case 11:
#line 67 "hb-buffer-deserialize-text-glyphs.rl"
{ if (!parse_int (tok, p, &pos.y_advance)) return false; }
#line 43 "hb-buffer-deserialize-text-glyphs.rl"
{
buffer->add_info (info);
if (unlikely (!buffer->successful))
return false;
buffer->pos[buffer->len - 1] = pos;
*end_ptr = p;
}
break;
case 8:
#line 68 "hb-buffer-deserialize-text-glyphs.rl" #line 68 "hb-buffer-deserialize-text-glyphs.rl"
{ if (!parse_uint (tok, p, &info.mask )) return false; } { if (!parse_uint (tok, p, &info.mask )) return false; }
#line 43 "hb-buffer-deserialize-text-glyphs.rl" #line 43 "hb-buffer-deserialize-text-glyphs.rl"
@ -511,25 +650,6 @@ _resume:
{ {
tok = p; tok = p;
} }
#line 55 "hb-buffer-deserialize-text-glyphs.rl"
{
/* TODO Unescape delimiters. */
if (!hb_font_glyph_from_string (font,
tok, p - tok,
&info.codepoint))
return false;
}
break;
case 2:
#line 38 "hb-buffer-deserialize-text-glyphs.rl"
{
hb_memset (&info, 0, sizeof (info));
hb_memset (&pos , 0, sizeof (pos ));
}
#line 51 "hb-buffer-deserialize-text-glyphs.rl"
{
tok = p;
}
#line 55 "hb-buffer-deserialize-text-glyphs.rl" #line 55 "hb-buffer-deserialize-text-glyphs.rl"
{ {
/* TODO Unescape delimiters. */ /* TODO Unescape delimiters. */
@ -547,24 +667,19 @@ _resume:
*end_ptr = p; *end_ptr = p;
} }
break; break;
#line 513 "hb-buffer-deserialize-text-glyphs.hh" #line 616 "hb-buffer-deserialize-text-glyphs.hh"
}
} }
_again:
if ( cs == 0 )
goto _out;
if ( ++p != pe )
goto _resume;
_test_eof: {}
_out: {} _out: {}
} }
#line 124 "hb-buffer-deserialize-text-glyphs.rl" #line 136 "hb-buffer-deserialize-text-glyphs.rl"
*end_ptr = p; *end_ptr = p;
return p == pe && *(p-1) != ']'; return p == pe;
} }
#endif /* HB_BUFFER_DESERIALIZE_TEXT_GLYPHS_HH */ #endif /* HB_BUFFER_DESERIALIZE_TEXT_GLYPHS_HH */

20
src/hb-buffer-deserialize-text-glyphs.rl
View File

@ -91,7 +91,7 @@ glyph_item =
%add_item %add_item
; ;
glyphs = glyph_item (space* '|' space* glyph_item)* space* ('|'|']'); glyphs = glyph_item (space* '|' space* glyph_item)* space*;
main := space* glyphs; main := space* glyphs;
@ -104,16 +104,28 @@ _hb_buffer_deserialize_text_glyphs (hb_buffer_t *buffer,
const char **end_ptr, const char **end_ptr,
hb_font_t *font) hb_font_t *font)
{ {
const char *p = buf, *pe = buf + buf_len; const char *p = buf, *pe = buf + buf_len, *eof = pe;
/* Ensure we have positions. */ /* Ensure we have positions. */
(void) hb_buffer_get_glyph_positions (buffer, nullptr); (void) hb_buffer_get_glyph_positions (buffer, nullptr);
while (p < pe && ISSPACE (*p)) while (p < pe && ISSPACE (*p))
p++; p++;
if (p < pe && *p == (buffer->len ? ',' : '[')) if (p < pe && *p == (buffer->len ? '|' : '['))
*end_ptr = ++p; *end_ptr = ++p;
const char *end = strchr ((char *) p, ']');
if (end)
pe = eof = end;
else
{
end = strrchr ((char *) p, '|');
if (end)
pe = eof = end;
else
pe = eof = p;
}
const char *tok = nullptr; const char *tok = nullptr;
int cs; int cs;
hb_glyph_info_t info = {0}; hb_glyph_info_t info = {0};
@ -125,7 +137,7 @@ _hb_buffer_deserialize_text_glyphs (hb_buffer_t *buffer,
*end_ptr = p; *end_ptr = p;
return p == pe && *(p-1) != ']'; return p == pe;
} }
#endif /* HB_BUFFER_DESERIALIZE_TEXT_GLYPHS_HH */ #endif /* HB_BUFFER_DESERIALIZE_TEXT_GLYPHS_HH */

27
src/hb-buffer-deserialize-text-unicode.hh
View File

@ -183,24 +183,37 @@ _hb_buffer_deserialize_text_unicode (hb_buffer_t *buffer,
const char **end_ptr, const char **end_ptr,
hb_font_t *font) hb_font_t *font)
{ {
const char *p = buf, *pe = buf + buf_len; const char *p = buf, *pe = buf + buf_len, *eof = pe;
while (p < pe && ISSPACE (*p)) while (p < pe && ISSPACE (*p))
p++; p++;
if (p < pe && *p == (buffer->len ? ',' : '<')) if (p < pe && *p == (buffer->len ? '|' : '<'))
*end_ptr = ++p; *end_ptr = ++p;
const char *end = strchr ((char *) p, ']');
if (end)
pe = eof = end;
else
{
end = strrchr ((char *) p, '|');
if (end)
pe = eof = end;
else
pe = eof = p;
}
const char *tok = nullptr; const char *tok = nullptr;
int cs; int cs;
hb_glyph_info_t info = {0}; hb_glyph_info_t info = {0};
const hb_glyph_position_t pos = {0}; const hb_glyph_position_t pos = {0};
#line 192 "hb-buffer-deserialize-text-unicode.hh" #line 205 "hb-buffer-deserialize-text-unicode.hh"
{ {
cs = deserialize_text_unicode_start; cs = deserialize_text_unicode_start;
} }
#line 195 "hb-buffer-deserialize-text-unicode.hh" #line 208 "hb-buffer-deserialize-text-unicode.hh"
{ {
int _slen; int _slen;
int _trans; int _trans;
@ -267,7 +280,7 @@ _resume:
*end_ptr = p; *end_ptr = p;
} }
break; break;
#line 254 "hb-buffer-deserialize-text-unicode.hh" #line 267 "hb-buffer-deserialize-text-unicode.hh"
} }
_again: _again:
@ -279,12 +292,12 @@ _again:
_out: {} _out: {}
} }
#line 102 "hb-buffer-deserialize-text-unicode.rl" #line 115 "hb-buffer-deserialize-text-unicode.rl"
*end_ptr = p; *end_ptr = p;
return p == pe && *(p-1) != ']'; return p == pe;
} }
#endif /* HB_BUFFER_DESERIALIZE_TEXT_UNICODE_HH */ #endif /* HB_BUFFER_DESERIALIZE_TEXT_UNICODE_HH */

19
src/hb-buffer-deserialize-text-unicode.rl
View File

@ -85,13 +85,26 @@ _hb_buffer_deserialize_text_unicode (hb_buffer_t *buffer,
const char **end_ptr, const char **end_ptr,
hb_font_t *font) hb_font_t *font)
{ {
const char *p = buf, *pe = buf + buf_len; const char *p = buf, *pe = buf + buf_len, *eof = pe;
while (p < pe && ISSPACE (*p)) while (p < pe && ISSPACE (*p))
p++; p++;
if (p < pe && *p == (buffer->len ? ',' : '<')) if (p < pe && *p == (buffer->len ? '|' : '<'))
*end_ptr = ++p; *end_ptr = ++p;
const char *end = strchr ((char *) p, ']');
if (end)
pe = eof = end;
else
{
end = strrchr ((char *) p, '|');
if (end)
pe = eof = end;
else
pe = eof = p;
}
const char *tok = nullptr; const char *tok = nullptr;
int cs; int cs;
hb_glyph_info_t info = {0}; hb_glyph_info_t info = {0};
@ -103,7 +116,7 @@ _hb_buffer_deserialize_text_unicode (hb_buffer_t *buffer,
*end_ptr = p; *end_ptr = p;
return p == pe && *(p-1) != ']'; return p == pe;
} }
#endif /* HB_BUFFER_DESERIALIZE_TEXT_UNICODE_HH */ #endif /* HB_BUFFER_DESERIALIZE_TEXT_UNICODE_HH */

6
src/hb-buffer-serialize.cc
View File

@ -737,7 +737,8 @@ parse_hex (const char *pp, const char *end, uint32_t *pv)
* Deserializes glyphs @buffer from textual representation in the format * Deserializes glyphs @buffer from textual representation in the format
* produced by hb_buffer_serialize_glyphs(). * produced by hb_buffer_serialize_glyphs().
* *
* Return value: `true` if @buf is not fully consumed, `false` otherwise. * Return value: `true` if parse was successful, `false` if an error
* occurred.
* *
* Since: 0.9.7 * Since: 0.9.7
**/ **/
@ -809,7 +810,8 @@ hb_buffer_deserialize_glyphs (hb_buffer_t *buffer,
* Deserializes Unicode @buffer from textual representation in the format * Deserializes Unicode @buffer from textual representation in the format
* produced by hb_buffer_serialize_unicode(). * produced by hb_buffer_serialize_unicode().
* *
* Return value: `true` if @buf is not fully consumed, `false` otherwise. * Return value: `true` if parse was successful, `false` if an error
* occurred.
* *
* Since: 2.7.3 * Since: 2.7.3
**/ **/

23
src/test-buffer-serialize.cc
View File

@ -65,14 +65,31 @@ main (int argc, char **argv)
{ {
hb_buffer_clear_contents (buf); hb_buffer_clear_contents (buf);
while (true)
{
const char *p = line; const char *p = line;
while (hb_buffer_deserialize_glyphs (buf, if (!hb_buffer_deserialize_glyphs (buf,
p, -1, &p, p, -1, &p,
font, font,
HB_BUFFER_SERIALIZE_FORMAT_TEXT)) HB_BUFFER_SERIALIZE_FORMAT_TEXT))
; {
if (*p && *p != '\n')
ret = false; ret = false;
break;
}
if (*p == ']' || *p == '\n')
break;
if (p == line)
{
ret = false;
break;
}
unsigned len = strlen (p);
memmove (line, p, len);
if (!fgets (line + len, sizeof(line) - len, stdin))
line[len] = '\0';
}
unsigned count = hb_buffer_get_length (buf); unsigned count = hb_buffer_get_length (buf);
for (unsigned offset = 0; offset < count;) for (unsigned offset = 0; offset < count;)