mirror of
https://github.com/harfbuzz/harfbuzz.git
synced 2025-04-05 21:45:06 +00:00
[buffer-deserialize] Fix return value and parsing
I think I got it right. Alternative to https://github.com/harfbuzz/harfbuzz/pull/5028
This commit is contained in:
Behdad Esfahbod
parent
c2e92b6f7b
commit
7a912c4746
14 changed files with 777 additions and 1173 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -101,12 +101,12 @@ element = glyph @ensure_glyphs
|
|||
| yadvance
|
||||
| glyphflags;
|
||||
item =
|
||||
( '{' space* element (comma element)* space* '}')
|
||||
( '{' space* element (comma element)* space* '}' space* (','|']') space* )
|
||||
>clear_item
|
||||
@add_item
|
||||
;
|
||||
|
||||
main := space* '['? space* item (comma item)* space* (','|']')?;
|
||||
main := space* '['? space* item*;
|
||||
|
||||
}%%
|
||||
|
||||
|
|
@ -133,7 +133,7 @@ _hb_buffer_deserialize_json (hb_buffer_t *buffer,
|
|||
|
||||
*end_ptr = p;
|
||||
|
||||
return p == pe && *(p-1) != ']';
|
||||
return p == pe;
|
||||
}
|
||||
|
||||
#endif /* HB_BUFFER_DESERIALIZE_JSON_HH */
|
||||
|
|
|
|||
|
|
@ -34,285 +34,247 @@
|
|||
|
||||
#line 33 "hb-buffer-deserialize-text-glyphs.hh"
|
||||
static const unsigned char _deserialize_text_glyphs_trans_keys[] = {
|
||||
0u, 0u, 48u, 57u, 45u, 57u, 48u, 57u, 45u, 57u, 48u, 57u, 48u, 57u, 45u, 57u,
|
||||
48u, 57u, 44u, 44u, 45u, 57u, 48u, 57u, 44u, 57u, 43u, 124u, 9u, 124u, 9u, 124u,
|
||||
9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u,
|
||||
9u, 124u, 9u, 124u, 9u, 124u, 0
|
||||
0u, 0u, 35u, 124u, 48u, 57u, 93u, 124u, 45u, 57u, 48u, 57u, 35u, 124u, 45u, 57u,
|
||||
48u, 57u, 35u, 124u, 35u, 124u, 35u, 124u, 48u, 57u, 35u, 124u, 45u, 57u, 48u, 57u,
|
||||
44u, 44u, 45u, 57u, 48u, 57u, 35u, 124u, 35u, 124u, 44u, 57u, 35u, 124u, 43u, 124u,
|
||||
48u, 124u, 35u, 124u, 35u, 124u, 35u, 124u, 0
|
||||
};
|
||||
|
||||
static const char _deserialize_text_glyphs_key_spans[] = {
|
||||
0, 10, 13, 10, 13, 10, 10, 13,
|
||||
10, 1, 13, 10, 14, 82, 116, 116,
|
||||
116, 116, 116, 116, 116, 116, 116, 116,
|
||||
116, 116, 116
|
||||
0, 90, 10, 32, 13, 10, 90, 13,
|
||||
10, 90, 90, 90, 10, 90, 13, 10,
|
||||
1, 13, 10, 90, 90, 14, 90, 82,
|
||||
77, 90, 90, 90
|
||||
};
|
||||
|
||||
static const short _deserialize_text_glyphs_index_offsets[] = {
|
||||
0, 0, 11, 25, 36, 50, 61, 72,
|
||||
86, 97, 99, 113, 124, 139, 222, 339,
|
||||
456, 573, 690, 807, 924, 1041, 1158, 1275,
|
||||
1392, 1509, 1626
|
||||
0, 0, 91, 102, 135, 149, 160, 251,
|
||||
265, 276, 367, 458, 549, 560, 651, 665,
|
||||
676, 678, 692, 703, 794, 885, 900, 991,
|
||||
1074, 1152, 1243, 1334
|
||||
};
|
||||
|
||||
static const char _deserialize_text_glyphs_indicies[] = {
|
||||
0, 2, 2, 2, 2, 2, 2,
|
||||
2, 2, 2, 1, 3, 1, 1, 4,
|
||||
5, 5, 5, 5, 5, 5, 5, 5,
|
||||
5, 1, 6, 7, 7, 7, 7, 7,
|
||||
7, 7, 7, 7, 1, 8, 1, 1,
|
||||
9, 10, 10, 10, 10, 10, 10, 10,
|
||||
10, 10, 1, 11, 12, 12, 12, 12,
|
||||
12, 12, 12, 12, 12, 1, 13, 14,
|
||||
14, 14, 14, 14, 14, 14, 14, 14,
|
||||
1, 15, 1, 1, 16, 17, 17, 17,
|
||||
17, 17, 17, 17, 17, 17, 1, 18,
|
||||
19, 19, 19, 19, 19, 19, 19, 19,
|
||||
19, 1, 20, 1, 21, 1, 1, 22,
|
||||
23, 23, 23, 23, 23, 23, 23, 23,
|
||||
23, 1, 24, 25, 25, 25, 25, 25,
|
||||
25, 25, 25, 25, 1, 20, 1, 1,
|
||||
1, 19, 19, 19, 19, 19, 19, 19,
|
||||
19, 19, 19, 1, 26, 26, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 26, 1,
|
||||
1, 26, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 26, 26, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 26, 1, 28,
|
||||
28, 28, 28, 28, 27, 27, 27, 27,
|
||||
1, 0, 0, 0, 0, 0, 0,
|
||||
0, 2, 3, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 4, 0, 0, 5, 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, 6, 7, 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, 7, 0, 8, 9, 9, 9,
|
||||
9, 9, 9, 9, 9, 9, 3, 10,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 10, 3,
|
||||
11, 3, 3, 12, 13, 13, 13, 13,
|
||||
13, 13, 13, 13, 13, 3, 14, 15,
|
||||
15, 15, 15, 15, 15, 15, 15, 15,
|
||||
3, 16, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 17, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 18, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 18, 3, 19, 3, 3, 20,
|
||||
21, 21, 21, 21, 21, 21, 21, 21,
|
||||
21, 3, 22, 23, 23, 23, 23, 23,
|
||||
23, 23, 23, 23, 3, 24, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 25,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 25, 3,
|
||||
24, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 23, 23, 23,
|
||||
23, 23, 23, 23, 23, 23, 23, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 25, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 25, 3, 16, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 17, 3, 3, 3,
|
||||
15, 15, 15, 15, 15, 15, 15, 15,
|
||||
15, 15, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 18, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 18, 3, 26, 27,
|
||||
27, 27, 27, 27, 27, 27, 27, 27,
|
||||
27, 27, 27, 27, 27, 27, 28, 27,
|
||||
27, 29, 27, 27, 27, 27, 27, 27,
|
||||
27, 30, 1, 27, 27, 27, 27, 27,
|
||||
27, 27, 27, 27, 27, 27, 27, 27,
|
||||
27, 27, 27, 31, 27, 27, 32, 27,
|
||||
27, 27, 27, 27, 27, 27, 27, 27,
|
||||
27, 27, 27, 27, 27, 27, 27, 27,
|
||||
27, 27, 27, 27, 27, 27, 27, 27,
|
||||
27, 27, 33, 1, 27, 27, 27, 27,
|
||||
27, 27, 27, 27, 27, 27, 27, 27,
|
||||
27, 27, 27, 27, 27, 27, 27, 27,
|
||||
27, 27, 27, 27, 27, 27, 27, 27,
|
||||
27, 27, 28, 27, 34, 34, 34, 34,
|
||||
34, 26, 26, 26, 26, 26, 26, 26,
|
||||
26, 26, 26, 26, 26, 26, 26, 26,
|
||||
26, 26, 26, 34, 26, 26, 35, 26,
|
||||
26, 26, 26, 26, 26, 26, 36, 1,
|
||||
26, 26, 26, 26, 26, 26, 26, 26,
|
||||
26, 26, 26, 26, 26, 26, 26, 26,
|
||||
37, 26, 26, 38, 26, 26, 26, 26,
|
||||
26, 26, 26, 26, 26, 26, 26, 26,
|
||||
26, 26, 26, 26, 26, 26, 26, 26,
|
||||
26, 26, 26, 26, 26, 26, 26, 39,
|
||||
1, 26, 26, 26, 26, 26, 26, 26,
|
||||
26, 26, 26, 26, 26, 26, 26, 26,
|
||||
26, 26, 26, 26, 26, 26, 26, 26,
|
||||
26, 26, 26, 26, 26, 26, 26, 40,
|
||||
26, 41, 41, 41, 41, 41, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
41, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 42, 1, 43, 43,
|
||||
43, 43, 43, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 43, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 44, 1, 41, 41, 41, 41, 41,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 41, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 45, 45, 45, 45, 45, 45,
|
||||
45, 45, 45, 45, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 42, 1,
|
||||
46, 46, 46, 46, 46, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 46,
|
||||
1, 1, 47, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 48, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 49, 1, 50, 50, 50,
|
||||
50, 50, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 50, 1, 1, 51,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
52, 1, 50, 50, 50, 50, 50, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 50, 1, 1, 51, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 12, 12, 12, 12, 12, 12, 12,
|
||||
12, 12, 12, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 52, 1, 46,
|
||||
46, 46, 46, 46, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 46, 1,
|
||||
1, 47, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 48, 1, 1, 1, 7, 7,
|
||||
7, 7, 7, 7, 7, 7, 7, 7,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 49, 1, 53, 53, 53, 53,
|
||||
53, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 53, 1, 1, 54, 1,
|
||||
1, 1, 1, 1, 1, 1, 55, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 56, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 57,
|
||||
1, 58, 58, 58, 58, 58, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
58, 1, 1, 59, 1, 1, 1, 1,
|
||||
1, 1, 1, 60, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 61, 1, 58, 58,
|
||||
58, 58, 58, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 58, 1, 1,
|
||||
59, 1, 1, 1, 1, 1, 1, 1,
|
||||
60, 1, 1, 1, 1, 25, 25, 25,
|
||||
25, 25, 25, 25, 25, 25, 25, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 61, 1, 53, 53, 53, 53, 53,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 53, 1, 1, 54, 1, 1,
|
||||
1, 1, 1, 1, 1, 55, 1, 1,
|
||||
1, 1, 62, 62, 62, 62, 62, 62,
|
||||
62, 62, 62, 62, 1, 1, 1, 1,
|
||||
1, 1, 56, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 57, 1,
|
||||
0
|
||||
3, 28, 3, 3, 3, 3, 3, 3,
|
||||
3, 29, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 30, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 31, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 31, 3, 32, 3, 3, 33,
|
||||
34, 34, 34, 34, 34, 34, 34, 34,
|
||||
34, 3, 35, 36, 36, 36, 36, 36,
|
||||
36, 36, 36, 36, 3, 37, 3, 38,
|
||||
3, 3, 39, 40, 40, 40, 40, 40,
|
||||
40, 40, 40, 40, 3, 41, 42, 42,
|
||||
42, 42, 42, 42, 42, 42, 42, 3,
|
||||
43, 3, 3, 3, 3, 3, 3, 3,
|
||||
44, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 45, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 45, 3, 43, 3, 3, 3, 3,
|
||||
3, 3, 3, 44, 3, 3, 3, 3,
|
||||
42, 42, 42, 42, 42, 42, 42, 42,
|
||||
42, 42, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 45, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 45, 3, 37, 3,
|
||||
3, 3, 36, 36, 36, 36, 36, 36,
|
||||
36, 36, 36, 36, 3, 28, 3, 3,
|
||||
3, 3, 3, 3, 3, 29, 3, 3,
|
||||
3, 3, 46, 46, 46, 46, 46, 46,
|
||||
46, 46, 46, 46, 3, 3, 3, 3,
|
||||
3, 3, 30, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 31,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 31, 3,
|
||||
0, 0, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 0, 3, 3, 0, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 0, 0, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 0, 3, 47, 47, 47, 47, 47,
|
||||
47, 47, 47, 47, 47, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
10, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 10,
|
||||
3, 49, 48, 48, 48, 48, 48, 48,
|
||||
48, 50, 3, 48, 48, 48, 48, 48,
|
||||
48, 48, 48, 48, 48, 48, 48, 48,
|
||||
48, 48, 48, 51, 48, 48, 52, 48,
|
||||
48, 48, 48, 48, 48, 48, 48, 48,
|
||||
48, 48, 48, 48, 48, 48, 48, 48,
|
||||
48, 48, 48, 48, 48, 48, 48, 48,
|
||||
48, 53, 54, 55, 48, 48, 48, 48,
|
||||
48, 48, 48, 48, 48, 48, 48, 48,
|
||||
48, 48, 48, 48, 48, 48, 48, 48,
|
||||
48, 48, 48, 48, 48, 48, 48, 48,
|
||||
48, 48, 55, 48, 57, 56, 56, 56,
|
||||
56, 56, 56, 56, 58, 3, 56, 56,
|
||||
56, 56, 56, 56, 56, 56, 56, 56,
|
||||
56, 56, 56, 56, 56, 56, 59, 56,
|
||||
56, 60, 56, 56, 56, 56, 56, 56,
|
||||
56, 56, 56, 56, 56, 56, 56, 56,
|
||||
56, 56, 56, 56, 56, 56, 56, 56,
|
||||
56, 56, 56, 56, 56, 61, 62, 56,
|
||||
56, 56, 56, 56, 56, 56, 56, 56,
|
||||
56, 56, 56, 56, 56, 56, 56, 56,
|
||||
56, 56, 56, 56, 56, 56, 56, 56,
|
||||
56, 56, 56, 56, 56, 62, 56, 63,
|
||||
48, 48, 48, 48, 48, 48, 48, 64,
|
||||
3, 48, 48, 48, 48, 48, 48, 48,
|
||||
48, 48, 48, 48, 48, 48, 48, 48,
|
||||
48, 65, 48, 48, 66, 48, 48, 48,
|
||||
48, 48, 48, 48, 48, 48, 48, 48,
|
||||
48, 48, 48, 48, 48, 48, 48, 48,
|
||||
48, 48, 48, 48, 48, 48, 48, 48,
|
||||
54, 67, 48, 48, 48, 48, 48, 48,
|
||||
48, 48, 48, 48, 48, 48, 48, 48,
|
||||
48, 48, 48, 48, 48, 48, 48, 48,
|
||||
48, 48, 48, 48, 48, 48, 48, 48,
|
||||
67, 48, 0
|
||||
};
|
||||
|
||||
static const char _deserialize_text_glyphs_trans_targs[] = {
|
||||
16, 0, 18, 3, 19, 22, 19, 22,
|
||||
5, 20, 21, 20, 21, 23, 26, 8,
|
||||
9, 12, 9, 12, 10, 11, 24, 25,
|
||||
24, 25, 15, 15, 14, 1, 2, 6,
|
||||
7, 13, 15, 1, 2, 6, 7, 13,
|
||||
14, 17, 14, 17, 14, 18, 17, 1,
|
||||
4, 14, 17, 1, 14, 17, 1, 2,
|
||||
7, 14, 17, 1, 2, 14, 26
|
||||
1, 2, 4, 0, 12, 14, 23, 26,
|
||||
3, 24, 26, 5, 6, 11, 6, 11,
|
||||
2, 7, 26, 8, 9, 10, 9, 10,
|
||||
2, 26, 13, 22, 2, 4, 14, 26,
|
||||
15, 16, 21, 16, 21, 17, 18, 19,
|
||||
20, 19, 20, 2, 4, 26, 22, 24,
|
||||
1, 2, 4, 12, 14, 27, 23, 26,
|
||||
1, 2, 4, 12, 14, 23, 26, 2,
|
||||
4, 12, 14, 26
|
||||
};
|
||||
|
||||
static const char _deserialize_text_glyphs_trans_actions[] = {
|
||||
1, 0, 1, 1, 1, 1, 0, 0,
|
||||
1, 1, 1, 0, 0, 1, 1, 1,
|
||||
1, 1, 0, 0, 2, 1, 1, 1,
|
||||
0, 0, 0, 4, 3, 5, 5, 5,
|
||||
5, 4, 6, 7, 7, 7, 7, 0,
|
||||
6, 8, 8, 0, 0, 0, 9, 10,
|
||||
10, 9, 11, 12, 11, 13, 14, 14,
|
||||
14, 13, 15, 16, 16, 15, 0
|
||||
0, 1, 1, 0, 1, 1, 0, 1,
|
||||
2, 2, 3, 2, 2, 2, 0, 0,
|
||||
4, 4, 4, 2, 2, 2, 0, 0,
|
||||
5, 5, 2, 2, 6, 6, 6, 6,
|
||||
2, 2, 2, 0, 0, 7, 2, 2,
|
||||
2, 0, 0, 8, 8, 8, 0, 0,
|
||||
9, 10, 10, 10, 10, 9, 9, 10,
|
||||
12, 13, 13, 13, 13, 12, 13, 14,
|
||||
14, 14, 14, 14
|
||||
};
|
||||
|
||||
static const char _deserialize_text_glyphs_eof_actions[] = {
|
||||
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
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 11, 0
|
||||
};
|
||||
|
||||
static const int deserialize_text_glyphs_start = 14;
|
||||
static const int deserialize_text_glyphs_first_final = 14;
|
||||
static const int deserialize_text_glyphs_start = 25;
|
||||
static const int deserialize_text_glyphs_first_final = 25;
|
||||
static const int deserialize_text_glyphs_error = 0;
|
||||
|
||||
static const int deserialize_text_glyphs_en_main = 14;
|
||||
static const int deserialize_text_glyphs_en_main = 25;
|
||||
|
||||
|
||||
#line 98 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
#line 99 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
|
||||
|
||||
static hb_bool_t
|
||||
|
|
@ -322,39 +284,22 @@ _hb_buffer_deserialize_text_glyphs (hb_buffer_t *buffer,
|
|||
const char **end_ptr,
|
||||
hb_font_t *font)
|
||||
{
|
||||
const char *p = buf, *pe = buf + buf_len, *eof = pe, *orig_pe = pe;
|
||||
const char *p = buf, *pe = buf + buf_len, *eof = pe;
|
||||
|
||||
/* Ensure we have positions. */
|
||||
(void) hb_buffer_get_glyph_positions (buffer, nullptr);
|
||||
|
||||
while (p < pe && ISSPACE (*p))
|
||||
p++;
|
||||
if (p < pe && *p == (buffer->len ? '|' : '['))
|
||||
*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;
|
||||
int cs;
|
||||
hb_glyph_info_t info = {0};
|
||||
hb_glyph_position_t pos = {0};
|
||||
|
||||
#line 346 "hb-buffer-deserialize-text-glyphs.hh"
|
||||
#line 291 "hb-buffer-deserialize-text-glyphs.hh"
|
||||
{
|
||||
cs = deserialize_text_glyphs_start;
|
||||
}
|
||||
|
||||
#line 349 "hb-buffer-deserialize-text-glyphs.hh"
|
||||
#line 294 "hb-buffer-deserialize-text-glyphs.hh"
|
||||
{
|
||||
int _slen;
|
||||
int _trans;
|
||||
|
|
@ -379,13 +324,13 @@ _resume:
|
|||
goto _again;
|
||||
|
||||
switch ( _deserialize_text_glyphs_trans_actions[_trans] ) {
|
||||
case 1:
|
||||
case 2:
|
||||
#line 51 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
{
|
||||
tok = p;
|
||||
}
|
||||
break;
|
||||
case 7:
|
||||
case 1:
|
||||
#line 55 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
{
|
||||
/* TODO Unescape delimiters. */
|
||||
|
|
@ -393,40 +338,53 @@ _resume:
|
|||
tok, p - tok,
|
||||
&info.codepoint))
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 14:
|
||||
#line 63 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
{ if (!parse_uint (tok, p, &info.cluster )) return false; }
|
||||
break;
|
||||
case 2:
|
||||
#line 64 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
{ if (!parse_int (tok, p, &pos.x_offset )) return false; }
|
||||
break;
|
||||
case 16:
|
||||
#line 65 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
{ if (!parse_int (tok, p, &pos.y_offset )) return false; }
|
||||
break;
|
||||
case 10:
|
||||
#line 66 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
{ if (!parse_int (tok, p, &pos.x_advance)) return false; }
|
||||
break;
|
||||
case 12:
|
||||
#line 67 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
{ if (!parse_int (tok, p, &pos.y_advance)) return false; }
|
||||
break;
|
||||
case 4:
|
||||
#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;
|
||||
}
|
||||
break;
|
||||
case 6:
|
||||
#line 63 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
{ if (!parse_uint (tok, p, &info.cluster )) return false; }
|
||||
break;
|
||||
case 7:
|
||||
#line 64 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
{ if (!parse_int (tok, p, &pos.x_offset )) return false; }
|
||||
break;
|
||||
case 8:
|
||||
#line 65 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
{ if (!parse_int (tok, p, &pos.y_offset )) return false; }
|
||||
break;
|
||||
case 4:
|
||||
#line 66 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
{ if (!parse_int (tok, p, &pos.x_advance)) return false; }
|
||||
break;
|
||||
case 5:
|
||||
#line 67 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
{ if (!parse_int (tok, p, &pos.y_advance)) return false; }
|
||||
break;
|
||||
case 3:
|
||||
#line 68 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
{ if (!parse_uint (tok, p, &info.mask )) return false; }
|
||||
break;
|
||||
case 9:
|
||||
#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;
|
||||
}
|
||||
break;
|
||||
case 10:
|
||||
#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. */
|
||||
|
|
@ -435,6 +393,8 @@ _resume:
|
|||
&info.codepoint))
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 12:
|
||||
#line 43 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
{
|
||||
buffer->add_info (info);
|
||||
|
|
@ -442,11 +402,37 @@ _resume:
|
|||
return false;
|
||||
buffer->pos[buffer->len - 1] = pos;
|
||||
*end_ptr = p;
|
||||
}
|
||||
#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;
|
||||
}
|
||||
break;
|
||||
case 14:
|
||||
#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 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;
|
||||
}
|
||||
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);
|
||||
|
|
@ -455,56 +441,6 @@ _resume:
|
|||
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"
|
||||
{ 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));
|
||||
|
|
@ -523,34 +459,7 @@ _resume:
|
|||
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"
|
||||
#line 430 "hb-buffer-deserialize-text-glyphs.hh"
|
||||
}
|
||||
|
||||
_again:
|
||||
|
|
@ -562,63 +471,7 @@ _again:
|
|||
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);
|
||||
|
|
@ -628,62 +481,16 @@ _again:
|
|||
*end_ptr = p;
|
||||
}
|
||||
break;
|
||||
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 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 616 "hb-buffer-deserialize-text-glyphs.hh"
|
||||
#line 450 "hb-buffer-deserialize-text-glyphs.hh"
|
||||
}
|
||||
}
|
||||
|
||||
_out: {}
|
||||
}
|
||||
|
||||
#line 136 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
#line 120 "hb-buffer-deserialize-text-glyphs.rl"
|
||||
|
||||
|
||||
if (pe < orig_pe && *pe == ']')
|
||||
{
|
||||
pe++;
|
||||
if (p == pe)
|
||||
p++;
|
||||
}
|
||||
|
||||
*end_ptr = p;
|
||||
|
||||
return p == pe;
|
||||
|
|
|
|||
|
|
@ -86,14 +86,15 @@ glyph_item =
|
|||
offsets?
|
||||
advances?
|
||||
glyphflags?
|
||||
( '|' | ']')
|
||||
)
|
||||
>clear_item
|
||||
%add_item
|
||||
;
|
||||
|
||||
glyphs = glyph_item (space* '|' space* glyph_item)* space*;
|
||||
glyphs = '['? glyph_item* ;
|
||||
|
||||
main := space* glyphs;
|
||||
main := glyphs;
|
||||
|
||||
}%%
|
||||
|
||||
|
|
@ -104,28 +105,11 @@ _hb_buffer_deserialize_text_glyphs (hb_buffer_t *buffer,
|
|||
const char **end_ptr,
|
||||
hb_font_t *font)
|
||||
{
|
||||
const char *p = buf, *pe = buf + buf_len, *eof = pe, *orig_pe = pe;
|
||||
const char *p = buf, *pe = buf + buf_len, *eof = pe;
|
||||
|
||||
/* Ensure we have positions. */
|
||||
(void) hb_buffer_get_glyph_positions (buffer, nullptr);
|
||||
|
||||
while (p < pe && ISSPACE (*p))
|
||||
p++;
|
||||
if (p < pe && *p == (buffer->len ? '|' : '['))
|
||||
*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;
|
||||
int cs;
|
||||
hb_glyph_info_t info = {0};
|
||||
|
|
@ -135,13 +119,6 @@ _hb_buffer_deserialize_text_glyphs (hb_buffer_t *buffer,
|
|||
write exec;
|
||||
}%%
|
||||
|
||||
if (pe < orig_pe && *pe == ']')
|
||||
{
|
||||
pe++;
|
||||
if (p == pe)
|
||||
p++;
|
||||
}
|
||||
|
||||
*end_ptr = p;
|
||||
|
||||
return p == pe;
|
||||
|
|
|
|||
|
|
@ -34,135 +34,106 @@
|
|||
|
||||
#line 33 "hb-buffer-deserialize-text-unicode.hh"
|
||||
static const unsigned char _deserialize_text_unicode_trans_keys[] = {
|
||||
0u, 0u, 9u, 117u, 43u, 102u, 48u, 102u, 48u, 57u, 9u, 124u, 9u, 124u, 9u, 124u,
|
||||
9u, 124u, 0
|
||||
0u, 0u, 43u, 102u, 48u, 102u, 48u, 124u, 48u, 57u, 62u, 124u, 48u, 124u, 60u, 117u,
|
||||
85u, 117u, 85u, 117u, 0
|
||||
};
|
||||
|
||||
static const char _deserialize_text_unicode_key_spans[] = {
|
||||
0, 109, 60, 55, 10, 116, 116, 116,
|
||||
116
|
||||
0, 60, 55, 77, 10, 63, 77, 58,
|
||||
33, 33
|
||||
};
|
||||
|
||||
static const short _deserialize_text_unicode_index_offsets[] = {
|
||||
0, 0, 110, 171, 227, 238, 355, 472,
|
||||
589
|
||||
0, 0, 61, 117, 195, 206, 270, 348,
|
||||
407, 441
|
||||
};
|
||||
|
||||
static const char _deserialize_text_unicode_indicies[] = {
|
||||
0, 0, 0, 0, 0, 1, 1,
|
||||
0, 1, 1, 1, 1, 2, 2,
|
||||
2, 2, 2, 2, 2, 2, 2, 2,
|
||||
1, 1, 1, 1, 1, 1, 1, 2,
|
||||
2, 2, 2, 2, 2, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
0, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 2,
|
||||
2, 2, 2, 2, 2, 1, 2, 2,
|
||||
2, 2, 2, 2, 2, 2, 2, 2,
|
||||
1, 1, 1, 1, 1, 1, 1, 2,
|
||||
2, 2, 2, 2, 2, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 2,
|
||||
2, 2, 2, 2, 2, 1, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3,
|
||||
1, 1, 1, 4, 5, 1, 1, 3,
|
||||
3, 3, 3, 3, 3, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 3,
|
||||
3, 3, 3, 3, 3, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 5, 1, 6, 7, 7, 7,
|
||||
7, 7, 7, 7, 7, 7, 1, 8,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 2, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 8, 1, 9,
|
||||
9, 9, 9, 9, 9, 9, 9, 9,
|
||||
9, 1, 1, 1, 1, 8, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 2, 1, 3,
|
||||
1, 1, 1, 1, 4, 4, 4, 4,
|
||||
4, 4, 4, 4, 4, 4, 1, 1,
|
||||
1, 1, 1, 1, 1, 4, 4, 4,
|
||||
4, 4, 4, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 4, 4, 4,
|
||||
4, 4, 4, 1, 4, 4, 4, 4,
|
||||
4, 4, 4, 4, 4, 4, 1, 1,
|
||||
1, 1, 1, 1, 1, 4, 4, 4,
|
||||
4, 4, 4, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 4, 4, 4,
|
||||
4, 4, 4, 1, 5, 6, 6, 6,
|
||||
6, 6, 6, 6, 6, 6, 1, 7,
|
||||
7, 7, 7, 7, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 7, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 8, 8,
|
||||
8, 8, 8, 8, 8, 8, 8, 8,
|
||||
1, 1, 1, 9, 1, 1, 1, 8,
|
||||
8, 8, 8, 8, 8, 1, 1, 1,
|
||||
1, 1, 1, 8, 1, 10, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 8,
|
||||
8, 8, 8, 8, 8, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 11, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 10, 1, 11, 11, 11, 11,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 11, 1,
|
||||
11, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 11, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
11, 1, 12, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 0,
|
||||
1, 12, 12, 12, 12, 12, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
12, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 13, 1, 12, 12,
|
||||
12, 12, 12, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 12, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 14, 14, 14,
|
||||
14, 14, 14, 14, 14, 14, 14, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 13, 1, 0
|
||||
1, 1, 12, 1, 0
|
||||
};
|
||||
|
||||
static const char _deserialize_text_unicode_trans_targs[] = {
|
||||
1, 0, 2, 3, 5, 7, 8, 6,
|
||||
5, 4, 1, 6, 6, 1, 8
|
||||
2, 0, 3, 3, 4, 9, 5, 6,
|
||||
9, 6, 8, 1, 1
|
||||
};
|
||||
|
||||
static const char _deserialize_text_unicode_trans_actions[] = {
|
||||
0, 0, 1, 0, 2, 2, 2, 3,
|
||||
0, 4, 3, 0, 5, 5, 0
|
||||
0, 0, 1, 0, 2, 2, 1, 1,
|
||||
3, 0, 0, 4, 6
|
||||
};
|
||||
|
||||
static const char _deserialize_text_unicode_eof_actions[] = {
|
||||
0, 0, 0, 0, 0, 3, 0, 5,
|
||||
5
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 5
|
||||
};
|
||||
|
||||
static const int deserialize_text_unicode_start = 1;
|
||||
static const int deserialize_text_unicode_first_final = 5;
|
||||
static const int deserialize_text_unicode_start = 7;
|
||||
static const int deserialize_text_unicode_first_final = 7;
|
||||
static const int deserialize_text_unicode_error = 0;
|
||||
|
||||
static const int deserialize_text_unicode_en_main = 1;
|
||||
static const int deserialize_text_unicode_en_main = 7;
|
||||
|
||||
|
||||
#line 79 "hb-buffer-deserialize-text-unicode.rl"
|
||||
#line 80 "hb-buffer-deserialize-text-unicode.rl"
|
||||
|
||||
|
||||
static hb_bool_t
|
||||
|
|
@ -172,37 +143,19 @@ _hb_buffer_deserialize_text_unicode (hb_buffer_t *buffer,
|
|||
const char **end_ptr,
|
||||
hb_font_t *font)
|
||||
{
|
||||
const char *p = buf, *pe = buf + buf_len, *eof = pe, *orig_pe = pe;
|
||||
|
||||
while (p < pe && ISSPACE (*p))
|
||||
p++;
|
||||
if (p < pe && *p == (buffer->len ? '|' : '<'))
|
||||
*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 *p = buf, *pe = buf + buf_len, *eof = pe;
|
||||
|
||||
const char *tok = nullptr;
|
||||
int cs;
|
||||
hb_glyph_info_t info = {0};
|
||||
const hb_glyph_position_t pos = {0};
|
||||
|
||||
#line 194 "hb-buffer-deserialize-text-unicode.hh"
|
||||
#line 147 "hb-buffer-deserialize-text-unicode.hh"
|
||||
{
|
||||
cs = deserialize_text_unicode_start;
|
||||
}
|
||||
|
||||
#line 197 "hb-buffer-deserialize-text-unicode.hh"
|
||||
#line 150 "hb-buffer-deserialize-text-unicode.hh"
|
||||
{
|
||||
int _slen;
|
||||
int _trans;
|
||||
|
|
@ -227,38 +180,27 @@ _resume:
|
|||
goto _again;
|
||||
|
||||
switch ( _deserialize_text_unicode_trans_actions[_trans] ) {
|
||||
case 1:
|
||||
case 4:
|
||||
#line 38 "hb-buffer-deserialize-text-unicode.rl"
|
||||
{
|
||||
hb_memset (&info, 0, sizeof (info));
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
case 1:
|
||||
#line 51 "hb-buffer-deserialize-text-unicode.rl"
|
||||
{
|
||||
tok = p;
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
case 2:
|
||||
#line 55 "hb-buffer-deserialize-text-unicode.rl"
|
||||
{if (!parse_hex (tok, p, &info.codepoint )) return false; }
|
||||
break;
|
||||
case 3:
|
||||
#line 55 "hb-buffer-deserialize-text-unicode.rl"
|
||||
{if (!parse_hex (tok, p, &info.codepoint )) return false; }
|
||||
#line 42 "hb-buffer-deserialize-text-unicode.rl"
|
||||
{
|
||||
buffer->add_info (info);
|
||||
if (unlikely (!buffer->successful))
|
||||
return false;
|
||||
if (buffer->have_positions)
|
||||
buffer->pos[buffer->len - 1] = pos;
|
||||
*end_ptr = p;
|
||||
}
|
||||
break;
|
||||
case 5:
|
||||
#line 57 "hb-buffer-deserialize-text-unicode.rl"
|
||||
{ if (!parse_uint (tok, p, &info.cluster )) return false; }
|
||||
break;
|
||||
case 6:
|
||||
#line 42 "hb-buffer-deserialize-text-unicode.rl"
|
||||
{
|
||||
buffer->add_info (info);
|
||||
|
|
@ -267,9 +209,13 @@ _resume:
|
|||
if (buffer->have_positions)
|
||||
buffer->pos[buffer->len - 1] = pos;
|
||||
*end_ptr = p;
|
||||
}
|
||||
#line 38 "hb-buffer-deserialize-text-unicode.rl"
|
||||
{
|
||||
hb_memset (&info, 0, sizeof (info));
|
||||
}
|
||||
break;
|
||||
#line 256 "hb-buffer-deserialize-text-unicode.hh"
|
||||
#line 203 "hb-buffer-deserialize-text-unicode.hh"
|
||||
}
|
||||
|
||||
_again:
|
||||
|
|
@ -281,22 +227,7 @@ _again:
|
|||
if ( p == eof )
|
||||
{
|
||||
switch ( _deserialize_text_unicode_eof_actions[cs] ) {
|
||||
case 3:
|
||||
#line 55 "hb-buffer-deserialize-text-unicode.rl"
|
||||
{if (!parse_hex (tok, p, &info.codepoint )) return false; }
|
||||
#line 42 "hb-buffer-deserialize-text-unicode.rl"
|
||||
{
|
||||
buffer->add_info (info);
|
||||
if (unlikely (!buffer->successful))
|
||||
return false;
|
||||
if (buffer->have_positions)
|
||||
buffer->pos[buffer->len - 1] = pos;
|
||||
*end_ptr = p;
|
||||
}
|
||||
break;
|
||||
case 5:
|
||||
#line 57 "hb-buffer-deserialize-text-unicode.rl"
|
||||
{ if (!parse_uint (tok, p, &info.cluster )) return false; }
|
||||
#line 42 "hb-buffer-deserialize-text-unicode.rl"
|
||||
{
|
||||
buffer->add_info (info);
|
||||
|
|
@ -307,23 +238,16 @@ _again:
|
|||
*end_ptr = p;
|
||||
}
|
||||
break;
|
||||
#line 289 "hb-buffer-deserialize-text-unicode.hh"
|
||||
#line 224 "hb-buffer-deserialize-text-unicode.hh"
|
||||
}
|
||||
}
|
||||
|
||||
_out: {}
|
||||
}
|
||||
|
||||
#line 115 "hb-buffer-deserialize-text-unicode.rl"
|
||||
#line 98 "hb-buffer-deserialize-text-unicode.rl"
|
||||
|
||||
|
||||
if (pe < orig_pe && *pe == '>')
|
||||
{
|
||||
pe++;
|
||||
if (p == pe)
|
||||
p++;
|
||||
}
|
||||
|
||||
*end_ptr = p;
|
||||
|
||||
return p == pe;
|
||||
|
|
|
|||
|
|
@ -67,14 +67,15 @@ unicode_item =
|
|||
(
|
||||
unicode
|
||||
cluster?
|
||||
('|' | '>')
|
||||
)
|
||||
>clear_item
|
||||
%add_item
|
||||
;
|
||||
|
||||
unicodes = unicode_item (space* '|' space* unicode_item)* space*;
|
||||
unicodes = '<'? unicode_item*;
|
||||
|
||||
main := space* unicodes;
|
||||
main := unicodes;
|
||||
|
||||
}%%
|
||||
|
||||
|
|
@ -85,25 +86,7 @@ _hb_buffer_deserialize_text_unicode (hb_buffer_t *buffer,
|
|||
const char **end_ptr,
|
||||
hb_font_t *font)
|
||||
{
|
||||
const char *p = buf, *pe = buf + buf_len, *eof = pe, *orig_pe = pe;
|
||||
|
||||
while (p < pe && ISSPACE (*p))
|
||||
p++;
|
||||
if (p < pe && *p == (buffer->len ? '|' : '<'))
|
||||
*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 *p = buf, *pe = buf + buf_len, *eof = pe;
|
||||
|
||||
const char *tok = nullptr;
|
||||
int cs;
|
||||
|
|
@ -114,13 +97,6 @@ _hb_buffer_deserialize_text_unicode (hb_buffer_t *buffer,
|
|||
write exec;
|
||||
}%%
|
||||
|
||||
if (pe < orig_pe && *pe == '>')
|
||||
{
|
||||
pe++;
|
||||
if (p == pe)
|
||||
p++;
|
||||
}
|
||||
|
||||
*end_ptr = p;
|
||||
|
||||
return p == pe;
|
||||
|
|
|
|||
|
|
@ -737,8 +737,7 @@ parse_hex (const char *pp, const char *end, uint32_t *pv)
|
|||
* Deserializes glyphs @buffer from textual representation in the format
|
||||
* produced by hb_buffer_serialize_glyphs().
|
||||
*
|
||||
* Return value: `true` if parse was successful, `false` if an error
|
||||
* occurred.
|
||||
* Return value: `true` if the full string was parsed, `false` otherwise.
|
||||
*
|
||||
* Since: 0.9.7
|
||||
**/
|
||||
|
|
@ -810,8 +809,7 @@ hb_buffer_deserialize_glyphs (hb_buffer_t *buffer,
|
|||
* Deserializes Unicode @buffer from textual representation in the format
|
||||
* produced by hb_buffer_serialize_unicode().
|
||||
*
|
||||
* Return value: `true` if parse was successful, `false` if an error
|
||||
* occurred.
|
||||
* Return value: `true` if the full string was parsed, `false` otherwise.
|
||||
*
|
||||
* Since: 2.7.3
|
||||
**/
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
#include "hb.hh"
|
||||
|
||||
|
||||
#line 35 "hb-number-parser.hh"
|
||||
#line 32 "hb-number-parser.hh"
|
||||
static const unsigned char _double_parser_trans_keys[] = {
|
||||
0u, 0u, 43u, 57u, 46u, 57u, 48u, 57u, 43u, 57u, 48u, 57u, 48u, 101u, 48u, 57u,
|
||||
46u, 101u, 0
|
||||
|
|
@ -135,12 +135,12 @@ strtod_rl (const char *p, const char **end_ptr /* IN/OUT */)
|
|||
|
||||
int cs;
|
||||
|
||||
#line 139 "hb-number-parser.hh"
|
||||
#line 132 "hb-number-parser.hh"
|
||||
{
|
||||
cs = double_parser_start;
|
||||
}
|
||||
|
||||
#line 144 "hb-number-parser.hh"
|
||||
#line 135 "hb-number-parser.hh"
|
||||
{
|
||||
int _slen;
|
||||
int _trans;
|
||||
|
|
@ -198,7 +198,7 @@ _resume:
|
|||
exp_overflow = true;
|
||||
}
|
||||
break;
|
||||
#line 202 "hb-number-parser.hh"
|
||||
#line 187 "hb-number-parser.hh"
|
||||
}
|
||||
|
||||
_again:
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ enum indic_syllable_type_t {
|
|||
};
|
||||
|
||||
|
||||
#line 57 "hb-ot-shaper-indic-machine.hh"
|
||||
#line 54 "hb-ot-shaper-indic-machine.hh"
|
||||
#define indic_syllable_machine_ex_A 9u
|
||||
#define indic_syllable_machine_ex_C 1u
|
||||
#define indic_syllable_machine_ex_CM 16u
|
||||
|
|
@ -77,7 +77,7 @@ enum indic_syllable_type_t {
|
|||
#define indic_syllable_machine_ex_ZWNJ 5u
|
||||
|
||||
|
||||
#line 81 "hb-ot-shaper-indic-machine.hh"
|
||||
#line 76 "hb-ot-shaper-indic-machine.hh"
|
||||
static const unsigned char _indic_syllable_machine_trans_keys[] = {
|
||||
8u, 57u, 4u, 57u, 5u, 57u, 5u, 57u, 13u, 13u, 4u, 57u, 4u, 57u, 4u, 57u,
|
||||
8u, 57u, 5u, 57u, 5u, 57u, 13u, 13u, 4u, 57u, 4u, 57u, 4u, 57u, 4u, 57u,
|
||||
|
|
@ -1126,7 +1126,7 @@ find_syllables_indic (hb_buffer_t *buffer)
|
|||
int cs;
|
||||
hb_glyph_info_t *info = buffer->info;
|
||||
|
||||
#line 1130 "hb-ot-shaper-indic-machine.hh"
|
||||
#line 1119 "hb-ot-shaper-indic-machine.hh"
|
||||
{
|
||||
cs = indic_syllable_machine_start;
|
||||
ts = 0;
|
||||
|
|
@ -1142,7 +1142,7 @@ find_syllables_indic (hb_buffer_t *buffer)
|
|||
|
||||
unsigned int syllable_serial = 1;
|
||||
|
||||
#line 1146 "hb-ot-shaper-indic-machine.hh"
|
||||
#line 1131 "hb-ot-shaper-indic-machine.hh"
|
||||
{
|
||||
int _slen;
|
||||
int _trans;
|
||||
|
|
@ -1156,7 +1156,7 @@ _resume:
|
|||
#line 1 "NONE"
|
||||
{ts = p;}
|
||||
break;
|
||||
#line 1160 "hb-ot-shaper-indic-machine.hh"
|
||||
#line 1143 "hb-ot-shaper-indic-machine.hh"
|
||||
}
|
||||
|
||||
_keys = _indic_syllable_machine_trans_keys + (cs<<1);
|
||||
|
|
@ -1268,7 +1268,7 @@ _eof_trans:
|
|||
#line 117 "hb-ot-shaper-indic-machine.rl"
|
||||
{act = 7;}
|
||||
break;
|
||||
#line 1272 "hb-ot-shaper-indic-machine.hh"
|
||||
#line 1232 "hb-ot-shaper-indic-machine.hh"
|
||||
}
|
||||
|
||||
_again:
|
||||
|
|
@ -1277,7 +1277,7 @@ _again:
|
|||
#line 1 "NONE"
|
||||
{ts = 0;}
|
||||
break;
|
||||
#line 1281 "hb-ot-shaper-indic-machine.hh"
|
||||
#line 1239 "hb-ot-shaper-indic-machine.hh"
|
||||
}
|
||||
|
||||
if ( ++p != pe )
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ enum khmer_syllable_type_t {
|
|||
};
|
||||
|
||||
|
||||
#line 52 "hb-ot-shaper-khmer-machine.hh"
|
||||
#line 49 "hb-ot-shaper-khmer-machine.hh"
|
||||
#define khmer_syllable_machine_ex_C 1u
|
||||
#define khmer_syllable_machine_ex_DOTTEDCIRCLE 11u
|
||||
#define khmer_syllable_machine_ex_H 4u
|
||||
|
|
@ -66,7 +66,7 @@ enum khmer_syllable_type_t {
|
|||
#define khmer_syllable_machine_ex_ZWNJ 5u
|
||||
|
||||
|
||||
#line 70 "hb-ot-shaper-khmer-machine.hh"
|
||||
#line 65 "hb-ot-shaper-khmer-machine.hh"
|
||||
static const unsigned char _khmer_syllable_machine_trans_keys[] = {
|
||||
5u, 26u, 5u, 26u, 1u, 15u, 5u, 26u, 5u, 26u, 5u, 26u, 5u, 26u, 5u, 26u,
|
||||
5u, 26u, 5u, 26u, 5u, 26u, 5u, 26u, 5u, 26u, 1u, 15u, 5u, 26u, 5u, 26u,
|
||||
|
|
@ -294,7 +294,7 @@ find_syllables_khmer (hb_buffer_t *buffer)
|
|||
int cs;
|
||||
hb_glyph_info_t *info = buffer->info;
|
||||
|
||||
#line 298 "hb-ot-shaper-khmer-machine.hh"
|
||||
#line 287 "hb-ot-shaper-khmer-machine.hh"
|
||||
{
|
||||
cs = khmer_syllable_machine_start;
|
||||
ts = 0;
|
||||
|
|
@ -310,7 +310,7 @@ find_syllables_khmer (hb_buffer_t *buffer)
|
|||
|
||||
unsigned int syllable_serial = 1;
|
||||
|
||||
#line 314 "hb-ot-shaper-khmer-machine.hh"
|
||||
#line 299 "hb-ot-shaper-khmer-machine.hh"
|
||||
{
|
||||
int _slen;
|
||||
int _trans;
|
||||
|
|
@ -324,7 +324,7 @@ _resume:
|
|||
#line 1 "NONE"
|
||||
{ts = p;}
|
||||
break;
|
||||
#line 328 "hb-ot-shaper-khmer-machine.hh"
|
||||
#line 311 "hb-ot-shaper-khmer-machine.hh"
|
||||
}
|
||||
|
||||
_keys = _khmer_syllable_machine_trans_keys + (cs<<1);
|
||||
|
|
@ -394,7 +394,7 @@ _eof_trans:
|
|||
#line 98 "hb-ot-shaper-khmer-machine.rl"
|
||||
{act = 3;}
|
||||
break;
|
||||
#line 398 "hb-ot-shaper-khmer-machine.hh"
|
||||
#line 368 "hb-ot-shaper-khmer-machine.hh"
|
||||
}
|
||||
|
||||
_again:
|
||||
|
|
@ -403,7 +403,7 @@ _again:
|
|||
#line 1 "NONE"
|
||||
{ts = 0;}
|
||||
break;
|
||||
#line 407 "hb-ot-shaper-khmer-machine.hh"
|
||||
#line 375 "hb-ot-shaper-khmer-machine.hh"
|
||||
}
|
||||
|
||||
if ( ++p != pe )
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ enum myanmar_syllable_type_t {
|
|||
};
|
||||
|
||||
|
||||
#line 54 "hb-ot-shaper-myanmar-machine.hh"
|
||||
#line 51 "hb-ot-shaper-myanmar-machine.hh"
|
||||
#define myanmar_syllable_machine_ex_A 9u
|
||||
#define myanmar_syllable_machine_ex_As 32u
|
||||
#define myanmar_syllable_machine_ex_C 1u
|
||||
|
|
@ -78,7 +78,7 @@ enum myanmar_syllable_type_t {
|
|||
#define myanmar_syllable_machine_ex_ZWNJ 5u
|
||||
|
||||
|
||||
#line 82 "hb-ot-shaper-myanmar-machine.hh"
|
||||
#line 77 "hb-ot-shaper-myanmar-machine.hh"
|
||||
static const unsigned char _myanmar_syllable_machine_trans_keys[] = {
|
||||
1u, 57u, 3u, 57u, 5u, 57u, 5u, 57u, 3u, 57u, 5u, 57u, 3u, 57u, 3u, 57u,
|
||||
3u, 57u, 3u, 57u, 3u, 57u, 5u, 57u, 1u, 15u, 3u, 57u, 3u, 57u, 3u, 57u,
|
||||
|
|
@ -549,7 +549,7 @@ find_syllables_myanmar (hb_buffer_t *buffer)
|
|||
int cs;
|
||||
hb_glyph_info_t *info = buffer->info;
|
||||
|
||||
#line 553 "hb-ot-shaper-myanmar-machine.hh"
|
||||
#line 542 "hb-ot-shaper-myanmar-machine.hh"
|
||||
{
|
||||
cs = myanmar_syllable_machine_start;
|
||||
ts = 0;
|
||||
|
|
@ -565,7 +565,7 @@ find_syllables_myanmar (hb_buffer_t *buffer)
|
|||
|
||||
unsigned int syllable_serial = 1;
|
||||
|
||||
#line 569 "hb-ot-shaper-myanmar-machine.hh"
|
||||
#line 554 "hb-ot-shaper-myanmar-machine.hh"
|
||||
{
|
||||
int _slen;
|
||||
int _trans;
|
||||
|
|
@ -579,7 +579,7 @@ _resume:
|
|||
#line 1 "NONE"
|
||||
{ts = p;}
|
||||
break;
|
||||
#line 583 "hb-ot-shaper-myanmar-machine.hh"
|
||||
#line 566 "hb-ot-shaper-myanmar-machine.hh"
|
||||
}
|
||||
|
||||
_keys = _myanmar_syllable_machine_trans_keys + (cs<<1);
|
||||
|
|
@ -649,7 +649,7 @@ _eof_trans:
|
|||
#line 113 "hb-ot-shaper-myanmar-machine.rl"
|
||||
{act = 3;}
|
||||
break;
|
||||
#line 653 "hb-ot-shaper-myanmar-machine.hh"
|
||||
#line 623 "hb-ot-shaper-myanmar-machine.hh"
|
||||
}
|
||||
|
||||
_again:
|
||||
|
|
@ -658,7 +658,7 @@ _again:
|
|||
#line 1 "NONE"
|
||||
{ts = 0;}
|
||||
break;
|
||||
#line 662 "hb-ot-shaper-myanmar-machine.hh"
|
||||
#line 630 "hb-ot-shaper-myanmar-machine.hh"
|
||||
}
|
||||
|
||||
if ( ++p != pe )
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ enum use_syllable_type_t {
|
|||
};
|
||||
|
||||
|
||||
#line 57 "hb-ot-shaper-use-machine.hh"
|
||||
#line 54 "hb-ot-shaper-use-machine.hh"
|
||||
#define use_syllable_machine_ex_B 1u
|
||||
#define use_syllable_machine_ex_CGJ 6u
|
||||
#define use_syllable_machine_ex_CMAbv 31u
|
||||
|
|
@ -100,7 +100,7 @@ enum use_syllable_type_t {
|
|||
#define use_syllable_machine_ex_ZWNJ 14u
|
||||
|
||||
|
||||
#line 104 "hb-ot-shaper-use-machine.hh"
|
||||
#line 99 "hb-ot-shaper-use-machine.hh"
|
||||
static const unsigned char _use_syllable_machine_trans_keys[] = {
|
||||
49u, 51u, 0u, 56u, 11u, 56u, 11u, 56u, 1u, 53u, 14u, 48u, 14u, 47u, 14u, 47u,
|
||||
14u, 47u, 14u, 46u, 14u, 46u, 14u, 14u, 14u, 48u, 14u, 48u, 14u, 48u, 1u, 14u,
|
||||
|
|
@ -929,7 +929,7 @@ find_syllables_use (hb_buffer_t *buffer)
|
|||
unsigned int act HB_UNUSED;
|
||||
int cs;
|
||||
|
||||
#line 933 "hb-ot-shaper-use-machine.hh"
|
||||
#line 922 "hb-ot-shaper-use-machine.hh"
|
||||
{
|
||||
cs = use_syllable_machine_start;
|
||||
ts = 0;
|
||||
|
|
@ -942,7 +942,7 @@ find_syllables_use (hb_buffer_t *buffer)
|
|||
|
||||
unsigned int syllable_serial = 1;
|
||||
|
||||
#line 946 "hb-ot-shaper-use-machine.hh"
|
||||
#line 931 "hb-ot-shaper-use-machine.hh"
|
||||
{
|
||||
int _slen;
|
||||
int _trans;
|
||||
|
|
@ -956,7 +956,7 @@ _resume:
|
|||
#line 1 "NONE"
|
||||
{ts = p;}
|
||||
break;
|
||||
#line 960 "hb-ot-shaper-use-machine.hh"
|
||||
#line 943 "hb-ot-shaper-use-machine.hh"
|
||||
}
|
||||
|
||||
_keys = _use_syllable_machine_trans_keys + (cs<<1);
|
||||
|
|
@ -1078,7 +1078,7 @@ _eof_trans:
|
|||
#line 181 "hb-ot-shaper-use-machine.rl"
|
||||
{act = 9;}
|
||||
break;
|
||||
#line 1082 "hb-ot-shaper-use-machine.hh"
|
||||
#line 1039 "hb-ot-shaper-use-machine.hh"
|
||||
}
|
||||
|
||||
_again:
|
||||
|
|
@ -1087,7 +1087,7 @@ _again:
|
|||
#line 1 "NONE"
|
||||
{ts = 0;}
|
||||
break;
|
||||
#line 1091 "hb-ot-shaper-use-machine.hh"
|
||||
#line 1046 "hb-ot-shaper-use-machine.hh"
|
||||
}
|
||||
|
||||
if ( ++p != pe )
|
||||
|
|
|
|||
|
|
@ -43,6 +43,23 @@ main (int argc, char **argv)
|
|||
|
||||
#ifndef HB_NO_BUFFER_SERIALIZE
|
||||
|
||||
hb_buffer_serialize_format_t format = HB_BUFFER_SERIALIZE_FORMAT_TEXT;
|
||||
if (argc > 1)
|
||||
{
|
||||
if (!strcmp (argv[1], "--json"))
|
||||
{
|
||||
format = HB_BUFFER_SERIALIZE_FORMAT_JSON;
|
||||
argc--;
|
||||
argv++;
|
||||
}
|
||||
else if (!strcmp (argv[1], "--text"))
|
||||
{
|
||||
format = HB_BUFFER_SERIALIZE_FORMAT_TEXT;
|
||||
argc--;
|
||||
argv++;
|
||||
}
|
||||
}
|
||||
|
||||
if (argc < 2)
|
||||
argv[1] = (char *) "/dev/null";
|
||||
|
||||
|
|
@ -68,10 +85,13 @@ main (int argc, char **argv)
|
|||
while (true)
|
||||
{
|
||||
const char *p = line;
|
||||
const char *end = p + strlen (p);
|
||||
if (p < end && *(end - 1) == '\n')
|
||||
end--;
|
||||
if (!hb_buffer_deserialize_glyphs (buf,
|
||||
p, -1, &p,
|
||||
p, end - p, &p,
|
||||
font,
|
||||
HB_BUFFER_SERIALIZE_FORMAT_TEXT))
|
||||
format))
|
||||
{
|
||||
ret = false;
|
||||
break;
|
||||
|
|
@ -97,7 +117,8 @@ main (int argc, char **argv)
|
|||
unsigned len;
|
||||
offset += hb_buffer_serialize_glyphs (buf, offset, count,
|
||||
out, sizeof (out), &len,
|
||||
font, HB_BUFFER_SERIALIZE_FORMAT_TEXT,
|
||||
font,
|
||||
format,
|
||||
HB_BUFFER_SERIALIZE_FLAG_GLYPH_FLAGS);
|
||||
fwrite (out, 1, len, stdout);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -869,7 +869,7 @@ static const serialization_test_t serialization_tests[] = {
|
|||
{ "[{\"u\":1600,\"cl\":0},{\"u\":1589,\"cl\":1}]", HB_BUFFER_SERIALIZE_FORMAT_JSON, -1, 2, TRUE },
|
||||
|
||||
/* Unfinished */
|
||||
//{ "[{\"u\":1600,\"cl\":0},{\"u\":1589,\"cl\":1}", HB_BUFFER_SERIALIZE_FORMAT_JSON, -1, 2, TRUE },
|
||||
{ "[{\"u\":1600,\"cl\":0},{\"u\":1589,\"cl\":1}", HB_BUFFER_SERIALIZE_FORMAT_JSON, 36, 1, TRUE },
|
||||
|
||||
/* Mixed glyphs/Unicodes -> parse fail */
|
||||
{ "[{\"u\":1600,\"cl\":0},{\"g\":1589,\"cl\":1}]", HB_BUFFER_SERIALIZE_FORMAT_JSON, -1, 0, FALSE },
|
||||
|
|
@ -894,8 +894,7 @@ test_buffer_serialize_deserialize (void)
|
|||
const serialization_test_t *test = &serialization_tests[i];
|
||||
g_test_message ("serialize test #%d", i);
|
||||
|
||||
|
||||
(void) hb_buffer_deserialize_unicode (b, test->contents, -1, &end_ptr, test->format);
|
||||
bool ret = hb_buffer_deserialize_unicode (b, test->contents, -1, &end_ptr, test->format);
|
||||
|
||||
// Expected parse failure, got one, don't round-trip
|
||||
if (test->success)
|
||||
|
|
@ -908,13 +907,17 @@ test_buffer_serialize_deserialize (void)
|
|||
consumed = end_ptr - test->contents;
|
||||
g_assert_cmpint (consumed, ==, test->parsed_length);
|
||||
}
|
||||
|
||||
consumed = 0;
|
||||
hb_buffer_serialize_unicode (b, 0, num_glyphs, round_trip,
|
||||
sizeof(round_trip), &consumed, test->format,
|
||||
HB_BUFFER_SERIALIZE_FLAG_DEFAULT);
|
||||
g_assert_cmpstr (round_trip, ==, test->contents);
|
||||
else
|
||||
{
|
||||
consumed = 0;
|
||||
hb_buffer_serialize (b, 0, num_glyphs, round_trip,
|
||||
sizeof(round_trip), &consumed, NULL, test->format,
|
||||
HB_BUFFER_SERIALIZE_FLAG_DEFAULT);
|
||||
g_assert_cmpstr (round_trip, ==, test->contents);
|
||||
}
|
||||
}
|
||||
else
|
||||
g_assert (!ret);
|
||||
|
||||
hb_buffer_destroy (b);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue