Update to Harfbuzz 10.0.1

This also deletes the compilation fix patch file,
as this has now been applied upstream:

1c01944e93

[ChangeLog][Third-Party Code] Updated Harfbuzz to 10.0.1.

Fixes: QTBUG-130136
Pick-to: 5.15.8 5.15 6.5 6.8
Change-Id: Ie250dcaf95ef83b27ae5a681d4245b8b94ae6594
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2024-10-16 15:15:15 +02:00
parent 690184cf25
commit cc8a71e211
59 changed files with 4334 additions and 3590 deletions

View File

@ -14,7 +14,7 @@ HarfBuzz is a text shaping engine. It primarily supports [OpenType][1], but also
[Apple Advanced Typography][2]. HarfBuzz is used in Android, Chrome, [Apple Advanced Typography][2]. HarfBuzz is used in Android, Chrome,
ChromeOS, Firefox, GNOME, GTK+, KDE, Qt, LibreOffice, OpenJDK, XeTeX, ChromeOS, Firefox, GNOME, GTK+, KDE, Qt, LibreOffice, OpenJDK, XeTeX,
PlayStation, Microsoft Edge, Adobe Photoshop, Illustrator, InDesign, PlayStation, Microsoft Edge, Adobe Photoshop, Illustrator, InDesign,
Godot Engine, and other places. Godot Engine, Unreal Engine, and other places.
[![xkcd-derived image](xkcd.png)](https://xkcd.com/2347/) [![xkcd-derived image](xkcd.png)](https://xkcd.com/2347/)
@ -52,8 +52,8 @@ For custom configurations, see [CONFIG.md](CONFIG.md).
For testing and profiling, see [TESTING.md](TESTING.md). For testing and profiling, see [TESTING.md](TESTING.md).
To get a better idea of where HarfBuzz stands in the text rendering stack you To get a better idea of where HarfBuzz stands in the text rendering stack you
may want to read [State of Text Rendering][6], though, that document is many may want to read [State of Text Rendering 2024][6].
years old. Here are a few presentation slides about HarfBuzz at the Here are a few presentation slides about HarfBuzz at the
Internationalization and Unicode Conference over the years: Internationalization and Unicode Conference over the years:
* November 2014, [Unicode, OpenType, and HarfBuzz: Closing the Circle][7], * November 2014, [Unicode, OpenType, and HarfBuzz: Closing the Circle][7],
@ -97,7 +97,7 @@ transliterated using the Latin script. It also means "talkative" or
[3]: https://github.com/harfbuzz/harfbuzz/releases [3]: https://github.com/harfbuzz/harfbuzz/releases
[4]: https://github.com/harfbuzz/harfbuzz [4]: https://github.com/harfbuzz/harfbuzz
[5]: http://mces.blogspot.com/2009/11/pango-vs-harfbuzz.html [5]: http://mces.blogspot.com/2009/11/pango-vs-harfbuzz.html
[6]: http://behdad.org/text/ [6]: http://behdad.org/text2024
[7]: https://goo.gl/FSIQuC [7]: https://goo.gl/FSIQuC
[8]: https://goo.gl/2wSRu [8]: https://goo.gl/2wSRu
[9]: http://behdad.org/download/Presentations/slippy/harfbuzz_slides.pdf [9]: http://behdad.org/download/Presentations/slippy/harfbuzz_slides.pdf

View File

@ -1,34 +0,0 @@
From c3c113a4ec9b0c41cf096fe832e6420eac29122e Mon Sep 17 00:00:00 2001
From: Tatiana Borisova <tatiana.borisova@qt.io>
Date: Wed, 11 Sep 2024 11:16:07 +0200
Subject: [PATCH] Harfbuzz: Fix Integrity compilation error
Add Condition pre-declaration before _hb_recurse_condition_evaluate
The patch is fixing the following compilation error:
"/home/qt/work/qt/qtbase/src/3rdparty/harfbuzz-ng/src/hb-ot-layout-common.hh", line 3805: error #1201:
typedef "Condition" may not be used in an elaborated type specifier
_hb_recurse_condition_evaluate (const struct Condition &condition.
Follows-up bec7f5ffe0bbe75d4bc2128cfa52f17f821a0820
Change-Id: I5bc87b34169799ff25d6dd513436b71827e52a0d
---
src/3rdparty/harfbuzz-ng/src/hb-ot-layout-common.hh | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/3rdparty/harfbuzz-ng/src/hb-ot-layout-common.hh b/src/3rdparty/harfbuzz-ng/src/hb-ot-layout-common.hh
index 66274534b0..1f38923c61 100644
--- a/src/3rdparty/harfbuzz-ng/src/hb-ot-layout-common.hh
+++ b/src/3rdparty/harfbuzz-ng/src/hb-ot-layout-common.hh
@@ -3799,6 +3799,7 @@ enum Cond_with_Var_flag_t
DROP_RECORD_WITH_VAR = 3,
};
+struct Condition;
template <typename Instancer>
static bool
--
2.40.0.windows.1

View File

@ -7,8 +7,8 @@
"Description": "HarfBuzz is an OpenType text shaping engine.", "Description": "HarfBuzz is an OpenType text shaping engine.",
"Homepage": "http://harfbuzz.org", "Homepage": "http://harfbuzz.org",
"Version": "9.0.0", "Version": "10.0.1",
"DownloadLocation": "https://github.com/harfbuzz/harfbuzz/releases/tag/9.0.0", "DownloadLocation": "https://github.com/harfbuzz/harfbuzz/releases/tag/10.0.1",
"License": "MIT License", "License": "MIT License",
"LicenseId": "MIT", "LicenseId": "MIT",

View File

@ -2339,7 +2339,11 @@ struct COLR
c->plan->colrv1_varstore_inner_maps.as_array ())) c->plan->colrv1_varstore_inner_maps.as_array ()))
return_trace (false); return_trace (false);
if (!out->varStore.serialize_serialize (c->serializer, /* do not serialize varStore if there's no variation data after
* instancing: region_list or var_data is empty */
if (item_vars.get_region_list () &&
item_vars.get_vardata_encodings () &&
!out->varStore.serialize_serialize (c->serializer,
item_vars.has_long_word (), item_vars.has_long_word (),
c->plan->axis_tags, c->plan->axis_tags,
item_vars.get_region_list (), item_vars.get_region_list (),
@ -2347,7 +2351,9 @@ struct COLR
return_trace (false); return_trace (false);
/* if varstore is optimized, update colrv1_new_deltaset_idx_varidx_map in /* if varstore is optimized, update colrv1_new_deltaset_idx_varidx_map in
* subset plan */ * subset plan.
* If varstore is empty after instancing, varidx_map would be empty and
* all var_idxes will be updated to VarIdx::NO_VARIATION */
if (optimize) if (optimize)
{ {
const hb_map_t &varidx_map = item_vars.get_varidx_map (); const hb_map_t &varidx_map = item_vars.get_varidx_map ();

View File

@ -633,8 +633,8 @@ struct GDEFVersion1_2
ligCaretList.sanitize (c, this) && ligCaretList.sanitize (c, this) &&
markAttachClassDef.sanitize (c, this) && markAttachClassDef.sanitize (c, this) &&
hb_barrier () && hb_barrier () &&
(version.to_int () < 0x00010002u || markGlyphSetsDef.sanitize (c, this)) && ((version.to_int () < 0x00010002u && hb_barrier ()) || markGlyphSetsDef.sanitize (c, this)) &&
(version.to_int () < 0x00010003u || varStore.sanitize (c, this))); ((version.to_int () < 0x00010003u && hb_barrier ()) || varStore.sanitize (c, this)));
} }
static void remap_varidx_after_instantiation (const hb_map_t& varidx_map, static void remap_varidx_after_instantiation (const hb_map_t& varidx_map,
@ -668,13 +668,13 @@ struct GDEFVersion1_2
// the end of the GDEF table. // the end of the GDEF table.
// See: https://github.com/harfbuzz/harfbuzz/issues/4636 // See: https://github.com/harfbuzz/harfbuzz/issues/4636
auto snapshot_version0 = c->serializer->snapshot (); auto snapshot_version0 = c->serializer->snapshot ();
if (unlikely (version.to_int () >= 0x00010002u && !c->serializer->embed (markGlyphSetsDef))) if (unlikely (version.to_int () >= 0x00010002u && hb_barrier () && !c->serializer->embed (markGlyphSetsDef)))
return_trace (false); return_trace (false);
bool subset_varstore = false; bool subset_varstore = false;
unsigned varstore_index = (unsigned) -1; unsigned varstore_index = (unsigned) -1;
auto snapshot_version2 = c->serializer->snapshot (); auto snapshot_version2 = c->serializer->snapshot ();
if (version.to_int () >= 0x00010003u) if (version.to_int () >= 0x00010003u && hb_barrier ())
{ {
if (unlikely (!c->serializer->embed (varStore))) return_trace (false); if (unlikely (!c->serializer->embed (varStore))) return_trace (false);
if (c->plan->all_axes_pinned) if (c->plan->all_axes_pinned)
@ -712,7 +712,7 @@ struct GDEFVersion1_2
} }
bool subset_markglyphsetsdef = false; bool subset_markglyphsetsdef = false;
if (version.to_int () >= 0x00010002u) if (version.to_int () >= 0x00010002u && hb_barrier ())
{ {
subset_markglyphsetsdef = out->markGlyphSetsDef.serialize_subset (c, markGlyphSetsDef, this); subset_markglyphsetsdef = out->markGlyphSetsDef.serialize_subset (c, markGlyphSetsDef, this);
} }
@ -875,7 +875,7 @@ struct GDEF
bool has_mark_glyph_sets () const bool has_mark_glyph_sets () const
{ {
switch (u.version.major) { switch (u.version.major) {
case 1: return u.version.to_int () >= 0x00010002u && u.version1.markGlyphSetsDef != 0; case 1: return u.version.to_int () >= 0x00010002u && hb_barrier () && u.version1.markGlyphSetsDef != 0;
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 2: return u.version2.markGlyphSetsDef != 0; case 2: return u.version2.markGlyphSetsDef != 0;
#endif #endif
@ -885,7 +885,7 @@ struct GDEF
const MarkGlyphSets &get_mark_glyph_sets () const const MarkGlyphSets &get_mark_glyph_sets () const
{ {
switch (u.version.major) { switch (u.version.major) {
case 1: return u.version.to_int () >= 0x00010002u ? this+u.version1.markGlyphSetsDef : Null(MarkGlyphSets); case 1: return u.version.to_int () >= 0x00010002u && hb_barrier () ? this+u.version1.markGlyphSetsDef : Null(MarkGlyphSets);
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 2: return this+u.version2.markGlyphSetsDef; case 2: return this+u.version2.markGlyphSetsDef;
#endif #endif
@ -895,7 +895,7 @@ struct GDEF
bool has_var_store () const bool has_var_store () const
{ {
switch (u.version.major) { switch (u.version.major) {
case 1: return u.version.to_int () >= 0x00010003u && u.version1.varStore != 0; case 1: return u.version.to_int () >= 0x00010003u && hb_barrier () && u.version1.varStore != 0;
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 2: return u.version2.varStore != 0; case 2: return u.version2.varStore != 0;
#endif #endif
@ -905,7 +905,7 @@ struct GDEF
const ItemVariationStore &get_var_store () const const ItemVariationStore &get_var_store () const
{ {
switch (u.version.major) { switch (u.version.major) {
case 1: return u.version.to_int () >= 0x00010003u ? this+u.version1.varStore : Null(ItemVariationStore); case 1: return u.version.to_int () >= 0x00010003u && hb_barrier () ? this+u.version1.varStore : Null(ItemVariationStore);
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 2: return this+u.version2.varStore; case 2: return this+u.version2.varStore;
#endif #endif

View File

@ -139,14 +139,8 @@ struct PairPosFormat2_4 : ValueBase
return_trace (false); return_trace (false);
} }
unsigned int klass2 = (this+classDef2).get_class (buffer->info[skippy_iter.idx].codepoint);
if (!klass2)
{
buffer->unsafe_to_concat (buffer->idx, skippy_iter.idx + 1);
return_trace (false);
}
unsigned int klass1 = (this+classDef1).get_class (buffer->cur().codepoint); unsigned int klass1 = (this+classDef1).get_class (buffer->cur().codepoint);
unsigned int klass2 = (this+classDef2).get_class (buffer->info[skippy_iter.idx].codepoint);
if (unlikely (klass1 >= class1Count || klass2 >= class2Count)) if (unlikely (klass1 >= class1Count || klass2 >= class2Count))
{ {
buffer->unsafe_to_concat (buffer->idx, skippy_iter.idx + 1); buffer->unsafe_to_concat (buffer->idx, skippy_iter.idx + 1);

View File

@ -368,7 +368,7 @@ struct graph_t
// it's parent where possible. // it's parent where possible.
int64_t modified_distance = int64_t modified_distance =
hb_min (hb_max(distance + distance_modifier (), 0), 0x7FFFFFFFFFF); hb_clamp (distance + distance_modifier (), (int64_t) 0, 0x7FFFFFFFFFF);
if (has_max_priority ()) { if (has_max_priority ()) {
modified_distance = 0; modified_distance = 0;
} }

View File

@ -468,11 +468,11 @@ struct Lookup
const T* get_value (hb_codepoint_t glyph_id, unsigned int num_glyphs) const const T* get_value (hb_codepoint_t glyph_id, unsigned int num_glyphs) const
{ {
switch (u.format) { switch (u.format) {
case 0: return u.format0.get_value (glyph_id, num_glyphs); case 0: hb_barrier (); return u.format0.get_value (glyph_id, num_glyphs);
case 2: return u.format2.get_value (glyph_id); case 2: hb_barrier (); return u.format2.get_value (glyph_id);
case 4: return u.format4.get_value (glyph_id); case 4: hb_barrier (); return u.format4.get_value (glyph_id);
case 6: return u.format6.get_value (glyph_id); case 6: hb_barrier (); return u.format6.get_value (glyph_id);
case 8: return u.format8.get_value (glyph_id); case 8: hb_barrier (); return u.format8.get_value (glyph_id);
default:return nullptr; default:return nullptr;
} }
} }
@ -481,7 +481,7 @@ struct Lookup
{ {
switch (u.format) { switch (u.format) {
/* Format 10 cannot return a pointer. */ /* Format 10 cannot return a pointer. */
case 10: return u.format10.get_value_or_null (glyph_id); case 10: hb_barrier (); return u.format10.get_value_or_null (glyph_id);
default: default:
const T *v = get_value (glyph_id, num_glyphs); const T *v = get_value (glyph_id, num_glyphs);
return v ? *v : Null (T); return v ? *v : Null (T);
@ -492,12 +492,12 @@ struct Lookup
void collect_glyphs (set_t &glyphs, unsigned int num_glyphs) const void collect_glyphs (set_t &glyphs, unsigned int num_glyphs) const
{ {
switch (u.format) { switch (u.format) {
case 0: u.format0.collect_glyphs (glyphs, num_glyphs); return; case 0: hb_barrier (); u.format0.collect_glyphs (glyphs, num_glyphs); return;
case 2: u.format2.collect_glyphs (glyphs); return; case 2: hb_barrier (); u.format2.collect_glyphs (glyphs); return;
case 4: u.format4.collect_glyphs (glyphs); return; case 4: hb_barrier (); u.format4.collect_glyphs (glyphs); return;
case 6: u.format6.collect_glyphs (glyphs); return; case 6: hb_barrier (); u.format6.collect_glyphs (glyphs); return;
case 8: u.format8.collect_glyphs (glyphs); return; case 8: hb_barrier (); u.format8.collect_glyphs (glyphs); return;
case 10: u.format10.collect_glyphs (glyphs); return; case 10: hb_barrier (); u.format10.collect_glyphs (glyphs); return;
default:return; default:return;
} }
} }
@ -516,12 +516,12 @@ struct Lookup
if (!u.format.sanitize (c)) return_trace (false); if (!u.format.sanitize (c)) return_trace (false);
hb_barrier (); hb_barrier ();
switch (u.format) { switch (u.format) {
case 0: return_trace (u.format0.sanitize (c)); case 0: hb_barrier (); return_trace (u.format0.sanitize (c));
case 2: return_trace (u.format2.sanitize (c)); case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
case 4: return_trace (u.format4.sanitize (c)); case 4: hb_barrier (); return_trace (u.format4.sanitize (c));
case 6: return_trace (u.format6.sanitize (c)); case 6: hb_barrier (); return_trace (u.format6.sanitize (c));
case 8: return_trace (u.format8.sanitize (c)); case 8: hb_barrier (); return_trace (u.format8.sanitize (c));
case 10: return_trace (u.format10.sanitize (c)); case 10: hb_barrier (); return_trace (u.format10.sanitize (c));
default:return_trace (true); default:return_trace (true);
} }
} }
@ -531,11 +531,11 @@ struct Lookup
if (!u.format.sanitize (c)) return_trace (false); if (!u.format.sanitize (c)) return_trace (false);
hb_barrier (); hb_barrier ();
switch (u.format) { switch (u.format) {
case 0: return_trace (u.format0.sanitize (c, base)); case 0: hb_barrier (); return_trace (u.format0.sanitize (c, base));
case 2: return_trace (u.format2.sanitize (c, base)); case 2: hb_barrier (); return_trace (u.format2.sanitize (c, base));
case 4: return_trace (u.format4.sanitize (c, base)); case 4: hb_barrier (); return_trace (u.format4.sanitize (c, base));
case 6: return_trace (u.format6.sanitize (c, base)); case 6: hb_barrier (); return_trace (u.format6.sanitize (c, base));
case 8: return_trace (u.format8.sanitize (c, base)); case 8: hb_barrier (); return_trace (u.format8.sanitize (c, base));
case 10: return_trace (false); /* We don't support format10 here currently. */ case 10: return_trace (false); /* We don't support format10 here currently. */
default:return_trace (true); default:return_trace (true);
} }

View File

@ -189,12 +189,12 @@ struct ActionSubrecord
switch (u.header.actionType) switch (u.header.actionType)
{ {
case 0: return_trace (u.decompositionAction.sanitize (c)); case 0: hb_barrier (); return_trace (u.decompositionAction.sanitize (c));
case 1: return_trace (u.unconditionalAddGlyphAction.sanitize (c)); case 1: hb_barrier (); return_trace (u.unconditionalAddGlyphAction.sanitize (c));
case 2: return_trace (u.conditionalAddGlyphAction.sanitize (c)); case 2: hb_barrier (); return_trace (u.conditionalAddGlyphAction.sanitize (c));
// case 3: return_trace (u.stretchGlyphAction.sanitize (c)); // case 3: hb_barrier (); return_trace (u.stretchGlyphAction.sanitize (c));
case 4: return_trace (u.decompositionAction.sanitize (c)); case 4: hb_barrier (); return_trace (u.decompositionAction.sanitize (c));
case 5: return_trace (u.decompositionAction.sanitize (c)); case 5: hb_barrier (); return_trace (u.decompositionAction.sanitize (c));
default: return_trace (true); default: return_trace (true);
} }
} }

View File

@ -1062,7 +1062,8 @@ struct ChainSubtable
bool apply (hb_aat_apply_context_t *c) const bool apply (hb_aat_apply_context_t *c) const
{ {
TRACE_APPLY (this); TRACE_APPLY (this);
hb_sanitize_with_object_t with (&c->sanitizer, this); // Disabled for https://github.com/harfbuzz/harfbuzz/issues/4873
//hb_sanitize_with_object_t with (&c->sanitizer, this);
return_trace (dispatch (c)); return_trace (dispatch (c));
} }
@ -1075,7 +1076,8 @@ struct ChainSubtable
c->check_range (this, length))) c->check_range (this, length)))
return_trace (false); return_trace (false);
hb_sanitize_with_object_t with (c, this); // Disabled for https://github.com/harfbuzz/harfbuzz/issues/4873
//hb_sanitize_with_object_t with (c, this);
return_trace (dispatch (c)); return_trace (dispatch (c));
} }

View File

@ -133,8 +133,8 @@ struct opbd
{ {
switch (format) switch (format)
{ {
case 0: return u.format0.get_bounds (font, glyph_id, extents, this); case 0: hb_barrier (); return u.format0.get_bounds (font, glyph_id, extents, this);
case 1: return u.format1.get_bounds (font, glyph_id, extents, this); case 1: hb_barrier (); return u.format1.get_bounds (font, glyph_id, extents, this);
default:return false; default:return false;
} }
} }
@ -148,8 +148,8 @@ struct opbd
switch (format) switch (format)
{ {
case 0: return_trace (u.format0.sanitize (c, this)); case 0: hb_barrier (); return_trace (u.format0.sanitize (c, this));
case 1: return_trace (u.format1.sanitize (c, this)); case 1: hb_barrier (); return_trace (u.format1.sanitize (c, this));
default:return_trace (true); default:return_trace (true);
} }
} }

View File

@ -412,7 +412,7 @@ hb_buffer_t::verify (hb_buffer_t *text_buffer,
&len, &len,
HB_BUFFER_SERIALIZE_FORMAT_TEXT, HB_BUFFER_SERIALIZE_FORMAT_TEXT,
HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS); HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS);
buffer_verify_error (this, font, BUFFER_VERIFY_ERROR "text was: %s.", bytes.arrayZ); buffer_verify_error (this, font, BUFFER_VERIFY_ERROR "text was: %s.", bytes.arrayZ ? bytes.arrayZ : "");
} }
#endif #endif
} }

View File

@ -271,6 +271,7 @@ hb_buffer_t::similar (const hb_buffer_t &src)
replacement = src.replacement; replacement = src.replacement;
invisible = src.invisible; invisible = src.invisible;
not_found = src.not_found; not_found = src.not_found;
not_found_variation_selector = src.not_found_variation_selector;
} }
void void
@ -283,6 +284,7 @@ hb_buffer_t::reset ()
replacement = HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT; replacement = HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT;
invisible = 0; invisible = 0;
not_found = 0; not_found = 0;
not_found_variation_selector = HB_CODEPOINT_INVALID;
clear (); clear ();
} }
@ -705,6 +707,7 @@ DEFINE_NULL_INSTANCE (hb_buffer_t) =
HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT, HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT,
0, /* invisible */ 0, /* invisible */
0, /* not_found */ 0, /* not_found */
HB_CODEPOINT_INVALID, /* not_found_variation_selector */
HB_BUFFER_CONTENT_TYPE_INVALID, HB_BUFFER_CONTENT_TYPE_INVALID,
@ -1360,6 +1363,46 @@ hb_buffer_get_not_found_glyph (const hb_buffer_t *buffer)
return buffer->not_found; return buffer->not_found;
} }
/**
* hb_buffer_set_not_found_variation_selector_glyph:
* @buffer: An #hb_buffer_t
* @not_found_variation_selector: the not-found-variation-selector #hb_codepoint_t
*
* Sets the #hb_codepoint_t that replaces variation-selector characters not resolved
* in the font during shaping.
*
* The not-found-variation-selector glyph defaults to #HB_CODEPOINT_INVALID,
* in which case an unresolved variation-selector will be removed from the glyph
* string during shaping. This API allows for changing that and retaining a glyph,
* such that the situation can be detected by the client and handled accordingly
* (e.g. by using a different font).
*
* Since: 10.0.0
**/
void
hb_buffer_set_not_found_variation_selector_glyph (hb_buffer_t *buffer,
hb_codepoint_t not_found_variation_selector)
{
buffer->not_found_variation_selector = not_found_variation_selector;
}
/**
* hb_buffer_get_not_found_variation_selector_glyph:
* @buffer: An #hb_buffer_t
*
* See hb_buffer_set_not_found_variation_selector_glyph().
*
* Return value:
* The @buffer not-found-variation-selector #hb_codepoint_t
*
* Since: 10.0.0
**/
hb_codepoint_t
hb_buffer_get_not_found_variation_selector_glyph (const hb_buffer_t *buffer)
{
return buffer->not_found_variation_selector;
}
/** /**
* hb_buffer_set_random_state: * hb_buffer_set_random_state:
* @buffer: An #hb_buffer_t * @buffer: An #hb_buffer_t

View File

@ -487,6 +487,13 @@ hb_buffer_set_not_found_glyph (hb_buffer_t *buffer,
HB_EXTERN hb_codepoint_t HB_EXTERN hb_codepoint_t
hb_buffer_get_not_found_glyph (const hb_buffer_t *buffer); hb_buffer_get_not_found_glyph (const hb_buffer_t *buffer);
HB_EXTERN void
hb_buffer_set_not_found_variation_selector_glyph (hb_buffer_t *buffer,
hb_codepoint_t not_found_variation_selector);
HB_EXTERN hb_codepoint_t
hb_buffer_get_not_found_variation_selector_glyph (const hb_buffer_t *buffer);
HB_EXTERN void HB_EXTERN void
hb_buffer_set_random_state (hb_buffer_t *buffer, hb_buffer_set_random_state (hb_buffer_t *buffer,
unsigned state); unsigned state);

View File

@ -52,6 +52,7 @@ enum hb_buffer_scratch_flags_t {
HB_BUFFER_SCRATCH_FLAG_HAS_CGJ = 0x00000010u, HB_BUFFER_SCRATCH_FLAG_HAS_CGJ = 0x00000010u,
HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS = 0x00000020u, HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS = 0x00000020u,
HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE = 0x00000040u, HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE = 0x00000040u,
HB_BUFFER_SCRATCH_FLAG_HAS_VARIATION_SELECTOR_FALLBACK= 0x00000080u,
/* Reserved for shapers' internal use. */ /* Reserved for shapers' internal use. */
HB_BUFFER_SCRATCH_FLAG_SHAPER0 = 0x01000000u, HB_BUFFER_SCRATCH_FLAG_SHAPER0 = 0x01000000u,
@ -80,6 +81,7 @@ struct hb_buffer_t
hb_codepoint_t replacement; /* U+FFFD or something else. */ hb_codepoint_t replacement; /* U+FFFD or something else. */
hb_codepoint_t invisible; /* 0 or something else. */ hb_codepoint_t invisible; /* 0 or something else. */
hb_codepoint_t not_found; /* 0 or something else. */ hb_codepoint_t not_found; /* 0 or something else. */
hb_codepoint_t not_found_variation_selector; /* HB_CODEPOINT_INVALID or something else. */
/* /*
* Buffer contents * Buffer contents

View File

@ -84,7 +84,7 @@ struct dict_opset_t : opset_t<number_t>
enum Nibble { DECIMAL=10, EXP_POS, EXP_NEG, RESERVED, NEG, END }; enum Nibble { DECIMAL=10, EXP_POS, EXP_NEG, RESERVED, NEG, END };
char buf[32]; char buf[32] = {0};
unsigned char byte = 0; unsigned char byte = 0;
for (unsigned i = 0, count = 0; count < ARRAY_LENGTH (buf); ++i, ++count) for (unsigned i = 0, count = 0; count < ARRAY_LENGTH (buf); ++i, ++count)
{ {

View File

@ -504,6 +504,13 @@ hb_language_matches (hb_language_t language,
* @HB_SCRIPT_MATH: `Zmth`, Since: 3.4.0 * @HB_SCRIPT_MATH: `Zmth`, Since: 3.4.0
* @HB_SCRIPT_KAWI: `Kawi`, Since: 5.2.0 * @HB_SCRIPT_KAWI: `Kawi`, Since: 5.2.0
* @HB_SCRIPT_NAG_MUNDARI: `Nagm`, Since: 5.2.0 * @HB_SCRIPT_NAG_MUNDARI: `Nagm`, Since: 5.2.0
* @HB_SCRIPT_GARAY: `Gara`, Since: 10.0.0
* @HB_SCRIPT_GURUNG_KHEMA: `Gukh`, Since: 10.0.0
* @HB_SCRIPT_KIRAT_RAI: `Krai`, Since: 10.0.0
* @HB_SCRIPT_OL_ONAL: `Onao`, Since: 10.0.0
* @HB_SCRIPT_SUNUWAR: `Sunu`, Since: 10.0.0
* @HB_SCRIPT_TODHRI: `Todr`, Since: 10.0.0
* @HB_SCRIPT_TULU_TIGALARI: `Tutg`, Since: 10.0.0
* @HB_SCRIPT_INVALID: No script set * @HB_SCRIPT_INVALID: No script set
* *
* Data type for scripts. Each #hb_script_t's value is an #hb_tag_t corresponding * Data type for scripts. Each #hb_script_t's value is an #hb_tag_t corresponding
@ -731,6 +738,17 @@ typedef enum
HB_SCRIPT_KAWI = HB_TAG ('K','a','w','i'), /*15.0*/ HB_SCRIPT_KAWI = HB_TAG ('K','a','w','i'), /*15.0*/
HB_SCRIPT_NAG_MUNDARI = HB_TAG ('N','a','g','m'), /*15.0*/ HB_SCRIPT_NAG_MUNDARI = HB_TAG ('N','a','g','m'), /*15.0*/
/*
* Since 10.0.0
*/
HB_SCRIPT_GARAY = HB_TAG ('G','a','r','a'), /*16.0*/
HB_SCRIPT_GURUNG_KHEMA = HB_TAG ('G','u','k','h'), /*16.0*/
HB_SCRIPT_KIRAT_RAI = HB_TAG ('K','r','a','i'), /*16.0*/
HB_SCRIPT_OL_ONAL = HB_TAG ('O','n','a','o'), /*16.0*/
HB_SCRIPT_SUNUWAR = HB_TAG ('S','u','n','u'), /*16.0*/
HB_SCRIPT_TODHRI = HB_TAG ('T','o','d','r'), /*16.0*/
HB_SCRIPT_TULU_TIGALARI = HB_TAG ('T','u','t','g'), /*16.0*/
/* No script set. */ /* No script set. */
HB_SCRIPT_INVALID = HB_TAG_NONE, HB_SCRIPT_INVALID = HB_TAG_NONE,

View File

@ -48,6 +48,8 @@
/* https://developer.apple.com/documentation/coretext/1508745-ctfontcreatewithgraphicsfont */ /* https://developer.apple.com/documentation/coretext/1508745-ctfontcreatewithgraphicsfont */
#define HB_CORETEXT_DEFAULT_FONT_SIZE 12.f #define HB_CORETEXT_DEFAULT_FONT_SIZE 12.f
static CTFontRef create_ct_font (CGFontRef cg_font, CGFloat font_size);
static void static void
release_table_data (void *user_data) release_table_data (void *user_data)
{ {
@ -76,6 +78,52 @@ _hb_cg_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data
release_table_data); release_table_data);
} }
static unsigned
_hb_cg_get_table_tags (const hb_face_t *face HB_UNUSED,
unsigned int start_offset,
unsigned int *table_count,
hb_tag_t *table_tags,
void *user_data)
{
CGFontRef cg_font = reinterpret_cast<CGFontRef> (user_data);
CTFontRef ct_font = create_ct_font (cg_font, (CGFloat) HB_CORETEXT_DEFAULT_FONT_SIZE);
auto arr = CTFontCopyAvailableTables (ct_font, kCTFontTableOptionNoOptions);
unsigned population = (unsigned) CFArrayGetCount (arr);
unsigned end_offset;
if (!table_count)
goto done;
if (unlikely (start_offset >= population))
{
*table_count = 0;
goto done;
}
end_offset = start_offset + *table_count;
if (unlikely (end_offset < start_offset))
{
*table_count = 0;
goto done;
}
end_offset= hb_min (end_offset, (unsigned) population);
*table_count = end_offset - start_offset;
for (unsigned i = start_offset; i < end_offset; i++)
{
CTFontTableTag tag = (CTFontTableTag)(uintptr_t) CFArrayGetValueAtIndex (arr, i);
table_tags[i - start_offset] = tag;
}
done:
CFRelease (arr);
CFRelease (ct_font);
return population;
}
static void static void
_hb_cg_font_release (void *data) _hb_cg_font_release (void *data)
{ {
@ -294,7 +342,9 @@ _hb_coretext_shaper_face_data_destroy (hb_coretext_face_data_t *data)
hb_face_t * hb_face_t *
hb_coretext_face_create (CGFontRef cg_font) hb_coretext_face_create (CGFontRef cg_font)
{ {
return hb_face_create_for_tables (_hb_cg_reference_table, CGFontRetain (cg_font), _hb_cg_font_release); hb_face_t *face = hb_face_create_for_tables (_hb_cg_reference_table, CGFontRetain (cg_font), _hb_cg_font_release);
hb_face_set_get_table_tags_func (face, _hb_cg_get_table_tags, cg_font, nullptr);
return face;
} }
/** /**

View File

@ -42,7 +42,7 @@
struct face_table_info_t struct face_table_info_t
{ {
hb_blob_t* data; hb_blob_t* data;
signed order; unsigned order;
}; };
struct hb_face_builder_data_t struct hb_face_builder_data_t
@ -153,6 +153,50 @@ _hb_face_builder_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void
return hb_blob_reference (data->tables[tag].data); return hb_blob_reference (data->tables[tag].data);
} }
static unsigned
_hb_face_builder_get_table_tags (const hb_face_t *face HB_UNUSED,
unsigned int start_offset,
unsigned int *table_count,
hb_tag_t *table_tags,
void *user_data)
{
hb_face_builder_data_t *data = (hb_face_builder_data_t *) user_data;
unsigned population = data->tables.get_population ();
if (!table_count)
return population;
if (unlikely (start_offset >= population))
{
if (table_count)
*table_count = 0;
return population;
}
// Sort the tags.
hb_vector_t<hb_tag_t> sorted_tags;
data->tables.keys () | hb_sink (sorted_tags);
if (unlikely (sorted_tags.in_error ()))
{
// Not much to do...
}
sorted_tags.qsort ([] (const void* a, const void* b) {
return * (hb_tag_t *) a < * (hb_tag_t *) b ? -1 :
* (hb_tag_t *) a == * (hb_tag_t *) b ? 0 :
+1;
});
auto array = sorted_tags.as_array ().sub_array (start_offset, table_count);
auto out = hb_array (table_tags, *table_count);
+ array.iter ()
| hb_sink (out)
;
return population;
}
/** /**
* hb_face_builder_create: * hb_face_builder_create:
@ -171,9 +215,16 @@ hb_face_builder_create ()
hb_face_builder_data_t *data = _hb_face_builder_data_create (); hb_face_builder_data_t *data = _hb_face_builder_data_create ();
if (unlikely (!data)) return hb_face_get_empty (); if (unlikely (!data)) return hb_face_get_empty ();
return hb_face_create_for_tables (_hb_face_builder_reference_table, hb_face_t *face = hb_face_create_for_tables (_hb_face_builder_reference_table,
data, data,
_hb_face_builder_data_destroy); _hb_face_builder_data_destroy);
hb_face_set_get_table_tags_func (face,
_hb_face_builder_get_table_tags,
data,
nullptr);
return face;
} }
/** /**
@ -199,7 +250,7 @@ hb_face_builder_add_table (hb_face_t *face, hb_tag_t tag, hb_blob_t *blob)
hb_face_builder_data_t *data = (hb_face_builder_data_t *) face->user_data; hb_face_builder_data_t *data = (hb_face_builder_data_t *) face->user_data;
hb_blob_t* previous = data->tables.get (tag).data; hb_blob_t* previous = data->tables.get (tag).data;
if (!data->tables.set (tag, face_table_info_t {hb_blob_reference (blob), -1})) if (!data->tables.set (tag, face_table_info_t {hb_blob_reference (blob), (unsigned) -1}))
{ {
hb_blob_destroy (blob); hb_blob_destroy (blob);
return false; return false;

View File

@ -90,10 +90,6 @@ DEFINE_NULL_INSTANCE (hb_face_t) =
{ {
HB_OBJECT_HEADER_STATIC, HB_OBJECT_HEADER_STATIC,
nullptr, /* reference_table_func */
nullptr, /* user_data */
nullptr, /* destroy */
0, /* index */ 0, /* index */
1000, /* upem */ 1000, /* upem */
0, /* num_glyphs */ 0, /* num_glyphs */
@ -110,8 +106,9 @@ DEFINE_NULL_INSTANCE (hb_face_t) =
* *
* Variant of hb_face_create(), built for those cases where it is more * Variant of hb_face_create(), built for those cases where it is more
* convenient to provide data for individual tables instead of the whole font * convenient to provide data for individual tables instead of the whole font
* data. With the caveat that hb_face_get_table_tags() does not currently work * data. With the caveat that hb_face_get_table_tags() would not work
* with faces created this way. * with faces created this way. You can address that by calling the
* hb_face_set_get_table_tags_func() function and setting the appropriate callback.
* *
* Creates a new face object from the specified @user_data and @reference_table_func, * Creates a new face object from the specified @user_data and @reference_table_func,
* with the @destroy callback. * with the @destroy callback.
@ -194,6 +191,22 @@ _hb_face_for_data_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void
return blob; return blob;
} }
static unsigned
_hb_face_for_data_get_table_tags (const hb_face_t *face HB_UNUSED,
unsigned int start_offset,
unsigned int *table_count,
hb_tag_t *table_tags,
void *user_data)
{
hb_face_for_data_closure_t *data = (hb_face_for_data_closure_t *) user_data;
const OT::OpenTypeFontFile &ot_file = *data->blob->as<OT::OpenTypeFontFile> ();
const OT::OpenTypeFontFace &ot_face = ot_file.get_face (data->index);
return ot_face.get_table_tags (start_offset, table_count, table_tags);
}
/** /**
* hb_face_create: * hb_face_create:
* @blob: #hb_blob_t to work upon * @blob: #hb_blob_t to work upon
@ -240,6 +253,10 @@ hb_face_create (hb_blob_t *blob,
face = hb_face_create_for_tables (_hb_face_for_data_reference_table, face = hb_face_create_for_tables (_hb_face_for_data_reference_table,
closure, closure,
_hb_face_for_data_closure_destroy); _hb_face_for_data_closure_destroy);
hb_face_set_get_table_tags_func (face,
_hb_face_for_data_get_table_tags,
closure,
nullptr);
face->index = index; face->index = index;
@ -306,6 +323,9 @@ hb_face_destroy (hb_face_t *face)
face->data.fini (); face->data.fini ();
face->table.fini (); face->table.fini ();
if (face->get_table_tags_destroy)
face->get_table_tags_destroy (face->get_table_tags_user_data);
if (face->destroy) if (face->destroy)
face->destroy (face->user_data); face->destroy (face->user_data);
@ -547,6 +567,37 @@ hb_face_get_glyph_count (const hb_face_t *face)
return face->get_num_glyphs (); return face->get_num_glyphs ();
} }
/**
* hb_face_set_get_table_tags_func:
* @face: A face object
* @func: (closure user_data) (destroy destroy) (scope notified): The table-tag-fetching function
* @user_data: A pointer to the user data, to be destroyed by @destroy when not needed anymore
* @destroy: (nullable): A callback to call when @func is not needed anymore
*
* Sets the table-tag-fetching function for the specified face object.
*
* Since: 10.0.0
*/
HB_EXTERN void
hb_face_set_get_table_tags_func (hb_face_t *face,
hb_get_table_tags_func_t func,
void *user_data,
hb_destroy_func_t destroy)
{
if (hb_object_is_immutable (face))
{
if (destroy)
destroy (user_data);
}
if (face->get_table_tags_destroy)
face->get_table_tags_destroy (face->get_table_tags_user_data);
face->get_table_tags_func = func;
face->get_table_tags_user_data = user_data;
face->get_table_tags_destroy = destroy;
}
/** /**
* hb_face_get_table_tags: * hb_face_get_table_tags:
* @face: A face object * @face: A face object
@ -568,19 +619,14 @@ hb_face_get_table_tags (const hb_face_t *face,
unsigned int *table_count, /* IN/OUT */ unsigned int *table_count, /* IN/OUT */
hb_tag_t *table_tags /* OUT */) hb_tag_t *table_tags /* OUT */)
{ {
if (face->destroy != (hb_destroy_func_t) _hb_face_for_data_closure_destroy) if (!face->get_table_tags_func)
{ {
if (table_count) if (table_count)
*table_count = 0; *table_count = 0;
return 0; return 0;
} }
hb_face_for_data_closure_t *data = (hb_face_for_data_closure_t *) face->user_data; return face->get_table_tags_func (face, start_offset, table_count, table_tags, face->get_table_tags_user_data);
const OT::OpenTypeFontFile &ot_file = *data->blob->as<OT::OpenTypeFontFile> ();
const OT::OpenTypeFontFace &ot_face = ot_file.get_face (data->index);
return ot_face.get_table_tags (start_offset, table_count, table_tags);
} }

View File

@ -135,6 +135,34 @@ hb_face_set_glyph_count (hb_face_t *face,
HB_EXTERN unsigned int HB_EXTERN unsigned int
hb_face_get_glyph_count (const hb_face_t *face); hb_face_get_glyph_count (const hb_face_t *face);
/**
* hb_get_table_tags_func_t:
* @face: A face object
* @start_offset: The index of first table tag to retrieve
* @table_count: (inout): Input = the maximum number of table tags to return;
* Output = the actual number of table tags returned (may be zero)
* @table_tags: (out) (array length=table_count): The array of table tags found
* @user_data: User data pointer passed by the caller
*
* Callback function for hb_face_get_table_tags().
*
* Return value: Total number of tables, or zero if it is not possible to list
*
* Since: 10.0.0
*/
typedef unsigned int (*hb_get_table_tags_func_t) (const hb_face_t *face,
unsigned int start_offset,
unsigned int *table_count, /* IN/OUT */
hb_tag_t *table_tags /* OUT */,
void *user_data);
HB_EXTERN void
hb_face_set_get_table_tags_func (hb_face_t *face,
hb_get_table_tags_func_t func,
void *user_data,
hb_destroy_func_t destroy);
HB_EXTERN unsigned int HB_EXTERN unsigned int
hb_face_get_table_tags (const hb_face_t *face, hb_face_get_table_tags (const hb_face_t *face,
unsigned int start_offset, unsigned int start_offset,

View File

@ -48,13 +48,17 @@ struct hb_face_t
{ {
hb_object_header_t header; hb_object_header_t header;
unsigned int index; /* Face index in a collection, zero-based. */
mutable hb_atomic_int_t upem; /* Units-per-EM. */
mutable hb_atomic_int_t num_glyphs; /* Number of glyphs. */
hb_reference_table_func_t reference_table_func; hb_reference_table_func_t reference_table_func;
void *user_data; void *user_data;
hb_destroy_func_t destroy; hb_destroy_func_t destroy;
unsigned int index; /* Face index in a collection, zero-based. */ hb_get_table_tags_func_t get_table_tags_func;
mutable hb_atomic_int_t upem; /* Units-per-EM. */ void *get_table_tags_user_data;
mutable hb_atomic_int_t num_glyphs; /* Number of glyphs. */ hb_destroy_func_t get_table_tags_destroy;
hb_shaper_object_dataset_t<hb_face_t> data;/* Various shaper data. */ hb_shaper_object_dataset_t<hb_face_t> data;/* Various shaper data. */
hb_ot_face_t table; /* All the face's tables. */ hb_ot_face_t table; /* All the face's tables. */

View File

@ -1104,6 +1104,45 @@ _hb_ft_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data
buffer, hb_free); buffer, hb_free);
} }
static unsigned
_hb_ft_get_table_tags (const hb_face_t *face HB_UNUSED,
unsigned int start_offset,
unsigned int *table_count,
hb_tag_t *table_tags,
void *user_data)
{
FT_Face ft_face = (FT_Face) user_data;
FT_ULong population = 0;
FT_Sfnt_Table_Info (ft_face,
0, // table_index; ignored
nullptr,
&population);
if (!table_count)
return population;
else
*table_count = 0;
if (unlikely (start_offset >= population))
return population;
unsigned end_offset = hb_min (start_offset + *table_count, (unsigned) population);
if (unlikely (end_offset < start_offset))
return population;
*table_count = end_offset - start_offset;
for (unsigned i = start_offset; i < end_offset; i++)
{
FT_ULong tag = 0, length;
FT_Sfnt_Table_Info (ft_face, i, &tag, &length);
table_tags[i - start_offset] = tag;
}
return population;
}
/** /**
* hb_ft_face_create: * hb_ft_face_create:
* @ft_face: (destroy destroy) (scope notified): FT_Face to work upon * @ft_face: (destroy destroy) (scope notified): FT_Face to work upon
@ -1145,6 +1184,7 @@ hb_ft_face_create (FT_Face ft_face,
hb_blob_destroy (blob); hb_blob_destroy (blob);
} else { } else {
face = hb_face_create_for_tables (_hb_ft_reference_table, ft_face, destroy); face = hb_face_create_for_tables (_hb_ft_reference_table, ft_face, destroy);
hb_face_set_get_table_tags_func (face, _hb_ft_get_table_tags, ft_face, nullptr);
} }
hb_face_set_index (face, ft_face->face_index); hb_face_set_index (face, ft_face->face_index);

View File

@ -250,7 +250,7 @@ struct TTCHeader
{ {
switch (u.header.version.major) { switch (u.header.version.major) {
case 2: /* version 2 is compatible with version 1 */ case 2: /* version 2 is compatible with version 1 */
case 1: return u.version1.get_face_count (); case 1: hb_barrier (); return u.version1.get_face_count ();
default:return 0; default:return 0;
} }
} }
@ -258,7 +258,7 @@ struct TTCHeader
{ {
switch (u.header.version.major) { switch (u.header.version.major) {
case 2: /* version 2 is compatible with version 1 */ case 2: /* version 2 is compatible with version 1 */
case 1: return u.version1.get_face (i); case 1: hb_barrier (); return u.version1.get_face (i);
default:return Null (OpenTypeFontFace); default:return Null (OpenTypeFontFace);
} }
} }
@ -270,7 +270,7 @@ struct TTCHeader
hb_barrier (); hb_barrier ();
switch (u.header.version.major) { switch (u.header.version.major) {
case 2: /* version 2 is compatible with version 1 */ case 2: /* version 2 is compatible with version 1 */
case 1: return_trace (u.version1.sanitize (c)); case 1: hb_barrier (); return_trace (u.version1.sanitize (c));
default:return_trace (true); default:return_trace (true);
} }
} }

View File

@ -209,7 +209,7 @@ struct HBUINT32VAR
} }
protected: protected:
unsigned char v[1]; unsigned char v[5];
public: public:
DEFINE_SIZE_MIN (1); DEFINE_SIZE_MIN (1);
@ -654,7 +654,7 @@ struct UnsizedListOfOffset16To : UnsizedArray16OfOffsetTo<Type, OffsetType, Base
unsigned int i = (unsigned int) i_; unsigned int i = (unsigned int) i_;
const OffsetTo<Type, OffsetType, BaseType, has_null> *p = &this->arrayZ[i]; const OffsetTo<Type, OffsetType, BaseType, has_null> *p = &this->arrayZ[i];
if (unlikely ((const void *) p < (const void *) this->arrayZ)) return Null (Type); /* Overflowed. */ if (unlikely ((const void *) p < (const void *) this->arrayZ)) return Null (Type); /* Overflowed. */
_hb_compiler_memory_r_barrier (); hb_barrier ();
return this+*p; return this+*p;
} }
Type& operator [] (int i_) Type& operator [] (int i_)
@ -662,7 +662,7 @@ struct UnsizedListOfOffset16To : UnsizedArray16OfOffsetTo<Type, OffsetType, Base
unsigned int i = (unsigned int) i_; unsigned int i = (unsigned int) i_;
const OffsetTo<Type, OffsetType, BaseType, has_null> *p = &this->arrayZ[i]; const OffsetTo<Type, OffsetType, BaseType, has_null> *p = &this->arrayZ[i];
if (unlikely ((const void *) p < (const void *) this->arrayZ)) return Crap (Type); /* Overflowed. */ if (unlikely ((const void *) p < (const void *) this->arrayZ)) return Crap (Type); /* Overflowed. */
_hb_compiler_memory_r_barrier (); hb_barrier ();
return this+*p; return this+*p;
} }
@ -713,14 +713,14 @@ struct ArrayOf
{ {
unsigned int i = (unsigned int) i_; unsigned int i = (unsigned int) i_;
if (unlikely (i >= len)) return Null (Type); if (unlikely (i >= len)) return Null (Type);
_hb_compiler_memory_r_barrier (); hb_barrier ();
return arrayZ[i]; return arrayZ[i];
} }
Type& operator [] (int i_) Type& operator [] (int i_)
{ {
unsigned int i = (unsigned int) i_; unsigned int i = (unsigned int) i_;
if (unlikely (i >= len)) return Crap (Type); if (unlikely (i >= len)) return Crap (Type);
_hb_compiler_memory_r_barrier (); hb_barrier ();
return arrayZ[i]; return arrayZ[i];
} }
@ -853,14 +853,14 @@ struct List16OfOffsetTo : ArrayOf<OffsetTo<Type, OffsetType>, HBUINT16>
{ {
unsigned int i = (unsigned int) i_; unsigned int i = (unsigned int) i_;
if (unlikely (i >= this->len)) return Null (Type); if (unlikely (i >= this->len)) return Null (Type);
_hb_compiler_memory_r_barrier (); hb_barrier ();
return this+this->arrayZ[i]; return this+this->arrayZ[i];
} }
const Type& operator [] (int i_) const Type& operator [] (int i_)
{ {
unsigned int i = (unsigned int) i_; unsigned int i = (unsigned int) i_;
if (unlikely (i >= this->len)) return Crap (Type); if (unlikely (i >= this->len)) return Crap (Type);
_hb_compiler_memory_r_barrier (); hb_barrier ();
return this+this->arrayZ[i]; return this+this->arrayZ[i];
} }
@ -898,14 +898,14 @@ struct HeadlessArrayOf
{ {
unsigned int i = (unsigned int) i_; unsigned int i = (unsigned int) i_;
if (unlikely (i >= lenP1 || !i)) return Null (Type); if (unlikely (i >= lenP1 || !i)) return Null (Type);
_hb_compiler_memory_r_barrier (); hb_barrier ();
return arrayZ[i-1]; return arrayZ[i-1];
} }
Type& operator [] (int i_) Type& operator [] (int i_)
{ {
unsigned int i = (unsigned int) i_; unsigned int i = (unsigned int) i_;
if (unlikely (i >= lenP1 || !i)) return Crap (Type); if (unlikely (i >= lenP1 || !i)) return Crap (Type);
_hb_compiler_memory_r_barrier (); hb_barrier ();
return arrayZ[i-1]; return arrayZ[i-1];
} }
unsigned int get_size () const unsigned int get_size () const
@ -992,14 +992,14 @@ struct ArrayOfM1
{ {
unsigned int i = (unsigned int) i_; unsigned int i = (unsigned int) i_;
if (unlikely (i > lenM1)) return Null (Type); if (unlikely (i > lenM1)) return Null (Type);
_hb_compiler_memory_r_barrier (); hb_barrier ();
return arrayZ[i]; return arrayZ[i];
} }
Type& operator [] (int i_) Type& operator [] (int i_)
{ {
unsigned int i = (unsigned int) i_; unsigned int i = (unsigned int) i_;
if (unlikely (i > lenM1)) return Crap (Type); if (unlikely (i > lenM1)) return Crap (Type);
_hb_compiler_memory_r_barrier (); hb_barrier ();
return arrayZ[i]; return arrayZ[i];
} }
unsigned int get_size () const unsigned int get_size () const
@ -1184,14 +1184,14 @@ struct VarSizedBinSearchArrayOf
{ {
unsigned int i = (unsigned int) i_; unsigned int i = (unsigned int) i_;
if (unlikely (i >= get_length ())) return Null (Type); if (unlikely (i >= get_length ())) return Null (Type);
_hb_compiler_memory_r_barrier (); hb_barrier ();
return StructAtOffset<Type> (&bytesZ, i * header.unitSize); return StructAtOffset<Type> (&bytesZ, i * header.unitSize);
} }
Type& operator [] (int i_) Type& operator [] (int i_)
{ {
unsigned int i = (unsigned int) i_; unsigned int i = (unsigned int) i_;
if (unlikely (i >= get_length ())) return Crap (Type); if (unlikely (i >= get_length ())) return Crap (Type);
_hb_compiler_memory_r_barrier (); hb_barrier ();
return StructAtOffset<Type> (&bytesZ, i * header.unitSize); return StructAtOffset<Type> (&bytesZ, i * header.unitSize);
} }
unsigned int get_length () const unsigned int get_length () const
@ -1441,7 +1441,7 @@ struct CFFIndex
hb_ubytes_t operator [] (unsigned int index) const hb_ubytes_t operator [] (unsigned int index) const
{ {
if (unlikely (index >= count)) return hb_ubytes_t (); if (unlikely (index >= count)) return hb_ubytes_t ();
_hb_compiler_memory_r_barrier (); hb_barrier ();
unsigned offset0 = offset_at (index); unsigned offset0 = offset_at (index);
unsigned offset1 = offset_at (index + 1); unsigned offset1 = offset_at (index + 1);
if (unlikely (offset1 < offset0 || offset1 > offset_at (count))) if (unlikely (offset1 < offset0 || offset1 > offset_at (count)))
@ -1496,7 +1496,7 @@ struct TupleValues
}; };
static unsigned compile (hb_array_t<const int> values, /* IN */ static unsigned compile (hb_array_t<const int> values, /* IN */
hb_array_t<char> encoded_bytes /* OUT */) hb_array_t<unsigned char> encoded_bytes /* OUT */)
{ {
unsigned num_values = values.length; unsigned num_values = values.length;
unsigned encoded_len = 0; unsigned encoded_len = 0;
@ -1517,7 +1517,7 @@ struct TupleValues
} }
static unsigned encode_value_run_as_zeroes (unsigned& i, static unsigned encode_value_run_as_zeroes (unsigned& i,
hb_array_t<char> encoded_bytes, hb_array_t<unsigned char> encoded_bytes,
hb_array_t<const int> values) hb_array_t<const int> values)
{ {
unsigned num_values = values.length; unsigned num_values = values.length;
@ -1546,7 +1546,7 @@ struct TupleValues
} }
static unsigned encode_value_run_as_bytes (unsigned &i, static unsigned encode_value_run_as_bytes (unsigned &i,
hb_array_t<char> encoded_bytes, hb_array_t<unsigned char> encoded_bytes,
hb_array_t<const int> values) hb_array_t<const int> values)
{ {
unsigned start = i; unsigned start = i;
@ -1600,7 +1600,7 @@ struct TupleValues
} }
static unsigned encode_value_run_as_words (unsigned &i, static unsigned encode_value_run_as_words (unsigned &i,
hb_array_t<char> encoded_bytes, hb_array_t<unsigned char> encoded_bytes,
hb_array_t<const int> values) hb_array_t<const int> values)
{ {
unsigned start = i; unsigned start = i;
@ -1661,7 +1661,7 @@ struct TupleValues
} }
static unsigned encode_value_run_as_longs (unsigned &i, static unsigned encode_value_run_as_longs (unsigned &i,
hb_array_t<char> encoded_bytes, hb_array_t<unsigned char> encoded_bytes,
hb_array_t<const int> values) hb_array_t<const int> values)
{ {
unsigned start = i; unsigned start = i;

View File

@ -308,8 +308,8 @@ struct FDSelect
{ {
switch (format) switch (format)
{ {
case 0: return format.static_size + u.format0.get_size (num_glyphs); case 0: hb_barrier (); return format.static_size + u.format0.get_size (num_glyphs);
case 3: return format.static_size + u.format3.get_size (); case 3: hb_barrier (); return format.static_size + u.format3.get_size ();
default:return 0; default:return 0;
} }
} }
@ -320,8 +320,8 @@ struct FDSelect
switch (format) switch (format)
{ {
case 0: return u.format0.get_fd (glyph); case 0: hb_barrier (); return u.format0.get_fd (glyph);
case 3: return u.format3.get_fd (glyph); case 3: hb_barrier (); return u.format3.get_fd (glyph);
default:return 0; default:return 0;
} }
} }
@ -332,8 +332,8 @@ struct FDSelect
switch (format) switch (format)
{ {
case 0: return u.format0.get_fd_range (glyph); case 0: hb_barrier (); return u.format0.get_fd_range (glyph);
case 3: return u.format3.get_fd_range (glyph); case 3: hb_barrier (); return u.format3.get_fd_range (glyph);
default:return {0, 1}; default:return {0, 1};
} }
} }
@ -347,8 +347,8 @@ struct FDSelect
switch (format) switch (format)
{ {
case 0: return_trace (u.format0.sanitize (c, fdcount)); case 0: hb_barrier (); return_trace (u.format0.sanitize (c, fdcount));
case 3: return_trace (u.format3.sanitize (c, fdcount)); case 3: hb_barrier (); return_trace (u.format3.sanitize (c, fdcount));
default:return_trace (false); default:return_trace (false);
} }
} }

View File

@ -239,8 +239,8 @@ struct Encoding
unsigned int size = min_size; unsigned int size = min_size;
switch (table_format ()) switch (table_format ())
{ {
case 0: size += u.format0.get_size (); break; case 0: hb_barrier (); size += u.format0.get_size (); break;
case 1: size += u.format1.get_size (); break; case 1: hb_barrier (); size += u.format1.get_size (); break;
} }
if (has_supplement ()) if (has_supplement ())
size += suppEncData ().get_size (); size += suppEncData ().get_size ();
@ -251,8 +251,8 @@ struct Encoding
{ {
switch (table_format ()) switch (table_format ())
{ {
case 0: return u.format0.get_code (glyph); case 0: hb_barrier (); return u.format0.get_code (glyph);
case 1: return u.format1.get_code (glyph); case 1: hb_barrier (); return u.format1.get_code (glyph);
default:return 0; default:return 0;
} }
} }
@ -276,8 +276,8 @@ struct Encoding
switch (table_format ()) switch (table_format ())
{ {
case 0: if (unlikely (!u.format0.sanitize (c))) { return_trace (false); } break; case 0: hb_barrier (); if (unlikely (!u.format0.sanitize (c))) { return_trace (false); } break;
case 1: if (unlikely (!u.format1.sanitize (c))) { return_trace (false); } break; case 1: hb_barrier (); if (unlikely (!u.format1.sanitize (c))) { return_trace (false); } break;
default:return_trace (false); default:return_trace (false);
} }
return_trace (likely (!has_supplement () || suppEncData ().sanitize (c))); return_trace (likely (!has_supplement () || suppEncData ().sanitize (c)));
@ -288,8 +288,8 @@ struct Encoding
{ {
switch (table_format ()) switch (table_format ())
{ {
case 0: return StructAfter<CFF1SuppEncData> (u.format0.codes[u.format0.nCodes ()-1]); case 0: hb_barrier (); return StructAfter<CFF1SuppEncData> (u.format0.codes[u.format0.nCodes ()-1]);
case 1: return StructAfter<CFF1SuppEncData> (u.format1.ranges[u.format1.nRanges ()-1]); case 1: hb_barrier (); return StructAfter<CFF1SuppEncData> (u.format1.ranges[u.format1.nRanges ()-1]);
default:return Null (CFF1SuppEncData); default:return Null (CFF1SuppEncData);
} }
} }
@ -567,9 +567,9 @@ struct Charset
{ {
switch (format) switch (format)
{ {
case 0: return min_size + u.format0.get_size (num_glyphs); case 0: hb_barrier (); return min_size + u.format0.get_size (num_glyphs);
case 1: return min_size + u.format1.get_size (num_glyphs); case 1: hb_barrier (); return min_size + u.format1.get_size (num_glyphs);
case 2: return min_size + u.format2.get_size (num_glyphs); case 2: hb_barrier (); return min_size + u.format2.get_size (num_glyphs);
default:return 0; default:return 0;
} }
} }
@ -579,9 +579,9 @@ struct Charset
{ {
switch (format) switch (format)
{ {
case 0: return u.format0.get_sid (glyph, num_glyphs); case 0: hb_barrier (); return u.format0.get_sid (glyph, num_glyphs);
case 1: return u.format1.get_sid (glyph, num_glyphs, cache); case 1: hb_barrier (); return u.format1.get_sid (glyph, num_glyphs, cache);
case 2: return u.format2.get_sid (glyph, num_glyphs, cache); case 2: hb_barrier (); return u.format2.get_sid (glyph, num_glyphs, cache);
default:return 0; default:return 0;
} }
} }
@ -590,9 +590,9 @@ struct Charset
{ {
switch (format) switch (format)
{ {
case 0: u.format0.collect_glyph_to_sid_map (mapping, num_glyphs); return; case 0: hb_barrier (); u.format0.collect_glyph_to_sid_map (mapping, num_glyphs); return;
case 1: u.format1.collect_glyph_to_sid_map (mapping, num_glyphs); return; case 1: hb_barrier (); u.format1.collect_glyph_to_sid_map (mapping, num_glyphs); return;
case 2: u.format2.collect_glyph_to_sid_map (mapping, num_glyphs); return; case 2: hb_barrier (); u.format2.collect_glyph_to_sid_map (mapping, num_glyphs); return;
default:return; default:return;
} }
} }
@ -601,9 +601,9 @@ struct Charset
{ {
switch (format) switch (format)
{ {
case 0: return u.format0.get_glyph (sid, num_glyphs); case 0: hb_barrier (); return u.format0.get_glyph (sid, num_glyphs);
case 1: return u.format1.get_glyph (sid, num_glyphs); case 1: hb_barrier (); return u.format1.get_glyph (sid, num_glyphs);
case 2: return u.format2.get_glyph (sid, num_glyphs); case 2: hb_barrier (); return u.format2.get_glyph (sid, num_glyphs);
default:return 0; default:return 0;
} }
} }
@ -617,9 +617,9 @@ struct Charset
switch (format) switch (format)
{ {
case 0: return_trace (u.format0.sanitize (c, c->get_num_glyphs (), num_charset_entries)); case 0: hb_barrier (); return_trace (u.format0.sanitize (c, c->get_num_glyphs (), num_charset_entries));
case 1: return_trace (u.format1.sanitize (c, c->get_num_glyphs (), num_charset_entries)); case 1: hb_barrier (); return_trace (u.format1.sanitize (c, c->get_num_glyphs (), num_charset_entries));
case 2: return_trace (u.format2.sanitize (c, c->get_num_glyphs (), num_charset_entries)); case 2: hb_barrier (); return_trace (u.format2.sanitize (c, c->get_num_glyphs (), num_charset_entries));
default:return_trace (false); default:return_trace (false);
} }
} }

View File

@ -62,9 +62,9 @@ struct CFF2FDSelect
{ {
switch (format) switch (format)
{ {
case 0: return format.static_size + u.format0.get_size (num_glyphs); case 0: hb_barrier (); return format.static_size + u.format0.get_size (num_glyphs);
case 3: return format.static_size + u.format3.get_size (); case 3: hb_barrier (); return format.static_size + u.format3.get_size ();
case 4: return format.static_size + u.format4.get_size (); case 4: hb_barrier (); return format.static_size + u.format4.get_size ();
default:return 0; default:return 0;
} }
} }
@ -76,9 +76,9 @@ struct CFF2FDSelect
switch (format) switch (format)
{ {
case 0: return u.format0.get_fd (glyph); case 0: hb_barrier (); return u.format0.get_fd (glyph);
case 3: return u.format3.get_fd (glyph); case 3: hb_barrier (); return u.format3.get_fd (glyph);
case 4: return u.format4.get_fd (glyph); case 4: hb_barrier (); return u.format4.get_fd (glyph);
default:return 0; default:return 0;
} }
} }
@ -92,9 +92,9 @@ struct CFF2FDSelect
switch (format) switch (format)
{ {
case 0: return_trace (u.format0.sanitize (c, fdcount)); case 0: hb_barrier (); return_trace (u.format0.sanitize (c, fdcount));
case 3: return_trace (u.format3.sanitize (c, fdcount)); case 3: hb_barrier (); return_trace (u.format3.sanitize (c, fdcount));
case 4: return_trace (u.format4.sanitize (c, fdcount)); case 4: hb_barrier (); return_trace (u.format4.sanitize (c, fdcount));
default:return_trace (false); default:return_trace (false);
} }
} }

View File

@ -43,27 +43,145 @@ namespace OT {
static inline uint8_t unicode_to_macroman (hb_codepoint_t u) static inline uint8_t unicode_to_macroman (hb_codepoint_t u)
{ {
uint16_t mapping[] = { static const struct unicode_to_macroman_t
0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, {
0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8, uint16_t unicode;
0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, uint8_t macroman;
0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC, }
0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, mapping[] =
0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8, {
0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211, { 0x00A0, 0xCA },
0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8, { 0x00A1, 0xC1 },
0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, { 0x00A2, 0xA2 },
0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153, { 0x00A3, 0xA3 },
0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, { 0x00A5, 0xB4 },
0x00FF, 0x0178, 0x2044, 0x20AC, 0x2039, 0x203A, 0xFB01, 0xFB02, { 0x00A7, 0xA4 },
0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1, { 0x00A8, 0xAC },
0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4, { 0x00A9, 0xA9 },
0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC, { 0x00AA, 0xBB },
0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7 { 0x00AB, 0xC7 },
{ 0x00AC, 0xC2 },
{ 0x00AE, 0xA8 },
{ 0x00AF, 0xF8 },
{ 0x00B0, 0xA1 },
{ 0x00B1, 0xB1 },
{ 0x00B4, 0xAB },
{ 0x00B5, 0xB5 },
{ 0x00B6, 0xA6 },
{ 0x00B7, 0xE1 },
{ 0x00B8, 0xFC },
{ 0x00BA, 0xBC },
{ 0x00BB, 0xC8 },
{ 0x00BF, 0xC0 },
{ 0x00C0, 0xCB },
{ 0x00C1, 0xE7 },
{ 0x00C2, 0xE5 },
{ 0x00C3, 0xCC },
{ 0x00C4, 0x80 },
{ 0x00C5, 0x81 },
{ 0x00C6, 0xAE },
{ 0x00C7, 0x82 },
{ 0x00C8, 0xE9 },
{ 0x00C9, 0x83 },
{ 0x00CA, 0xE6 },
{ 0x00CB, 0xE8 },
{ 0x00CC, 0xED },
{ 0x00CD, 0xEA },
{ 0x00CE, 0xEB },
{ 0x00CF, 0xEC },
{ 0x00D1, 0x84 },
{ 0x00D2, 0xF1 },
{ 0x00D3, 0xEE },
{ 0x00D4, 0xEF },
{ 0x00D5, 0xCD },
{ 0x00D6, 0x85 },
{ 0x00D8, 0xAF },
{ 0x00D9, 0xF4 },
{ 0x00DA, 0xF2 },
{ 0x00DB, 0xF3 },
{ 0x00DC, 0x86 },
{ 0x00DF, 0xA7 },
{ 0x00E0, 0x88 },
{ 0x00E1, 0x87 },
{ 0x00E2, 0x89 },
{ 0x00E3, 0x8B },
{ 0x00E4, 0x8A },
{ 0x00E5, 0x8C },
{ 0x00E6, 0xBE },
{ 0x00E7, 0x8D },
{ 0x00E8, 0x8F },
{ 0x00E9, 0x8E },
{ 0x00EA, 0x90 },
{ 0x00EB, 0x91 },
{ 0x00EC, 0x93 },
{ 0x00ED, 0x92 },
{ 0x00EE, 0x94 },
{ 0x00EF, 0x95 },
{ 0x00F1, 0x96 },
{ 0x00F2, 0x98 },
{ 0x00F3, 0x97 },
{ 0x00F4, 0x99 },
{ 0x00F5, 0x9B },
{ 0x00F6, 0x9A },
{ 0x00F7, 0xD6 },
{ 0x00F8, 0xBF },
{ 0x00F9, 0x9D },
{ 0x00FA, 0x9C },
{ 0x00FB, 0x9E },
{ 0x00FC, 0x9F },
{ 0x00FF, 0xD8 },
{ 0x0131, 0xF5 },
{ 0x0152, 0xCE },
{ 0x0153, 0xCF },
{ 0x0178, 0xD9 },
{ 0x0192, 0xC4 },
{ 0x02C6, 0xF6 },
{ 0x02C7, 0xFF },
{ 0x02D8, 0xF9 },
{ 0x02D9, 0xFA },
{ 0x02DA, 0xFB },
{ 0x02DB, 0xFE },
{ 0x02DC, 0xF7 },
{ 0x02DD, 0xFD },
{ 0x03A9, 0xBD },
{ 0x03C0, 0xB9 },
{ 0x2013, 0xD0 },
{ 0x2014, 0xD1 },
{ 0x2018, 0xD4 },
{ 0x2019, 0xD5 },
{ 0x201A, 0xE2 },
{ 0x201C, 0xD2 },
{ 0x201D, 0xD3 },
{ 0x201E, 0xE3 },
{ 0x2020, 0xA0 },
{ 0x2021, 0xE0 },
{ 0x2022, 0xA5 },
{ 0x2026, 0xC9 },
{ 0x2030, 0xE4 },
{ 0x2039, 0xDC },
{ 0x203A, 0xDD },
{ 0x2044, 0xDA },
{ 0x20AC, 0xDB },
{ 0x2122, 0xAA },
{ 0x2202, 0xB6 },
{ 0x2206, 0xC6 },
{ 0x220F, 0xB8 },
{ 0x2211, 0xB7 },
{ 0x221A, 0xC3 },
{ 0x221E, 0xB0 },
{ 0x222B, 0xBA },
{ 0x2248, 0xC5 },
{ 0x2260, 0xAD },
{ 0x2264, 0xB2 },
{ 0x2265, 0xB3 },
{ 0x25CA, 0xD7 },
{ 0xF8FF, 0xF0 },
{ 0xFB01, 0xDE },
{ 0xFB02, 0xDF },
}; };
uint16_t *c = hb_bsearch (u, mapping, ARRAY_LENGTH (mapping), sizeof (mapping[0]), auto *c = hb_bsearch (u, mapping, ARRAY_LENGTH (mapping), sizeof (mapping[0]),
_hb_cmp_operator<uint16_t, uint16_t>); _hb_cmp_operator<uint16_t, uint16_t>);
return c ? (c - mapping) + 0x7F : 0; return c ? c->macroman : 0;
} }
struct CmapSubtableFormat0 struct CmapSubtableFormat0
@ -1379,12 +1497,12 @@ struct CmapSubtable
hb_codepoint_t *glyph) const hb_codepoint_t *glyph) const
{ {
switch (u.format) { switch (u.format) {
case 0: return u.format0 .get_glyph (codepoint, glyph); case 0: hb_barrier (); return u.format0 .get_glyph (codepoint, glyph);
case 4: return u.format4 .get_glyph (codepoint, glyph); case 4: hb_barrier (); return u.format4 .get_glyph (codepoint, glyph);
case 6: return u.format6 .get_glyph (codepoint, glyph); case 6: hb_barrier (); return u.format6 .get_glyph (codepoint, glyph);
case 10: return u.format10.get_glyph (codepoint, glyph); case 10: hb_barrier (); return u.format10.get_glyph (codepoint, glyph);
case 12: return u.format12.get_glyph (codepoint, glyph); case 12: hb_barrier (); return u.format12.get_glyph (codepoint, glyph);
case 13: return u.format13.get_glyph (codepoint, glyph); case 13: hb_barrier (); return u.format13.get_glyph (codepoint, glyph);
case 14: case 14:
default: return false; default: return false;
} }
@ -1392,12 +1510,12 @@ struct CmapSubtable
void collect_unicodes (hb_set_t *out, unsigned int num_glyphs = UINT_MAX) const void collect_unicodes (hb_set_t *out, unsigned int num_glyphs = UINT_MAX) const
{ {
switch (u.format) { switch (u.format) {
case 0: u.format0 .collect_unicodes (out); return; case 0: hb_barrier (); u.format0 .collect_unicodes (out); return;
case 4: u.format4 .collect_unicodes (out); return; case 4: hb_barrier (); u.format4 .collect_unicodes (out); return;
case 6: u.format6 .collect_unicodes (out); return; case 6: hb_barrier (); u.format6 .collect_unicodes (out); return;
case 10: u.format10.collect_unicodes (out); return; case 10: hb_barrier (); u.format10.collect_unicodes (out); return;
case 12: u.format12.collect_unicodes (out, num_glyphs); return; case 12: hb_barrier (); u.format12.collect_unicodes (out, num_glyphs); return;
case 13: u.format13.collect_unicodes (out, num_glyphs); return; case 13: hb_barrier (); u.format13.collect_unicodes (out, num_glyphs); return;
case 14: case 14:
default: return; default: return;
} }
@ -1408,12 +1526,12 @@ struct CmapSubtable
unsigned num_glyphs = UINT_MAX) const unsigned num_glyphs = UINT_MAX) const
{ {
switch (u.format) { switch (u.format) {
case 0: u.format0 .collect_mapping (unicodes, mapping); return; case 0: hb_barrier (); u.format0 .collect_mapping (unicodes, mapping); return;
case 4: u.format4 .collect_mapping (unicodes, mapping); return; case 4: hb_barrier (); u.format4 .collect_mapping (unicodes, mapping); return;
case 6: u.format6 .collect_mapping (unicodes, mapping); return; case 6: hb_barrier (); u.format6 .collect_mapping (unicodes, mapping); return;
case 10: u.format10.collect_mapping (unicodes, mapping); return; case 10: hb_barrier (); u.format10.collect_mapping (unicodes, mapping); return;
case 12: u.format12.collect_mapping (unicodes, mapping, num_glyphs); return; case 12: hb_barrier (); u.format12.collect_mapping (unicodes, mapping, num_glyphs); return;
case 13: u.format13.collect_mapping (unicodes, mapping, num_glyphs); return; case 13: hb_barrier (); u.format13.collect_mapping (unicodes, mapping, num_glyphs); return;
case 14: case 14:
default: return; default: return;
} }
@ -1422,12 +1540,12 @@ struct CmapSubtable
unsigned get_language () const unsigned get_language () const
{ {
switch (u.format) { switch (u.format) {
case 0: return u.format0 .get_language (); case 0: hb_barrier (); return u.format0 .get_language ();
case 4: return u.format4 .get_language (); case 4: hb_barrier (); return u.format4 .get_language ();
case 6: return u.format6 .get_language (); case 6: hb_barrier (); return u.format6 .get_language ();
case 10: return u.format10.get_language (); case 10: hb_barrier (); return u.format10.get_language ();
case 12: return u.format12.get_language (); case 12: hb_barrier (); return u.format12.get_language ();
case 13: return u.format13.get_language (); case 13: hb_barrier (); return u.format13.get_language ();
case 14: case 14:
default: return 0; default: return 0;
} }
@ -1442,9 +1560,9 @@ struct CmapSubtable
const void *base) const void *base)
{ {
switch (format) { switch (format) {
case 4: return u.format4.serialize (c, it); case 4: hb_barrier (); return u.format4.serialize (c, it);
case 12: return u.format12.serialize (c, it); case 12: hb_barrier (); return u.format12.serialize (c, it);
case 14: return u.format14.serialize (c, &plan->unicodes, &plan->glyphs_requested, plan->glyph_map, base); case 14: hb_barrier (); return u.format14.serialize (c, &plan->unicodes, &plan->glyphs_requested, plan->glyph_map, base);
default: return; default: return;
} }
} }
@ -1455,13 +1573,13 @@ struct CmapSubtable
if (!u.format.sanitize (c)) return_trace (false); if (!u.format.sanitize (c)) return_trace (false);
hb_barrier (); hb_barrier ();
switch (u.format) { switch (u.format) {
case 0: return_trace (u.format0 .sanitize (c)); case 0: hb_barrier (); return_trace (u.format0 .sanitize (c));
case 4: return_trace (u.format4 .sanitize (c)); case 4: hb_barrier (); return_trace (u.format4 .sanitize (c));
case 6: return_trace (u.format6 .sanitize (c)); case 6: hb_barrier (); return_trace (u.format6 .sanitize (c));
case 10: return_trace (u.format10.sanitize (c)); case 10: hb_barrier (); return_trace (u.format10.sanitize (c));
case 12: return_trace (u.format12.sanitize (c)); case 12: hb_barrier (); return_trace (u.format12.sanitize (c));
case 13: return_trace (u.format13.sanitize (c)); case 13: hb_barrier (); return_trace (u.format13.sanitize (c));
case 14: return_trace (u.format14.sanitize (c)); case 14: hb_barrier (); return_trace (u.format14.sanitize (c));
default:return_trace (true); default:return_trace (true);
} }
} }

View File

@ -132,7 +132,7 @@ struct KernSubTable
{ {
switch (get_type ()) { switch (get_type ()) {
/* This method hooks up to hb_font_t's get_h_kerning. Only support Format0. */ /* This method hooks up to hb_font_t's get_h_kerning. Only support Format0. */
case 0: return u.format0.get_kerning (left, right); case 0: hb_barrier (); return u.format0.get_kerning (left, right);
default:return 0; default:return 0;
} }
} }
@ -311,9 +311,9 @@ struct kern
bool has_state_machine () const bool has_state_machine () const
{ {
switch (get_type ()) { switch (get_type ()) {
case 0: return u.ot.has_state_machine (); case 0: hb_barrier (); return u.ot.has_state_machine ();
#ifndef HB_NO_AAT_SHAPE #ifndef HB_NO_AAT_SHAPE
case 1: return u.aat.has_state_machine (); case 1: hb_barrier (); return u.aat.has_state_machine ();
#endif #endif
default:return false; default:return false;
} }
@ -322,9 +322,9 @@ struct kern
bool has_cross_stream () const bool has_cross_stream () const
{ {
switch (get_type ()) { switch (get_type ()) {
case 0: return u.ot.has_cross_stream (); case 0: hb_barrier (); return u.ot.has_cross_stream ();
#ifndef HB_NO_AAT_SHAPE #ifndef HB_NO_AAT_SHAPE
case 1: return u.aat.has_cross_stream (); case 1: hb_barrier (); return u.aat.has_cross_stream ();
#endif #endif
default:return false; default:return false;
} }
@ -333,9 +333,9 @@ struct kern
int get_h_kerning (hb_codepoint_t left, hb_codepoint_t right) const int get_h_kerning (hb_codepoint_t left, hb_codepoint_t right) const
{ {
switch (get_type ()) { switch (get_type ()) {
case 0: return u.ot.get_h_kerning (left, right); case 0: hb_barrier (); return u.ot.get_h_kerning (left, right);
#ifndef HB_NO_AAT_SHAPE #ifndef HB_NO_AAT_SHAPE
case 1: return u.aat.get_h_kerning (left, right); case 1: hb_barrier (); return u.aat.get_h_kerning (left, right);
#endif #endif
default:return 0; default:return 0;
} }
@ -370,9 +370,9 @@ struct kern
AAT::kern_accelerator_data_t create_accelerator_data (unsigned num_glyphs) const AAT::kern_accelerator_data_t create_accelerator_data (unsigned num_glyphs) const
{ {
switch (get_type ()) { switch (get_type ()) {
case 0: return u.ot.create_accelerator_data (num_glyphs); case 0: hb_barrier (); return u.ot.create_accelerator_data (num_glyphs);
#ifndef HB_NO_AAT_SHAPE #ifndef HB_NO_AAT_SHAPE
case 1: return u.aat.create_accelerator_data (num_glyphs); case 1: hb_barrier (); return u.aat.create_accelerator_data (num_glyphs);
#endif #endif
default:return AAT::kern_accelerator_data_t (); default:return AAT::kern_accelerator_data_t ();
} }

View File

@ -172,9 +172,9 @@ struct BaseCoord
hb_direction_t direction) const hb_direction_t direction) const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.get_coord (font, direction); case 1: hb_barrier (); return u.format1.get_coord (font, direction);
case 2: return u.format2.get_coord (font, direction); case 2: hb_barrier (); return u.format2.get_coord (font, direction);
case 3: return u.format3.get_coord (font, var_store, direction); case 3: hb_barrier (); return u.format3.get_coord (font, var_store, direction);
default:return 0; default:return 0;
} }
} }
@ -182,7 +182,7 @@ struct BaseCoord
void collect_variation_indices (hb_set_t& varidx_set /* OUT */) const void collect_variation_indices (hb_set_t& varidx_set /* OUT */) const
{ {
switch (u.format) { switch (u.format) {
case 3: u.format3.collect_variation_indices (varidx_set); case 3: hb_barrier (); u.format3.collect_variation_indices (varidx_set);
default:return; default:return;
} }
} }
@ -193,9 +193,9 @@ struct BaseCoord
if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value (); if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
TRACE_DISPATCH (this, u.format); TRACE_DISPATCH (this, u.format);
switch (u.format) { switch (u.format) {
case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...)); case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...)); case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
case 3: return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...)); case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
default:return_trace (c->default_return_value ()); default:return_trace (c->default_return_value ());
} }
} }
@ -206,9 +206,9 @@ struct BaseCoord
if (unlikely (!u.format.sanitize (c))) return_trace (false); if (unlikely (!u.format.sanitize (c))) return_trace (false);
hb_barrier (); hb_barrier ();
switch (u.format) { switch (u.format) {
case 1: return_trace (u.format1.sanitize (c)); case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
case 2: return_trace (u.format2.sanitize (c)); case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
case 3: return_trace (u.format3.sanitize (c)); case 3: hb_barrier (); return_trace (u.format3.sanitize (c));
default:return_trace (false); default:return_trace (false);
} }
} }

View File

@ -646,7 +646,6 @@ struct FeatureParamsCharacterVariants
return; return;
unsigned last_name_id = (unsigned) firstParamUILabelNameID + (unsigned) numNamedParameters - 1; unsigned last_name_id = (unsigned) firstParamUILabelNameID + (unsigned) numNamedParameters - 1;
if (last_name_id >= 256 && last_name_id <= 32767)
nameids_to_retain->add_range (firstParamUILabelNameID, last_name_id); nameids_to_retain->add_range (firstParamUILabelNameID, last_name_id);
} }
@ -2068,11 +2067,11 @@ struct ClassDef
unsigned int get_class (hb_codepoint_t glyph_id) const unsigned int get_class (hb_codepoint_t glyph_id) const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.get_class (glyph_id); case 1: hb_barrier (); return u.format1.get_class (glyph_id);
case 2: return u.format2.get_class (glyph_id); case 2: hb_barrier (); return u.format2.get_class (glyph_id);
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 3: return u.format3.get_class (glyph_id); case 3: hb_barrier (); return u.format3.get_class (glyph_id);
case 4: return u.format4.get_class (glyph_id); case 4: hb_barrier (); return u.format4.get_class (glyph_id);
#endif #endif
default:return 0; default:return 0;
} }
@ -2081,11 +2080,11 @@ struct ClassDef
unsigned get_population () const unsigned get_population () const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.get_population (); case 1: hb_barrier (); return u.format1.get_population ();
case 2: return u.format2.get_population (); case 2: hb_barrier (); return u.format2.get_population ();
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 3: return u.format3.get_population (); case 3: hb_barrier (); return u.format3.get_population ();
case 4: return u.format4.get_population (); case 4: hb_barrier (); return u.format4.get_population ();
#endif #endif
default:return NOT_COVERED; default:return NOT_COVERED;
} }
@ -2147,11 +2146,11 @@ struct ClassDef
switch (u.format) switch (u.format)
{ {
case 1: return_trace (u.format1.serialize (c, it)); case 1: hb_barrier (); return_trace (u.format1.serialize (c, it));
case 2: return_trace (u.format2.serialize (c, it)); case 2: hb_barrier (); return_trace (u.format2.serialize (c, it));
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 3: return_trace (u.format3.serialize (c, it)); case 3: hb_barrier (); return_trace (u.format3.serialize (c, it));
case 4: return_trace (u.format4.serialize (c, it)); case 4: hb_barrier (); return_trace (u.format4.serialize (c, it));
#endif #endif
default:return_trace (false); default:return_trace (false);
} }
@ -2165,11 +2164,11 @@ struct ClassDef
{ {
TRACE_SUBSET (this); TRACE_SUBSET (this);
switch (u.format) { switch (u.format) {
case 1: return_trace (u.format1.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter)); case 1: hb_barrier (); return_trace (u.format1.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
case 2: return_trace (u.format2.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter)); case 2: hb_barrier (); return_trace (u.format2.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 3: return_trace (u.format3.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter)); case 3: hb_barrier (); return_trace (u.format3.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
case 4: return_trace (u.format4.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter)); case 4: hb_barrier (); return_trace (u.format4.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
#endif #endif
default:return_trace (false); default:return_trace (false);
} }
@ -2181,11 +2180,11 @@ struct ClassDef
if (!u.format.sanitize (c)) return_trace (false); if (!u.format.sanitize (c)) return_trace (false);
hb_barrier (); hb_barrier ();
switch (u.format) { switch (u.format) {
case 1: return_trace (u.format1.sanitize (c)); case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
case 2: return_trace (u.format2.sanitize (c)); case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 3: return_trace (u.format3.sanitize (c)); case 3: hb_barrier (); return_trace (u.format3.sanitize (c));
case 4: return_trace (u.format4.sanitize (c)); case 4: hb_barrier (); return_trace (u.format4.sanitize (c));
#endif #endif
default:return_trace (true); default:return_trace (true);
} }
@ -2194,11 +2193,11 @@ struct ClassDef
unsigned cost () const unsigned cost () const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.cost (); case 1: hb_barrier (); return u.format1.cost ();
case 2: return u.format2.cost (); case 2: hb_barrier (); return u.format2.cost ();
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 3: return u.format3.cost (); case 3: hb_barrier (); return u.format3.cost ();
case 4: return u.format4.cost (); case 4: hb_barrier (); return u.format4.cost ();
#endif #endif
default:return 0u; default:return 0u;
} }
@ -2210,11 +2209,11 @@ struct ClassDef
bool collect_coverage (set_t *glyphs) const bool collect_coverage (set_t *glyphs) const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.collect_coverage (glyphs); case 1: hb_barrier (); return u.format1.collect_coverage (glyphs);
case 2: return u.format2.collect_coverage (glyphs); case 2: hb_barrier (); return u.format2.collect_coverage (glyphs);
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 3: return u.format3.collect_coverage (glyphs); case 3: hb_barrier (); return u.format3.collect_coverage (glyphs);
case 4: return u.format4.collect_coverage (glyphs); case 4: hb_barrier (); return u.format4.collect_coverage (glyphs);
#endif #endif
default:return false; default:return false;
} }
@ -2226,11 +2225,11 @@ struct ClassDef
bool collect_class (set_t *glyphs, unsigned int klass) const bool collect_class (set_t *glyphs, unsigned int klass) const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.collect_class (glyphs, klass); case 1: hb_barrier (); return u.format1.collect_class (glyphs, klass);
case 2: return u.format2.collect_class (glyphs, klass); case 2: hb_barrier (); return u.format2.collect_class (glyphs, klass);
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 3: return u.format3.collect_class (glyphs, klass); case 3: hb_barrier (); return u.format3.collect_class (glyphs, klass);
case 4: return u.format4.collect_class (glyphs, klass); case 4: hb_barrier (); return u.format4.collect_class (glyphs, klass);
#endif #endif
default:return false; default:return false;
} }
@ -2239,11 +2238,11 @@ struct ClassDef
bool intersects (const hb_set_t *glyphs) const bool intersects (const hb_set_t *glyphs) const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.intersects (glyphs); case 1: hb_barrier (); return u.format1.intersects (glyphs);
case 2: return u.format2.intersects (glyphs); case 2: hb_barrier (); return u.format2.intersects (glyphs);
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 3: return u.format3.intersects (glyphs); case 3: hb_barrier (); return u.format3.intersects (glyphs);
case 4: return u.format4.intersects (glyphs); case 4: hb_barrier (); return u.format4.intersects (glyphs);
#endif #endif
default:return false; default:return false;
} }
@ -2251,11 +2250,11 @@ struct ClassDef
bool intersects_class (const hb_set_t *glyphs, unsigned int klass) const bool intersects_class (const hb_set_t *glyphs, unsigned int klass) const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.intersects_class (glyphs, klass); case 1: hb_barrier (); return u.format1.intersects_class (glyphs, klass);
case 2: return u.format2.intersects_class (glyphs, klass); case 2: hb_barrier (); return u.format2.intersects_class (glyphs, klass);
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 3: return u.format3.intersects_class (glyphs, klass); case 3: hb_barrier (); return u.format3.intersects_class (glyphs, klass);
case 4: return u.format4.intersects_class (glyphs, klass); case 4: hb_barrier (); return u.format4.intersects_class (glyphs, klass);
#endif #endif
default:return false; default:return false;
} }
@ -2264,11 +2263,11 @@ struct ClassDef
void intersected_class_glyphs (const hb_set_t *glyphs, unsigned klass, hb_set_t *intersect_glyphs) const void intersected_class_glyphs (const hb_set_t *glyphs, unsigned klass, hb_set_t *intersect_glyphs) const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.intersected_class_glyphs (glyphs, klass, intersect_glyphs); case 1: hb_barrier (); return u.format1.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
case 2: return u.format2.intersected_class_glyphs (glyphs, klass, intersect_glyphs); case 2: hb_barrier (); return u.format2.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 3: return u.format3.intersected_class_glyphs (glyphs, klass, intersect_glyphs); case 3: hb_barrier (); return u.format3.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
case 4: return u.format4.intersected_class_glyphs (glyphs, klass, intersect_glyphs); case 4: hb_barrier (); return u.format4.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
#endif #endif
default:return; default:return;
} }
@ -2277,11 +2276,11 @@ struct ClassDef
void intersected_classes (const hb_set_t *glyphs, hb_set_t *intersect_classes) const void intersected_classes (const hb_set_t *glyphs, hb_set_t *intersect_classes) const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.intersected_classes (glyphs, intersect_classes); case 1: hb_barrier (); return u.format1.intersected_classes (glyphs, intersect_classes);
case 2: return u.format2.intersected_classes (glyphs, intersect_classes); case 2: hb_barrier (); return u.format2.intersected_classes (glyphs, intersect_classes);
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 3: return u.format3.intersected_classes (glyphs, intersect_classes); case 3: hb_barrier (); return u.format3.intersected_classes (glyphs, intersect_classes);
case 4: return u.format4.intersected_classes (glyphs, intersect_classes); case 4: hb_barrier (); return u.format4.intersected_classes (glyphs, intersect_classes);
#endif #endif
default:return; default:return;
} }
@ -3638,8 +3637,8 @@ struct DeltaSetIndexMap
unsigned length = plan.get_output_map ().length; unsigned length = plan.get_output_map ().length;
u.format = length <= 0xFFFF ? 0 : 1; u.format = length <= 0xFFFF ? 0 : 1;
switch (u.format) { switch (u.format) {
case 0: return_trace (u.format0.serialize (c, plan)); case 0: hb_barrier (); return_trace (u.format0.serialize (c, plan));
case 1: return_trace (u.format1.serialize (c, plan)); case 1: hb_barrier (); return_trace (u.format1.serialize (c, plan));
default:return_trace (false); default:return_trace (false);
} }
} }
@ -3647,8 +3646,8 @@ struct DeltaSetIndexMap
uint32_t map (unsigned v) const uint32_t map (unsigned v) const
{ {
switch (u.format) { switch (u.format) {
case 0: return (u.format0.map (v)); case 0: hb_barrier (); return (u.format0.map (v));
case 1: return (u.format1.map (v)); case 1: hb_barrier (); return (u.format1.map (v));
default:return v; default:return v;
} }
} }
@ -3656,8 +3655,8 @@ struct DeltaSetIndexMap
unsigned get_map_count () const unsigned get_map_count () const
{ {
switch (u.format) { switch (u.format) {
case 0: return u.format0.get_map_count (); case 0: hb_barrier (); return u.format0.get_map_count ();
case 1: return u.format1.get_map_count (); case 1: hb_barrier (); return u.format1.get_map_count ();
default:return 0; default:return 0;
} }
} }
@ -3665,8 +3664,8 @@ struct DeltaSetIndexMap
unsigned get_width () const unsigned get_width () const
{ {
switch (u.format) { switch (u.format) {
case 0: return u.format0.get_width (); case 0: hb_barrier (); return u.format0.get_width ();
case 1: return u.format1.get_width (); case 1: hb_barrier (); return u.format1.get_width ();
default:return 0; default:return 0;
} }
} }
@ -3674,8 +3673,8 @@ struct DeltaSetIndexMap
unsigned get_inner_bit_count () const unsigned get_inner_bit_count () const
{ {
switch (u.format) { switch (u.format) {
case 0: return u.format0.get_inner_bit_count (); case 0: hb_barrier (); return u.format0.get_inner_bit_count ();
case 1: return u.format1.get_inner_bit_count (); case 1: hb_barrier (); return u.format1.get_inner_bit_count ();
default:return 0; default:return 0;
} }
} }
@ -3686,8 +3685,8 @@ struct DeltaSetIndexMap
if (!u.format.sanitize (c)) return_trace (false); if (!u.format.sanitize (c)) return_trace (false);
hb_barrier (); hb_barrier ();
switch (u.format) { switch (u.format) {
case 0: return_trace (u.format0.sanitize (c)); case 0: hb_barrier (); return_trace (u.format0.sanitize (c));
case 1: return_trace (u.format1.sanitize (c)); case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
default:return_trace (true); default:return_trace (true);
} }
} }
@ -3696,8 +3695,8 @@ struct DeltaSetIndexMap
{ {
TRACE_SERIALIZE (this); TRACE_SERIALIZE (this);
switch (u.format) { switch (u.format) {
case 0: return_trace (reinterpret_cast<DeltaSetIndexMap *> (u.format0.copy (c))); case 0: hb_barrier (); return_trace (reinterpret_cast<DeltaSetIndexMap *> (u.format0.copy (c)));
case 1: return_trace (reinterpret_cast<DeltaSetIndexMap *> (u.format1.copy (c))); case 1: hb_barrier (); return_trace (reinterpret_cast<DeltaSetIndexMap *> (u.format1.copy (c)));
default:return_trace (nullptr); default:return_trace (nullptr);
} }
} }
@ -4112,11 +4111,11 @@ struct Condition
Instancer *instancer) const Instancer *instancer) const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.evaluate (coords, coord_len, instancer); case 1: hb_barrier (); return u.format1.evaluate (coords, coord_len, instancer);
case 2: return u.format2.evaluate (coords, coord_len, instancer); case 2: hb_barrier (); return u.format2.evaluate (coords, coord_len, instancer);
case 3: return u.format3.evaluate (coords, coord_len, instancer); case 3: hb_barrier (); return u.format3.evaluate (coords, coord_len, instancer);
case 4: return u.format4.evaluate (coords, coord_len, instancer); case 4: hb_barrier (); return u.format4.evaluate (coords, coord_len, instancer);
case 5: return u.format5.evaluate (coords, coord_len, instancer); case 5: hb_barrier (); return u.format5.evaluate (coords, coord_len, instancer);
default:return false; default:return false;
} }
} }
@ -4125,7 +4124,7 @@ struct Condition
hb_map_t *condition_map /* OUT */) const hb_map_t *condition_map /* OUT */) const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.keep_with_variations (c, condition_map); case 1: hb_barrier (); return u.format1.keep_with_variations (c, condition_map);
// TODO(subset) // TODO(subset)
default: c->apply = false; return KEEP_COND_WITH_VAR; default: c->apply = false; return KEEP_COND_WITH_VAR;
} }
@ -4137,11 +4136,11 @@ struct Condition
if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value (); if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
TRACE_DISPATCH (this, u.format); TRACE_DISPATCH (this, u.format);
switch (u.format) { switch (u.format) {
case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...)); case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...)); case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
case 3: return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...)); case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
case 4: return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...)); case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...));
case 5: return_trace (c->dispatch (u.format5, std::forward<Ts> (ds)...)); case 5: hb_barrier (); return_trace (c->dispatch (u.format5, std::forward<Ts> (ds)...));
default:return_trace (c->default_return_value ()); default:return_trace (c->default_return_value ());
} }
} }
@ -4152,11 +4151,11 @@ struct Condition
if (!u.format.sanitize (c)) return_trace (false); if (!u.format.sanitize (c)) return_trace (false);
hb_barrier (); hb_barrier ();
switch (u.format) { switch (u.format) {
case 1: return_trace (u.format1.sanitize (c)); case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
case 2: return_trace (u.format2.sanitize (c)); case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
case 3: return_trace (u.format3.sanitize (c)); case 3: hb_barrier (); return_trace (u.format3.sanitize (c));
case 4: return_trace (u.format4.sanitize (c)); case 4: hb_barrier (); return_trace (u.format4.sanitize (c));
case 5: return_trace (u.format5.sanitize (c)); case 5: hb_barrier (); return_trace (u.format5.sanitize (c));
default:return_trace (true); default:return_trace (true);
} }
} }

View File

@ -406,6 +406,7 @@ struct hb_ot_apply_context_t :
void set_ignore_zwnj (bool ignore_zwnj_) { ignore_zwnj = ignore_zwnj_; } void set_ignore_zwnj (bool ignore_zwnj_) { ignore_zwnj = ignore_zwnj_; }
void set_ignore_zwj (bool ignore_zwj_) { ignore_zwj = ignore_zwj_; } void set_ignore_zwj (bool ignore_zwj_) { ignore_zwj = ignore_zwj_; }
void set_ignore_hidden (bool ignore_hidden_) { ignore_hidden = ignore_hidden_; }
void set_lookup_props (unsigned int lookup_props_) { lookup_props = lookup_props_; } void set_lookup_props (unsigned int lookup_props_) { lookup_props = lookup_props_; }
void set_mask (hb_mask_t mask_) { mask = mask_; } void set_mask (hb_mask_t mask_) { mask = mask_; }
void set_per_syllable (bool per_syllable_) { per_syllable = per_syllable_; } void set_per_syllable (bool per_syllable_) { per_syllable = per_syllable_; }
@ -451,9 +452,10 @@ struct hb_ot_apply_context_t :
if (!c->check_glyph_property (&info, lookup_props)) if (!c->check_glyph_property (&info, lookup_props))
return SKIP_YES; return SKIP_YES;
if (unlikely (_hb_glyph_info_is_default_ignorable_and_not_hidden (&info) && if (unlikely (_hb_glyph_info_is_default_ignorable (&info) &&
(ignore_zwnj || !_hb_glyph_info_is_zwnj (&info)) && (ignore_zwnj || !_hb_glyph_info_is_zwnj (&info)) &&
(ignore_zwj || !_hb_glyph_info_is_zwj (&info)))) (ignore_zwj || !_hb_glyph_info_is_zwj (&info)) &&
(ignore_hidden || !_hb_glyph_info_is_hidden (&info))))
return SKIP_MAYBE; return SKIP_MAYBE;
return SKIP_NO; return SKIP_NO;
@ -464,6 +466,7 @@ struct hb_ot_apply_context_t :
hb_mask_t mask = -1; hb_mask_t mask = -1;
bool ignore_zwnj = false; bool ignore_zwnj = false;
bool ignore_zwj = false; bool ignore_zwj = false;
bool ignore_hidden = false;
bool per_syllable = false; bool per_syllable = false;
uint8_t syllable = 0; uint8_t syllable = 0;
match_func_t match_func = nullptr; match_func_t match_func = nullptr;
@ -486,6 +489,8 @@ struct hb_ot_apply_context_t :
matcher.set_ignore_zwnj (c->table_index == 1 || (context_match && c->auto_zwnj)); matcher.set_ignore_zwnj (c->table_index == 1 || (context_match && c->auto_zwnj));
/* Ignore ZWJ if we are matching context, or asked to. */ /* Ignore ZWJ if we are matching context, or asked to. */
matcher.set_ignore_zwj (context_match || c->auto_zwj); matcher.set_ignore_zwj (context_match || c->auto_zwj);
/* Ignore hidden glyphs (like CGJ) during GPOS. */
matcher.set_ignore_hidden (c->table_index == 1);
matcher.set_mask (context_match ? -1 : c->lookup_mask); matcher.set_mask (context_match ? -1 : c->lookup_mask);
/* Per syllable matching is only for GSUB. */ /* Per syllable matching is only for GSUB. */
matcher.set_per_syllable (c->table_index == 0 && c->per_syllable); matcher.set_per_syllable (c->table_index == 0 && c->per_syllable);
@ -2901,12 +2906,12 @@ struct Context
if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value (); if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
TRACE_DISPATCH (this, u.format); TRACE_DISPATCH (this, u.format);
switch (u.format) { switch (u.format) {
case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...)); case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...)); case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
case 3: return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...)); case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 4: return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...)); case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...));
case 5: return_trace (c->dispatch (u.format5, std::forward<Ts> (ds)...)); case 5: hb_barrier (); return_trace (c->dispatch (u.format5, std::forward<Ts> (ds)...));
#endif #endif
default:return_trace (c->default_return_value ()); default:return_trace (c->default_return_value ());
} }
@ -3390,6 +3395,15 @@ struct ChainRuleSet
* *
* Replicated from LigatureSet::apply(). */ * Replicated from LigatureSet::apply(). */
/* If the input skippy has non-auto joiners behavior (as in Indic shapers),
* skip this fast path, as we don't distinguish between input & lookahead
* matching in the fast path.
*
* https://github.com/harfbuzz/harfbuzz/issues/4813
*/
if (!c->auto_zwnj || !c->auto_zwj)
goto slow;
hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input; hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
skippy_iter.reset (c->buffer->idx); skippy_iter.reset (c->buffer->idx);
skippy_iter.set_match_func (match_always, nullptr); skippy_iter.set_match_func (match_always, nullptr);
@ -4225,12 +4239,12 @@ struct ChainContext
if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value (); if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
TRACE_DISPATCH (this, u.format); TRACE_DISPATCH (this, u.format);
switch (u.format) { switch (u.format) {
case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...)); case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...)); case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
case 3: return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...)); case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 4: return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...)); case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...));
case 5: return_trace (c->dispatch (u.format5, std::forward<Ts> (ds)...)); case 5: hb_barrier (); return_trace (c->dispatch (u.format5, std::forward<Ts> (ds)...));
#endif #endif
default:return_trace (c->default_return_value ()); default:return_trace (c->default_return_value ());
} }
@ -4314,7 +4328,7 @@ struct Extension
unsigned int get_type () const unsigned int get_type () const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.get_type (); case 1: hb_barrier (); return u.format1.get_type ();
default:return 0; default:return 0;
} }
} }
@ -4322,7 +4336,7 @@ struct Extension
const X& get_subtable () const const X& get_subtable () const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.template get_subtable<typename T::SubTable> (); case 1: hb_barrier (); return u.format1.template get_subtable<typename T::SubTable> ();
default:return Null (typename T::SubTable); default:return Null (typename T::SubTable);
} }
} }
@ -4334,7 +4348,7 @@ struct Extension
typename hb_subset_context_t::return_t dispatch (hb_subset_context_t *c, Ts&&... ds) const typename hb_subset_context_t::return_t dispatch (hb_subset_context_t *c, Ts&&... ds) const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.subset (c); case 1: hb_barrier (); return u.format1.subset (c);
default: return c->default_return_value (); default: return c->default_return_value ();
} }
} }
@ -4345,7 +4359,7 @@ struct Extension
if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value (); if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
TRACE_DISPATCH (this, u.format); TRACE_DISPATCH (this, u.format);
switch (u.format) { switch (u.format) {
case 1: return_trace (u.format1.dispatch (c, std::forward<Ts> (ds)...)); case 1: hb_barrier (); return_trace (u.format1.dispatch (c, std::forward<Ts> (ds)...));
default:return_trace (c->default_return_value ()); default:return_trace (c->default_return_value ());
} }
} }
@ -4560,9 +4574,9 @@ struct GSUBGPOS
unsigned int get_size () const unsigned int get_size () const
{ {
switch (u.version.major) { switch (u.version.major) {
case 1: return u.version1.get_size (); case 1: hb_barrier (); return u.version1.get_size ();
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 2: return u.version2.get_size (); case 2: hb_barrier (); return u.version2.get_size ();
#endif #endif
default: return u.version.static_size; default: return u.version.static_size;
} }
@ -4575,9 +4589,9 @@ struct GSUBGPOS
if (unlikely (!u.version.sanitize (c))) return_trace (false); if (unlikely (!u.version.sanitize (c))) return_trace (false);
hb_barrier (); hb_barrier ();
switch (u.version.major) { switch (u.version.major) {
case 1: return_trace (u.version1.sanitize<TLookup> (c)); case 1: hb_barrier (); return_trace (u.version1.sanitize<TLookup> (c));
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 2: return_trace (u.version2.sanitize<TLookup> (c)); case 2: hb_barrier (); return_trace (u.version2.sanitize<TLookup> (c));
#endif #endif
default: return_trace (true); default: return_trace (true);
} }
@ -4587,9 +4601,9 @@ struct GSUBGPOS
bool subset (hb_subset_layout_context_t *c) const bool subset (hb_subset_layout_context_t *c) const
{ {
switch (u.version.major) { switch (u.version.major) {
case 1: return u.version1.subset<TLookup> (c); case 1: hb_barrier (); return u.version1.subset<TLookup> (c);
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 2: return u.version2.subset<TLookup> (c); case 2: hb_barrier (); return u.version2.subset<TLookup> (c);
#endif #endif
default: return false; default: return false;
} }
@ -4598,9 +4612,9 @@ struct GSUBGPOS
const ScriptList &get_script_list () const const ScriptList &get_script_list () const
{ {
switch (u.version.major) { switch (u.version.major) {
case 1: return this+u.version1.scriptList; case 1: hb_barrier (); return this+u.version1.scriptList;
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 2: return this+u.version2.scriptList; case 2: hb_barrier (); return this+u.version2.scriptList;
#endif #endif
default: return Null (ScriptList); default: return Null (ScriptList);
} }
@ -4608,9 +4622,9 @@ struct GSUBGPOS
const FeatureList &get_feature_list () const const FeatureList &get_feature_list () const
{ {
switch (u.version.major) { switch (u.version.major) {
case 1: return this+u.version1.featureList; case 1: hb_barrier (); return this+u.version1.featureList;
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 2: return this+u.version2.featureList; case 2: hb_barrier (); return this+u.version2.featureList;
#endif #endif
default: return Null (FeatureList); default: return Null (FeatureList);
} }
@ -4618,9 +4632,9 @@ struct GSUBGPOS
unsigned int get_lookup_count () const unsigned int get_lookup_count () const
{ {
switch (u.version.major) { switch (u.version.major) {
case 1: return (this+u.version1.lookupList).len; case 1: hb_barrier (); return (this+u.version1.lookupList).len;
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 2: return (this+u.version2.lookupList).len; case 2: hb_barrier (); return (this+u.version2.lookupList).len;
#endif #endif
default: return 0; default: return 0;
} }
@ -4628,9 +4642,9 @@ struct GSUBGPOS
const Lookup& get_lookup (unsigned int i) const const Lookup& get_lookup (unsigned int i) const
{ {
switch (u.version.major) { switch (u.version.major) {
case 1: return (this+u.version1.lookupList)[i]; case 1: hb_barrier (); return (this+u.version1.lookupList)[i];
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 2: return (this+u.version2.lookupList)[i]; case 2: hb_barrier (); return (this+u.version2.lookupList)[i];
#endif #endif
default: return Null (Lookup); default: return Null (Lookup);
} }
@ -4638,9 +4652,9 @@ struct GSUBGPOS
const FeatureVariations &get_feature_variations () const const FeatureVariations &get_feature_variations () const
{ {
switch (u.version.major) { switch (u.version.major) {
case 1: return (u.version.to_int () >= 0x00010001u ? this+u.version1.featureVars : Null (FeatureVariations)); case 1: hb_barrier (); return (u.version.to_int () >= 0x00010001u && hb_barrier () ? this+u.version1.featureVars : Null (FeatureVariations));
#ifndef HB_NO_BEYOND_64K #ifndef HB_NO_BEYOND_64K
case 2: return this+u.version2.featureVars; case 2: hb_barrier (); return this+u.version2.featureVars;
#endif #endif
default: return Null (FeatureVariations); default: return Null (FeatureVariations);
} }

View File

@ -173,12 +173,12 @@ _hb_next_syllable (hb_buffer_t *buffer, unsigned int start)
/* Design: /* Design:
* unicode_props() is a two-byte number. The low byte includes: * unicode_props() is a two-byte number. The low byte includes:
* - General_Category: 5 bits. * - Extended General_Category: 5 bits.
* - A bit each for: * - A bit each for:
* * Is it Default_Ignorable(); we have a modified Default_Ignorable(). * * Is it Default_Ignorable(); we have a modified Default_Ignorable().
* * Whether it's one of the four Mongolian Free Variation Selectors, * * Whether it's one of the four Mongolian Free Variation Selectors,
* CGJ, or other characters that are hidden but should not be ignored * CGJ, or other characters that are hidden but should not be ignored
* like most other Default_Ignorable()s do during matching. * like most other Default_Ignorable()s do during GSUB matching.
* * Whether it's a grapheme continuation. * * Whether it's a grapheme continuation.
* *
* The high-byte has different meanings, switched by the Gen-Cat: * The high-byte has different meanings, switched by the Gen-Cat:
@ -311,12 +311,15 @@ _hb_glyph_info_is_default_ignorable (const hb_glyph_info_t *info)
return (info->unicode_props() & UPROPS_MASK_IGNORABLE) && return (info->unicode_props() & UPROPS_MASK_IGNORABLE) &&
!_hb_glyph_info_substituted (info); !_hb_glyph_info_substituted (info);
} }
static inline bool static inline void
_hb_glyph_info_is_default_ignorable_and_not_hidden (const hb_glyph_info_t *info) _hb_glyph_info_clear_default_ignorable (hb_glyph_info_t *info)
{ {
return ((info->unicode_props() & (UPROPS_MASK_IGNORABLE|UPROPS_MASK_HIDDEN)) info->unicode_props() &= ~ UPROPS_MASK_IGNORABLE;
== UPROPS_MASK_IGNORABLE) && }
!_hb_glyph_info_substituted (info); static inline bool
_hb_glyph_info_is_hidden (const hb_glyph_info_t *info)
{
return info->unicode_props() & UPROPS_MASK_HIDDEN;
} }
static inline void static inline void
_hb_glyph_info_unhide (hb_glyph_info_t *info) _hb_glyph_info_unhide (hb_glyph_info_t *info)

View File

@ -84,9 +84,9 @@ HB_INTERNAL bool postV2Tail::subset (hb_subset_context_t *c) const
old_gid_new_index_map.alloc (num_glyphs); old_gid_new_index_map.alloc (num_glyphs);
glyph_name_to_new_index.alloc (num_glyphs); glyph_name_to_new_index.alloc (num_glyphs);
for (hb_codepoint_t new_gid = 0; new_gid < num_glyphs; new_gid++) for (auto _ : c->plan->new_to_old_gid_list)
{ {
hb_codepoint_t old_gid = reverse_glyph_map.get (new_gid); hb_codepoint_t old_gid = _.second;
unsigned old_index = glyphNameIndex[old_gid]; unsigned old_index = glyphNameIndex[old_gid];
unsigned new_index; unsigned new_index;
@ -125,13 +125,22 @@ HB_INTERNAL bool postV2Tail::subset (hb_subset_context_t *c) const
old_gid_new_index_map.set (old_gid, new_index); old_gid_new_index_map.set (old_gid, new_index);
} }
if (old_gid_new_index_map.in_error())
return_trace (false);
auto index_iter = auto index_iter =
+ hb_range (num_glyphs) + hb_range (num_glyphs)
| hb_map (reverse_glyph_map) | hb_map_retains_sorting ([&](hb_codepoint_t new_gid)
| hb_map_retains_sorting ([&](hb_codepoint_t old_gid)
{ {
unsigned new_index = old_gid_new_index_map.get (old_gid); hb_codepoint_t *old_gid;
return hb_pair_t<unsigned, unsigned> (old_gid, new_index); /* use 0 for retain-gid holes, which refers to the name .notdef,
* as the glyphNameIndex entry for that glyph ID."*/
unsigned new_index = 0;
if (reverse_glyph_map.has (new_gid, &old_gid)) {
new_index = old_gid_new_index_map.get (*old_gid);
return hb_pair_t<unsigned, unsigned> (*old_gid, new_index);
}
return hb_pair_t<unsigned, unsigned> (new_gid, new_index);
}) })
; ;

View File

@ -301,7 +301,7 @@ struct post
return_trace (c->check_struct (this) && return_trace (c->check_struct (this) &&
hb_barrier () && hb_barrier () &&
(version.to_int () == 0x00010000 || (version.to_int () == 0x00010000 ||
(version.to_int () == 0x00020000 && v2X.sanitize (c)) || (version.to_int () == 0x00020000 && hb_barrier () && v2X.sanitize (c)) ||
version.to_int () == 0x00030000)); version.to_int () == 0x00030000));
} }

View File

@ -153,7 +153,7 @@ decompose_current_character (const hb_ot_shape_normalize_context_t *c, bool shor
hb_codepoint_t u = buffer->cur().codepoint; hb_codepoint_t u = buffer->cur().codepoint;
hb_codepoint_t glyph = 0; hb_codepoint_t glyph = 0;
if (shortest && c->font->get_nominal_glyph (u, &glyph, c->not_found)) if (shortest && c->font->get_nominal_glyph (u, &glyph, buffer->not_found))
{ {
next_char (buffer, glyph); next_char (buffer, glyph);
return; return;
@ -165,7 +165,7 @@ decompose_current_character (const hb_ot_shape_normalize_context_t *c, bool shor
return; return;
} }
if (!shortest && c->font->get_nominal_glyph (u, &glyph, c->not_found)) if (!shortest && c->font->get_nominal_glyph (u, &glyph, buffer->not_found))
{ {
next_char (buffer, glyph); next_char (buffer, glyph);
return; return;
@ -220,6 +220,13 @@ handle_variation_selector_cluster (const hb_ot_shape_normalize_context_t *c,
/* Just pass on the two characters separately, let GSUB do its magic. */ /* Just pass on the two characters separately, let GSUB do its magic. */
set_glyph (buffer->cur(), font); set_glyph (buffer->cur(), font);
(void) buffer->next_glyph (); (void) buffer->next_glyph ();
buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_VARIATION_SELECTOR_FALLBACK;
_hb_glyph_info_set_general_category (&buffer->cur(),
_HB_UNICODE_GENERAL_CATEGORY_VARIATION_SELECTOR);
if (buffer->not_found_variation_selector != HB_CODEPOINT_INVALID)
_hb_glyph_info_clear_default_ignorable (&buffer->cur());
set_glyph (buffer->cur(), font); set_glyph (buffer->cur(), font);
(void) buffer->next_glyph (); (void) buffer->next_glyph ();
} }
@ -295,7 +302,8 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
buffer, buffer,
font, font,
buffer->unicode, buffer->unicode,
buffer->not_found, plan->shaper->decompose ? plan->shaper->decompose : hb_ot_shape_normalize_context_t::decompose_unicode,
plan->shaper->compose ? plan->shaper->compose : hb_ot_shape_normalize_context_t::compose_unicode
}; };
c.override_decompose_and_compose (plan->shaper->decompose, plan->shaper->compose); c.override_decompose_and_compose (plan->shaper->decompose, plan->shaper->compose);

View File

@ -89,7 +89,6 @@ struct hb_ot_shape_normalize_context_t
hb_buffer_t *buffer; hb_buffer_t *buffer;
hb_font_t *font; hb_font_t *font;
hb_unicode_funcs_t *unicode; hb_unicode_funcs_t *unicode;
const hb_codepoint_t not_found;
bool (*decompose) (const hb_ot_shape_normalize_context_t *c, bool (*decompose) (const hb_ot_shape_normalize_context_t *c,
hb_codepoint_t ab, hb_codepoint_t ab,
hb_codepoint_t *a, hb_codepoint_t *a,

View File

@ -837,6 +837,29 @@ hb_ot_zero_width_default_ignorables (const hb_buffer_t *buffer)
pos[i].x_advance = pos[i].y_advance = pos[i].x_offset = pos[i].y_offset = 0; pos[i].x_advance = pos[i].y_advance = pos[i].x_offset = pos[i].y_offset = 0;
} }
static void
hb_ot_deal_with_variation_selectors (hb_buffer_t *buffer)
{
if (!(buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_VARIATION_SELECTOR_FALLBACK) ||
buffer->not_found_variation_selector == HB_CODEPOINT_INVALID)
return;
unsigned int count = buffer->len;
hb_glyph_info_t *info = buffer->info;
hb_glyph_position_t *pos = buffer->pos;
for (unsigned int i = 0; i < count; i++)
{
if (_hb_glyph_info_get_general_category (&info[i]) ==
_HB_UNICODE_GENERAL_CATEGORY_VARIATION_SELECTOR)
{
info[i].codepoint = buffer->not_found_variation_selector;
pos[i].x_advance = pos[i].y_advance = pos[i].x_offset = pos[i].y_offset = 0;
_hb_glyph_info_set_general_category (&info[i], HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK);
}
}
}
static void static void
hb_ot_hide_default_ignorables (hb_buffer_t *buffer, hb_ot_hide_default_ignorables (hb_buffer_t *buffer,
hb_font_t *font) hb_font_t *font)
@ -966,6 +989,7 @@ hb_ot_substitute_post (const hb_ot_shape_context_t *c)
hb_aat_layout_remove_deleted_glyphs (c->buffer); hb_aat_layout_remove_deleted_glyphs (c->buffer);
#endif #endif
hb_ot_deal_with_variation_selectors (c->buffer);
hb_ot_hide_default_ignorables (c->buffer, c->font); hb_ot_hide_default_ignorables (c->buffer, c->font);
if (c->plan->shaper->postprocess_glyphs && if (c->plan->shaper->postprocess_glyphs &&

View File

@ -6,10 +6,10 @@
* *
* on files with these headers: * on files with these headers:
* *
* # ArabicShaping-15.1.0.txt * # ArabicShaping-16.0.0.txt
* # Date: 2023-01-05 * # Date: 2024-07-30
* # Scripts-15.1.0.txt * # Scripts-16.0.0.txt
* # Date: 2023-07-28, 16:01:07 GMT * # Date: 2024-04-30, 21:48:40 GMT
*/ */
#ifndef HB_OT_SHAPER_ARABIC_JOINING_LIST_HH #ifndef HB_OT_SHAPER_ARABIC_JOINING_LIST_HH

View File

@ -6,10 +6,10 @@
* *
* on files with these headers: * on files with these headers:
* *
* # ArabicShaping-15.1.0.txt * # ArabicShaping-16.0.0.txt
* # Date: 2023-01-05 * # Date: 2024-07-30
* # Blocks-15.1.0.txt * # Blocks-16.0.0.txt
* # Date: 2023-07-28, 15:47:20 GMT * # Date: 2024-02-02
* UnicodeData.txt does not have a header. * UnicodeData.txt does not have a header.
*/ */
@ -136,7 +136,13 @@ static const uint8_t joining_table[] =
/* 10D00 */ L,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D, /* 10D00 */ L,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,
/* 10D20 */ D,D,R,D, /* 10D20 */ D,D,R,D,
#define joining_offset_0x10f30u 1182 #define joining_offset_0x10ec2u 1182
/* Arabic Extended-C */
/* 10EC0 */ R,D,D,
#define joining_offset_0x10f30u 1185
/* Sogdian */ /* Sogdian */
@ -155,14 +161,14 @@ static const uint8_t joining_table[] =
/* 10FA0 */ D,U,D,D,R,R,R,U,D,R,R,D,D,R,D,D, /* 10FA0 */ D,U,D,D,R,R,R,U,D,R,R,D,D,R,D,D,
/* 10FC0 */ U,D,R,R,D,U,U,U,U,R,D,L, /* 10FC0 */ U,D,R,R,D,U,U,U,U,R,D,L,
#define joining_offset_0x110bdu 1338 #define joining_offset_0x110bdu 1341
/* Kaithi */ /* Kaithi */
/* 110A0 */ U,X,X, /* 110A0 */ U,X,X,
/* 110C0 */ X,X,X,X,X,X,X,X,X,X,X,X,X,U, /* 110C0 */ X,X,X,X,X,X,X,X,X,X,X,X,X,U,
#define joining_offset_0x1e900u 1355 #define joining_offset_0x1e900u 1358
/* Adlam */ /* Adlam */
@ -170,7 +176,7 @@ static const uint8_t joining_table[] =
/* 1E920 */ D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D, /* 1E920 */ D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,
/* 1E940 */ D,D,D,D,X,X,X,X,X,X,X,T, /* 1E940 */ D,D,D,D,X,X,X,X,X,X,X,T,
}; /* Table items: 1431; occupancy: 57% */ }; /* Table items: 1434; occupancy: 57% */
static unsigned int static unsigned int
@ -198,6 +204,7 @@ joining_type (hb_codepoint_t u)
if (hb_in_range<hb_codepoint_t> (u, 0x10AC0u, 0x10AEFu)) return joining_table[u - 0x10AC0u + joining_offset_0x10ac0u]; if (hb_in_range<hb_codepoint_t> (u, 0x10AC0u, 0x10AEFu)) return joining_table[u - 0x10AC0u + joining_offset_0x10ac0u];
if (hb_in_range<hb_codepoint_t> (u, 0x10B80u, 0x10BAFu)) return joining_table[u - 0x10B80u + joining_offset_0x10b80u]; if (hb_in_range<hb_codepoint_t> (u, 0x10B80u, 0x10BAFu)) return joining_table[u - 0x10B80u + joining_offset_0x10b80u];
if (hb_in_range<hb_codepoint_t> (u, 0x10D00u, 0x10D23u)) return joining_table[u - 0x10D00u + joining_offset_0x10d00u]; if (hb_in_range<hb_codepoint_t> (u, 0x10D00u, 0x10D23u)) return joining_table[u - 0x10D00u + joining_offset_0x10d00u];
if (hb_in_range<hb_codepoint_t> (u, 0x10EC2u, 0x10EC4u)) return joining_table[u - 0x10EC2u + joining_offset_0x10ec2u];
if (hb_in_range<hb_codepoint_t> (u, 0x10F30u, 0x10FCBu)) return joining_table[u - 0x10F30u + joining_offset_0x10f30u]; if (hb_in_range<hb_codepoint_t> (u, 0x10F30u, 0x10FCBu)) return joining_table[u - 0x10F30u + joining_offset_0x10f30u];
break; break;

View File

@ -233,10 +233,7 @@ collect_features_arabic (hb_ot_shape_planner_t *plan)
map->enable_feature (HB_TAG('c','a','l','t'), F_MANUAL_ZWJ); map->enable_feature (HB_TAG('c','a','l','t'), F_MANUAL_ZWJ);
/* https://github.com/harfbuzz/harfbuzz/issues/1573 */ /* https://github.com/harfbuzz/harfbuzz/issues/1573 */
if (!map->has_feature (HB_TAG('r','c','l','t'))) if (!map->has_feature (HB_TAG('r','c','l','t')))
{
map->add_gsub_pause (nullptr); map->add_gsub_pause (nullptr);
map->enable_feature (HB_TAG('r','c','l','t'), F_MANUAL_ZWJ);
}
map->enable_feature (HB_TAG('l','i','g','a'), F_MANUAL_ZWJ); map->enable_feature (HB_TAG('l','i','g','a'), F_MANUAL_ZWJ);
map->enable_feature (HB_TAG('c','l','i','g'), F_MANUAL_ZWJ); map->enable_feature (HB_TAG('c','l','i','g'), F_MANUAL_ZWJ);

View File

@ -6,12 +6,12 @@
* *
* on files with these headers: * on files with these headers:
* *
* # IndicSyllabicCategory-15.1.0.txt * # IndicSyllabicCategory-16.0.0.txt
* # Date: 2023-01-05 * # Date: 2024-04-30, 21:48:21 GMT
* # IndicPositionalCategory-15.1.0.txt * # IndicPositionalCategory-16.0.0.txt
* # Date: 2023-01-05 * # Date: 2024-04-30, 21:48:21 GMT
* # Blocks-15.1.0.txt * # Blocks-16.0.0.txt
* # Date: 2023-07-28, 15:47:20 GMT * # Date: 2024-02-02
*/ */
#include "hb.hh" #include "hb.hh"
@ -89,7 +89,7 @@ static_assert (OT_VPst == M_Cat(VPst), "");
#define _OT_MW OT_MW /* 2 chars; MW */ #define _OT_MW OT_MW /* 2 chars; MW */
#define _OT_MY OT_MY /* 3 chars; MY */ #define _OT_MY OT_MY /* 3 chars; MY */
#define _OT_N OT_N /* 17 chars; N */ #define _OT_N OT_N /* 17 chars; N */
#define _OT_GB OT_PLACEHOLDER /* 165 chars; PLACEHOLDER */ #define _OT_GB OT_PLACEHOLDER /* 185 chars; PLACEHOLDER */
#define _OT_PT OT_PT /* 8 chars; PT */ #define _OT_PT OT_PT /* 8 chars; PT */
#define _OT_R OT_Ra /* 14 chars; Ra */ #define _OT_R OT_Ra /* 14 chars; Ra */
#define _OT_Rf OT_Repha /* 1 chars; Repha */ #define _OT_Rf OT_Repha /* 1 chars; Repha */
@ -112,7 +112,7 @@ static_assert (OT_VPst == M_Cat(VPst), "");
#define _POS_A POS_AFTER_MAIN /* 3 chars; AFTER_MAIN */ #define _POS_A POS_AFTER_MAIN /* 3 chars; AFTER_MAIN */
#define _POS_AP POS_AFTER_POST /* 50 chars; AFTER_POST */ #define _POS_AP POS_AFTER_POST /* 50 chars; AFTER_POST */
#define _POS_AS POS_AFTER_SUB /* 51 chars; AFTER_SUB */ #define _POS_AS POS_AFTER_SUB /* 51 chars; AFTER_SUB */
#define _POS_C POS_BASE_C /* 833 chars; BASE_C */ #define _POS_C POS_BASE_C /* 853 chars; BASE_C */
#define _POS_BS POS_BEFORE_SUB /* 25 chars; BEFORE_SUB */ #define _POS_BS POS_BEFORE_SUB /* 25 chars; BEFORE_SUB */
#define _POS_B POS_BELOW_C /* 13 chars; BELOW_C */ #define _POS_B POS_BELOW_C /* 13 chars; BELOW_C */
#define _POS_X POS_END /* 71 chars; END */ #define _POS_X POS_END /* 71 chars; END */
@ -458,7 +458,16 @@ static const uint16_t indic_table[] = {
/* 11338 */ _(X,X), _(X,X), _(X,X), _(N,X), _(N,X), _(X,X), _(X,X), _(X,X), /* 11338 */ _(X,X), _(X,X), _(X,X), _(N,X), _(N,X), _(X,X), _(X,X), _(X,X),
}; /* Table items: 1728; occupancy: 71% */ #define indic_offset_0x116d0u 1728
/* Myanmar Extended-C */
/* 116D0 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
/* 116D8 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
/* 116E0 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(X,X), _(X,X), _(X,X), _(X,X),
}; /* Table items: 1752; occupancy: 71% */
uint16_t uint16_t
hb_indic_get_categories (hb_codepoint_t u) hb_indic_get_categories (hb_codepoint_t u)
@ -498,6 +507,7 @@ hb_indic_get_categories (hb_codepoint_t u)
case 0x11u: case 0x11u:
if (hb_in_range<hb_codepoint_t> (u, 0x11300u, 0x11307u)) return indic_table[u - 0x11300u + indic_offset_0x11300u]; if (hb_in_range<hb_codepoint_t> (u, 0x11300u, 0x11307u)) return indic_table[u - 0x11300u + indic_offset_0x11300u];
if (hb_in_range<hb_codepoint_t> (u, 0x11338u, 0x1133Fu)) return indic_table[u - 0x11338u + indic_offset_0x11338u]; if (hb_in_range<hb_codepoint_t> (u, 0x11338u, 0x1133Fu)) return indic_table[u - 0x11338u + indic_offset_0x11338u];
if (hb_in_range<hb_codepoint_t> (u, 0x116D0u, 0x116E7u)) return indic_table[u - 0x116D0u + indic_offset_0x116d0u];
break; break;
default: default:

View File

@ -6,18 +6,18 @@
* *
* on files with these headers: * on files with these headers:
* *
* # IndicSyllabicCategory-15.1.0.txt * # IndicSyllabicCategory-16.0.0.txt
* # Date: 2023-01-05 * # Date: 2024-04-30, 21:48:21 GMT
* # IndicPositionalCategory-15.1.0.txt * # IndicPositionalCategory-16.0.0.txt
* # Date: 2023-01-05 * # Date: 2024-04-30, 21:48:21 GMT
* # ArabicShaping-15.1.0.txt * # ArabicShaping-16.0.0.txt
* # Date: 2023-01-05 * # Date: 2024-07-30
* # DerivedCoreProperties-15.1.0.txt * # DerivedCoreProperties-16.0.0.txt
* # Date: 2023-08-07, 15:21:24 GMT * # Date: 2024-05-31, 18:09:32 GMT
* # Blocks-15.1.0.txt * # Blocks-16.0.0.txt
* # Date: 2023-07-28, 15:47:20 GMT * # Date: 2024-02-02
* # Scripts-15.1.0.txt * # Scripts-16.0.0.txt
* # Date: 2023-07-28, 16:01:07 GMT * # Date: 2024-04-30, 21:48:40 GMT
* # Override values For Indic_Syllabic_Category * # Override values For Indic_Syllabic_Category
* # Not derivable * # Not derivable
* # Initial version based on Unicode 7.0 by Andrew Glass 2014-03-17 * # Initial version based on Unicode 7.0 by Andrew Glass 2014-03-17
@ -27,6 +27,7 @@
* # Updated for Unicode 14.0 by Andrew Glass 2021-09-25 * # Updated for Unicode 14.0 by Andrew Glass 2021-09-25
* # Updated for Unicode 15.0 by Andrew Glass 2022-09-16 * # Updated for Unicode 15.0 by Andrew Glass 2022-09-16
* # Updated for Unicode 15.1 by Andrew Glass 2023-09-14 * # Updated for Unicode 15.1 by Andrew Glass 2023-09-14
* # Updated for Unicode 16.0 by Andrew Glass 2024-09-11
* # Override values For Indic_Positional_Category * # Override values For Indic_Positional_Category
* # Not derivable * # Not derivable
* # Initial version based on Unicode 7.0 by Andrew Glass 2014-03-17 * # Initial version based on Unicode 7.0 by Andrew Glass 2014-03-17
@ -38,6 +39,7 @@
* # Updated for Unicode 14.0 by Andrew Glass 2021-09-28 * # Updated for Unicode 14.0 by Andrew Glass 2021-09-28
* # Updated for Unicode 15.0 by Andrew Glass 2022-09-16 * # Updated for Unicode 15.0 by Andrew Glass 2022-09-16
* # Updated for Unicode 15.1 by Andrew Glass 2023-09-14 * # Updated for Unicode 15.1 by Andrew Glass 2023-09-14
* # Updated for Unicode 16.0 by Andrew Glass 2024-09-11
* UnicodeData.txt does not have a header. * UnicodeData.txt does not have a header.
*/ */
@ -99,16 +101,16 @@
#ifndef HB_OPTIMIZE_SIZE #ifndef HB_OPTIMIZE_SIZE
static const uint8_t static const uint8_t
hb_use_u8[3187] = hb_use_u8[3343] =
{ {
16, 50, 51, 51, 51, 52, 51, 83, 118, 131, 51, 57, 58, 179, 195, 61, 16, 50, 51, 51, 51, 52, 51, 83, 118, 131, 57, 58, 59, 195, 211, 62,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
14, 0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 4, 2, 2, 15, 0, 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 4, 2, 2,
5, 6, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 2, 2, 17, 5, 6, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 2, 2, 17,
18, 19, 20, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 21, 18, 19, 20, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 21,
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 2, 33, 2, 2, 2, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 2, 33, 2, 2, 2,
@ -121,24 +123,26 @@ hb_use_u8[3187] =
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 47, 48, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 47, 48, 2,
49, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 50, 51, 2, 2, 2, 49, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 50, 51, 2, 2, 2,
2, 2, 2, 2, 2, 52, 53, 2, 54, 2, 2, 55, 2, 2, 56, 57, 2, 2, 2, 2, 2, 52, 53, 2, 54, 2, 2, 55, 56, 2, 57, 58,
58, 59, 60, 61, 62, 63, 64, 65, 2, 66, 67, 2, 68, 69, 70, 71, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 2, 70, 71, 72, 73,
2, 72, 2, 73, 74, 75, 76, 2, 2, 77, 78, 79, 80, 2, 81, 82, 2, 74, 2, 75, 76, 77, 78, 2, 2, 79, 80, 81, 82, 2, 83, 84,
2, 83, 83, 83, 83, 83, 83, 83, 83, 84, 2, 2, 2, 2, 2, 2, 2, 85, 85, 85, 85, 85, 85, 85, 85, 86, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 87, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 88, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 89, 90, 2, 2, 2, 91, 2, 2, 2, 92,
93, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 94, 94, 94, 95, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 85, 86, 2, 2, 2, 2, 2, 2, 2, 87, 2, 2, 2, 2, 2, 2, 2, 2, 2, 96, 97, 2, 2, 2, 2, 2,
88, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 98, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 89, 89, 89, 90, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 91, 92, 2, 2, 2, 2, 2, 2, 2, 2, 99, 2, 2, 100, 2, 2, 2, 101, 2, 102, 2, 2, 2,
2, 2, 2, 93, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 103, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 104, 104, 105, 106, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
2, 2, 2, 94, 2, 2, 95, 2, 2, 2, 96, 2, 2, 2, 2, 2, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
2, 2, 2, 97, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
2, 98, 98, 99, 100, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98,
98, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98,
98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
0, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 0, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4,
0, 5, 0, 0, 0, 0, 0, 6, 0, 0, 7, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 6, 0, 0, 7, 0, 0, 0, 0, 0,
0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -167,7 +171,7 @@ hb_use_u8[3187] =
0, 0, 0, 27, 31, 2, 9, 0, 0, 10, 29, 30, 2, 2, 2, 9, 0, 0, 0, 27, 31, 2, 9, 0, 0, 10, 29, 30, 2, 2, 2, 9,
2, 2, 2, 30, 2, 2, 0, 17, 45, 0, 0, 35, 47, 0, 0, 0, 2, 2, 2, 30, 2, 2, 0, 17, 45, 0, 0, 35, 47, 0, 0, 0,
9, 50, 51, 0, 0, 0, 0, 0, 0, 11, 29, 2, 2, 2, 2, 9, 9, 50, 51, 0, 0, 0, 0, 0, 0, 11, 29, 2, 2, 2, 2, 9,
2, 2, 2, 2, 2, 2, 52, 53, 23, 23, 19, 31, 48, 33, 48, 34, 2, 2, 2, 2, 2, 2, 52, 53, 23, 19, 20, 31, 48, 33, 48, 34,
54, 0, 0, 0, 35, 0, 0, 0, 30, 12, 29, 30, 2, 2, 2, 2, 54, 0, 0, 0, 35, 0, 0, 0, 30, 12, 29, 30, 2, 2, 2, 2,
2, 2, 2, 2, 9, 0, 2, 2, 2, 2, 30, 2, 2, 2, 2, 30, 2, 2, 2, 2, 9, 0, 2, 2, 2, 2, 30, 2, 2, 2, 2, 30,
0, 2, 2, 2, 9, 0, 55, 0, 35, 23, 22, 31, 31, 18, 48, 48, 0, 2, 2, 2, 9, 0, 55, 0, 35, 23, 22, 31, 31, 18, 48, 48,
@ -195,88 +199,95 @@ hb_use_u8[3187] =
0, 2, 2, 100, 101, 102, 103, 61, 63, 104, 16, 45, 22, 59, 21, 80, 0, 2, 2, 100, 101, 102, 103, 61, 63, 104, 16, 45, 22, 59, 21, 80,
48, 48, 76, 11, 11, 11, 105, 46, 40, 11, 106, 74, 2, 2, 2, 2, 48, 48, 76, 11, 11, 11, 105, 46, 40, 11, 106, 74, 2, 2, 2, 2,
2, 2, 2, 107, 22, 20, 20, 22, 48, 48, 22, 108, 2, 2, 2, 9, 2, 2, 2, 107, 22, 20, 20, 22, 48, 48, 22, 108, 2, 2, 2, 9,
0, 0, 0, 0, 0, 0, 109, 110, 111, 111, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 110, 110, 110, 110, 0, 0, 0, 0, 0,
0, 106, 74, 2, 2, 2, 2, 2, 2, 60, 61, 59, 25, 22, 112, 61, 0, 106, 74, 2, 2, 2, 2, 2, 2, 60, 61, 59, 25, 22, 111, 61,
2, 2, 2, 2, 107, 22, 23, 45, 45, 102, 14, 0, 0, 0, 0, 0, 2, 2, 2, 2, 107, 22, 23, 45, 45, 102, 14, 0, 0, 0, 0, 0,
0, 2, 2, 61, 18, 48, 23, 113, 102, 102, 102, 114, 115, 0, 0, 0, 0, 2, 2, 61, 18, 48, 23, 112, 102, 102, 102, 113, 114, 0, 0, 0,
0, 2, 2, 2, 2, 2, 0, 30, 2, 11, 46, 116, 116, 116, 11, 116, 0, 2, 2, 2, 2, 2, 0, 30, 2, 11, 46, 115, 115, 115, 11, 115,
116, 15, 116, 116, 116, 26, 0, 40, 0, 0, 0, 117, 51, 11, 5, 0, 115, 15, 115, 115, 115, 26, 0, 40, 0, 0, 0, 116, 51, 11, 5, 0,
0, 0, 0, 0, 0, 0, 118, 0, 0, 0, 0, 0, 0, 0, 6, 119, 0, 0, 0, 0, 0, 0, 117, 0, 0, 0, 0, 0, 0, 0, 6, 118,
120, 42, 42, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 120, 120, 119, 42, 42, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 119,
121, 120, 120, 120, 120, 120, 120, 120, 120, 0, 0, 122, 0, 0, 0, 0, 120, 119, 119, 119, 119, 119, 119, 119, 119, 0, 0, 121, 0, 0, 0, 0,
0, 0, 7, 122, 0, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, 0, 0, 0, 7, 121, 0, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 123, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 122, 122, 0, 0,
0, 2, 2, 2, 2, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0,
124, 0, 123, 123, 0, 0, 0, 0, 0, 2, 53, 2, 108, 2, 10, 2, 123, 0, 122, 122, 0, 0, 0, 0, 0, 2, 53, 2, 108, 2, 10, 2,
2, 2, 65, 19, 16, 0, 0, 31, 0, 2, 2, 0, 0, 0, 0, 0, 2, 2, 65, 19, 16, 0, 0, 31, 0, 2, 2, 0, 0, 0, 0, 0,
0, 29, 2, 2, 2, 2, 2, 2, 2, 2, 2, 125, 23, 23, 23, 23, 0, 29, 2, 2, 2, 2, 2, 2, 2, 2, 2, 124, 23, 23, 23, 23,
23, 23, 23, 126, 0, 0, 0, 0, 0, 11, 11, 11, 11, 11, 11, 11, 23, 23, 23, 125, 0, 0, 0, 0, 0, 11, 11, 11, 11, 11, 11, 11,
11, 11, 2, 0, 0, 0, 0, 0, 52, 2, 2, 2, 22, 22, 127, 116, 11, 11, 2, 0, 0, 0, 0, 0, 52, 2, 2, 2, 22, 22, 126, 115,
0, 2, 2, 2, 128, 20, 59, 20, 113, 102, 129, 0, 0, 0, 0, 0, 0, 2, 2, 2, 127, 20, 59, 20, 112, 102, 128, 0, 0, 0, 0, 0,
0, 11, 130, 2, 2, 2, 2, 2, 2, 2, 131, 23, 22, 20, 48, 132, 0, 11, 129, 2, 2, 2, 2, 2, 2, 2, 130, 23, 22, 20, 48, 131,
133, 134, 0, 0, 0, 0, 0, 0, 0, 2, 2, 52, 30, 2, 2, 2, 132, 133, 0, 0, 0, 0, 0, 0, 0, 2, 2, 52, 30, 2, 2, 2,
2, 2, 2, 2, 2, 10, 22, 59, 99, 76, 135, 136, 137, 0, 0, 0, 2, 2, 2, 2, 2, 10, 22, 59, 99, 76, 134, 135, 136, 0, 0, 0,
0, 2, 138, 2, 2, 2, 2, 139, 0, 30, 2, 42, 5, 0, 79, 15, 0, 2, 137, 2, 2, 2, 2, 138, 0, 30, 2, 42, 5, 0, 79, 15,
2, 53, 22, 140, 52, 53, 2, 2, 105, 10, 9, 0, 0, 0, 0, 0, 2, 53, 22, 139, 52, 53, 2, 2, 105, 10, 9, 0, 0, 0, 0, 0,
0, 2, 2, 2, 2, 2, 141, 21, 25, 0, 0, 142, 143, 0, 0, 0, 0, 2, 2, 2, 2, 2, 140, 21, 25, 0, 0, 141, 142, 0, 0, 0,
0, 2, 65, 45, 23, 80, 47, 144, 0, 81, 81, 81, 81, 81, 81, 81, 0, 2, 65, 45, 23, 80, 47, 143, 0, 81, 81, 81, 81, 81, 81, 81,
81, 0, 0, 0, 0, 0, 0, 0, 6, 120, 120, 120, 120, 121, 0, 0, 81, 0, 0, 0, 0, 0, 0, 0, 6, 119, 119, 119, 119, 120, 0, 0,
0, 2, 2, 2, 2, 2, 9, 2, 2, 2, 9, 2, 30, 2, 2, 2, 0, 2, 2, 2, 2, 2, 9, 2, 2, 2, 9, 2, 30, 2, 2, 2,
2, 2, 30, 2, 2, 2, 30, 9, 0, 128, 20, 27, 31, 0, 0, 145, 2, 2, 30, 2, 2, 2, 30, 9, 0, 127, 20, 27, 31, 0, 0, 144,
146, 2, 2, 30, 2, 30, 2, 2, 2, 2, 2, 2, 0, 14, 37, 0, 145, 2, 2, 30, 2, 30, 2, 2, 2, 2, 2, 2, 0, 14, 37, 0,
147, 2, 2, 13, 37, 0, 30, 2, 2, 2, 0, 0, 0, 0, 0, 0, 146, 2, 2, 13, 37, 0, 30, 2, 2, 2, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 30, 2, 2, 9, 2, 2, 11, 41, 0, 0, 0, 0, 0, 0, 0, 0, 30, 2, 2, 9, 2, 2, 11, 41, 0, 0, 0,
0, 2, 2, 2, 2, 2, 27, 38, 0, 2, 2, 2, 116, 116, 116, 116, 0, 2, 2, 2, 0, 27, 22, 22, 30, 2, 2, 2, 0, 0, 0, 0,
116, 148, 2, 9, 0, 0, 0, 0, 0, 2, 14, 14, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 27, 38, 0, 2, 2, 2, 115, 115, 115, 115,
115, 147, 2, 9, 0, 0, 0, 0, 0, 2, 14, 14, 0, 0, 0, 0,
0, 9, 2, 2, 9, 2, 2, 2, 2, 30, 2, 9, 0, 30, 2, 0, 0, 9, 2, 2, 9, 2, 2, 2, 2, 30, 2, 9, 0, 30, 2, 0,
0, 149, 150, 151, 2, 2, 2, 2, 2, 2, 2, 2, 2, 22, 22, 20, 0, 148, 149, 150, 2, 2, 2, 2, 2, 2, 2, 2, 2, 22, 22, 20,
20, 20, 22, 22, 134, 0, 0, 0, 0, 0, 152, 152, 152, 152, 152, 152, 20, 20, 22, 22, 133, 0, 0, 0, 0, 0, 151, 151, 151, 151, 151, 151,
152, 152, 152, 152, 2, 2, 2, 2, 2, 53, 52, 53, 0, 0, 0, 0, 151, 151, 151, 151, 2, 2, 2, 2, 2, 53, 52, 53, 0, 0, 0, 0,
153, 11, 74, 2, 2, 2, 2, 2, 2, 18, 19, 21, 16, 24, 37, 0, 152, 11, 74, 2, 2, 2, 2, 2, 2, 18, 19, 21, 16, 24, 37, 0,
0, 0, 31, 0, 0, 0, 0, 0, 0, 11, 49, 2, 2, 2, 2, 2, 0, 0, 31, 0, 0, 0, 0, 0, 0, 11, 49, 2, 2, 2, 2, 2,
2, 2, 2, 2, 128, 20, 22, 154, 22, 21, 155, 156, 2, 2, 2, 2, 2, 2, 2, 2, 127, 20, 22, 153, 22, 21, 154, 155, 2, 2, 2, 2,
2, 0, 0, 65, 157, 0, 0, 0, 0, 2, 13, 0, 0, 0, 0, 0, 2, 0, 0, 65, 156, 0, 0, 0, 0, 2, 13, 0, 0, 0, 0, 0,
0, 2, 65, 25, 20, 20, 20, 22, 22, 108, 158, 0, 0, 56, 159, 31, 0, 2, 65, 25, 20, 20, 20, 22, 22, 108, 157, 0, 0, 56, 158, 31,
160, 30, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 23, 159, 30, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 23,
19, 22, 22, 161, 44, 0, 0, 0, 49, 128, 0, 0, 0, 0, 0, 0, 19, 22, 22, 160, 44, 0, 0, 0, 49, 127, 0, 0, 0, 0, 0, 0,
0, 2, 2, 2, 9, 9, 2, 2, 30, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 9, 9, 2, 2, 30, 2, 2, 2, 2, 2, 2, 2,
30, 2, 2, 2, 2, 2, 2, 2, 10, 18, 19, 21, 22, 162, 31, 0, 30, 2, 2, 2, 2, 2, 2, 2, 10, 18, 19, 21, 22, 161, 31, 0,
0, 11, 11, 30, 2, 2, 2, 9, 30, 9, 2, 30, 2, 2, 58, 17, 0, 11, 11, 30, 2, 2, 2, 9, 30, 9, 2, 30, 2, 2, 58, 17,
23, 16, 23, 47, 32, 33, 32, 34, 0, 0, 0, 0, 35, 0, 0, 0, 23, 16, 23, 47, 32, 33, 32, 34, 0, 0, 0, 0, 35, 0, 0, 0,
2, 2, 23, 0, 11, 11, 11, 46, 0, 11, 11, 46, 0, 0, 0, 0, 2, 2, 23, 0, 11, 11, 11, 46, 0, 11, 11, 46, 0, 0, 0, 0,
0, 2, 2, 65, 25, 20, 20, 20, 22, 23, 126, 15, 17, 0, 0, 0, 0, 2, 2, 2, 2, 2, 30, 0, 9, 2, 2, 2, 30, 45, 59, 20,
0, 2, 2, 2, 2, 2, 0, 0, 163, 164, 0, 0, 0, 0, 0, 0, 20, 31, 33, 32, 32, 25, 162, 29, 163, 164, 37, 0, 0, 0, 0, 0,
0, 18, 19, 20, 20, 66, 99, 25, 160, 11, 165, 9, 0, 0, 0, 0, 0, 12, 26, 0, 0, 0, 0, 0, 0, 2, 2, 65, 25, 20, 20, 20,
0, 2, 2, 2, 2, 2, 2, 2, 65, 25, 20, 20, 0, 48, 48, 11, 22, 23, 125, 15, 17, 0, 0, 0, 0, 2, 2, 2, 2, 2, 0, 0,
166, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 20, 165, 166, 0, 0, 0, 0, 0, 0, 0, 18, 19, 20, 20, 66, 99, 25,
0, 23, 19, 20, 20, 21, 16, 82, 166, 38, 0, 0, 0, 0, 0, 0, 159, 11, 167, 9, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2,
0, 2, 2, 2, 2, 2, 10, 167, 25, 20, 22, 22, 165, 9, 0, 0, 65, 25, 20, 20, 0, 48, 48, 11, 168, 37, 0, 0, 0, 0, 0, 0,
0, 2, 2, 2, 2, 2, 9, 43, 136, 23, 22, 20, 76, 21, 22, 0, 0, 0, 0, 0, 0, 2, 2, 20, 0, 23, 19, 20, 20, 21, 16, 82,
0, 2, 2, 2, 9, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 18, 168, 38, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 10, 169,
19, 20, 21, 22, 105, 166, 37, 0, 0, 2, 2, 2, 9, 30, 0, 2, 25, 20, 22, 22, 167, 9, 0, 0, 0, 2, 2, 2, 2, 2, 9, 43,
2, 2, 2, 30, 9, 2, 2, 2, 2, 23, 23, 18, 32, 33, 12, 168, 135, 23, 22, 20, 76, 21, 22, 0, 0, 2, 2, 2, 9, 0, 0, 0,
169, 170, 171, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 0, 2, 2, 0, 2, 2, 2, 2, 2, 2, 18, 19, 20, 21, 22, 105, 168, 37, 0,
2, 65, 25, 20, 20, 0, 22, 23, 29, 108, 0, 33, 0, 0, 0, 0, 0, 2, 2, 2, 9, 30, 0, 2, 2, 2, 2, 30, 9, 2, 2, 2,
0, 52, 20, 22, 22, 22, 140, 2, 2, 2, 172, 173, 11, 15, 174, 72, 2, 23, 23, 18, 32, 33, 12, 170, 164, 171, 172, 0, 0, 0, 0, 0,
175, 0, 0, 1, 147, 0, 0, 0, 0, 52, 20, 22, 16, 19, 20, 2, 0, 2, 2, 2, 2, 0, 2, 2, 2, 65, 25, 20, 20, 0, 22, 23,
2, 2, 2, 158, 158, 158, 176, 176, 176, 176, 176, 176, 15, 177, 0, 30, 29, 108, 0, 33, 0, 0, 0, 0, 0, 52, 20, 22, 22, 22, 139, 2,
0, 22, 20, 20, 31, 22, 22, 11, 166, 0, 61, 61, 61, 61, 61, 61, 2, 2, 173, 174, 11, 15, 175, 61, 176, 0, 0, 1, 146, 0, 0, 0,
61, 66, 21, 82, 46, 0, 0, 0, 0, 2, 2, 2, 9, 2, 30, 2, 0, 52, 20, 22, 16, 19, 20, 2, 2, 2, 2, 157, 157, 157, 177, 177,
2, 52, 22, 22, 31, 0, 38, 22, 27, 11, 159, 178, 174, 0, 0, 0, 177, 177, 177, 177, 15, 178, 0, 30, 0, 22, 20, 20, 31, 22, 22, 11,
0, 2, 2, 2, 30, 9, 2, 2, 2, 2, 2, 2, 2, 2, 23, 23, 168, 0, 61, 61, 61, 61, 61, 61, 61, 66, 21, 82, 46, 0, 0, 0,
47, 22, 35, 82, 68, 0, 0, 0, 0, 2, 179, 66, 47, 0, 0, 0, 0, 2, 2, 2, 9, 2, 30, 2, 2, 52, 22, 22, 31, 0, 38, 22,
0, 11, 180, 2, 2, 2, 2, 2, 2, 2, 2, 23, 22, 20, 31, 0, 27, 11, 158, 179, 180, 0, 0, 0, 0, 2, 2, 2, 30, 9, 2, 2,
48, 16, 143, 0, 0, 0, 0, 0, 0, 181, 181, 181, 181, 181, 181, 181, 2, 2, 2, 2, 2, 2, 23, 23, 47, 22, 35, 82, 68, 0, 0, 0,
181, 182, 182, 182, 183, 184, 182, 181, 181, 185, 181, 181, 186, 187, 187, 187, 0, 2, 181, 66, 47, 0, 0, 0, 0, 11, 182, 2, 2, 2, 2, 2,
187, 187, 187, 187, 0, 0, 0, 0, 0, 11, 11, 11, 46, 0, 0, 0, 2, 2, 2, 23, 22, 20, 31, 0, 48, 16, 142, 0, 0, 0, 0, 0,
0, 2, 2, 2, 2, 2, 9, 0, 58, 188, 20, 20, 20, 20, 20, 20, 0, 2, 2, 2, 2, 2, 155, 0, 0, 183, 183, 183, 183, 183, 183, 183,
20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 0, 0, 0, 183, 184, 184, 184, 185, 186, 184, 183, 183, 187, 183, 183, 188, 189, 189, 189,
40, 116, 26, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 189, 189, 189, 189, 0, 0, 0, 0, 0, 183, 183, 183, 183, 183, 190, 0,
0, 2, 2, 2, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 0, 58, 0, 2, 2, 2, 2, 2, 2, 2, 22, 22, 22, 22, 22, 22, 191, 192,
37, 0, 6, 120, 120, 120, 121, 0, 0, 11, 11, 11, 49, 2, 2, 2, 193, 11, 11, 11, 46, 0, 0, 0, 0, 29, 74, 2, 2, 2, 2, 2,
0, 2, 2, 2, 2, 2, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 65, 47, 0, 2, 2, 2, 2, 2, 9, 0,
46, 2, 2, 2, 2, 2, 2, 11, 11, 2, 2, 2, 2, 2, 2, 22, 58, 194, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
22, 2, 2, 44, 44, 44, 92, 0, 0, O, O, O, GB, B, B, O, 20, 20, 20, 20, 20, 0, 0, 0, 40, 115, 26, 0, 0, 0, 0, 0,
0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
30, 2, 2, 2, 2, 2, 0, 58, 37, 0, 6, 119, 119, 119, 120, 0,
0, 11, 11, 11, 49, 2, 2, 2, 0, 2, 2, 2, 2, 2, 0, 0,
2, 2, 2, 2, 2, 2, 2, 2, 46, 2, 2, 2, 2, 2, 2, 11,
11, 2, 2, 2, 2, 2, 2, 22, 22, 2, 2, 2, 2, 2, 2, 2,
20, 2, 2, 44, 44, 44, 92, 0, 0, O, O, O, GB, B, B, O,
SB, O, SE, GB, O, O, WJ,FMPst,FMPst, O, CGJ, B, O, B,VMAbv,VMAbv, SB, O, SE, GB, O, O, WJ,FMPst,FMPst, O, CGJ, B, O, B,VMAbv,VMAbv,
VMAbv, O,VMAbv, B,CMBlw,CMBlw,CMBlw,VMAbv,VMPst, VAbv, VPst,CMBlw, B, VPst, VPre, VPst, VMAbv, O,VMAbv, B,CMBlw,CMBlw,CMBlw,VMAbv,VMPst, VAbv, VPst,CMBlw, B, VPst, VPre, VPst,
VBlw, VBlw, VBlw, VBlw, VAbv, VAbv, VAbv, VPst, VPst, VPst, H, VPre, VPst,VMBlw, O, O, VBlw, VBlw, VBlw, VBlw, VAbv, VAbv, VAbv, VPst, VPst, VPst, H, VPre, VPst,VMBlw, O, O,
@ -290,20 +301,20 @@ hb_use_u8[3187] =
FMAbv, FAbv,CMAbv,FMAbv,VMAbv,FMAbv, VAbv, IS,FMAbv, B,FMAbv, B, CGJ, WJ, CGJ, GB, FMAbv, FAbv,CMAbv,FMAbv,VMAbv,FMAbv, VAbv, IS,FMAbv, B,FMAbv, B, CGJ, WJ, CGJ, GB,
CMAbv,CMAbv, B, GB, B, VAbv, SUB, FPst, FPst,VMBlw, FPst, FPst, FBlw,VMAbv,FMBlw, VAbv, CMAbv,CMAbv, B, GB, B, VAbv, SUB, FPst, FPst,VMBlw, FPst, FPst, FBlw,VMAbv,FMBlw, VAbv,
VPre, B, MPre, MBlw, SUB, FAbv, FAbv, MAbv, SUB, Sk, VPst, VAbv,VMAbv,VMAbv, FAbv,CMAbv, VPre, B, MPre, MBlw, SUB, FAbv, FAbv, MAbv, SUB, Sk, VPst, VAbv,VMAbv,VMAbv, FAbv,CMAbv,
VPst, H, B, O,SMAbv,SMBlw,SMAbv,SMAbv,SMAbv, VPst, IS, VBlw, FAbv,VMPre,VMPre,FMAbv, VPst, H, B, O,SMAbv,SMAbv,SMAbv, VPst, IS, VBlw, FAbv,VMPre,VMPre,FMAbv,CMBlw,VMBlw,
CMBlw,VMBlw,VMBlw,VMAbv, CS, O,FMAbv, ZWNJ, CGJ, WJ, WJ, WJ, O,FMPst, O, SB, VMBlw,VMAbv, CS, O,FMAbv, ZWNJ, CGJ, WJ, WJ, WJ, O,FMPst, O, SB, SE, O,
SE, O, H, MPst, VPst, H,VMAbv, VAbv,VMBlw, B, VBlw, FPst, VPst, FAbv,VMPst, B, H, MPst, VPst, H,VMAbv, VAbv,VMBlw, B, VBlw, FPst, VPst, FAbv,VMPst, B,CMAbv, VAbv,
CMAbv, VAbv, MBlw, MPst, MBlw, H, O, VBlw, MPst, MPre, MAbv, MBlw, O, B, FAbv, FAbv, MBlw, MPst, MBlw, H, O, VBlw, MPst, MPre, MAbv, MBlw, O, B, FAbv, FAbv, FPst, VBlw,
FPst, VBlw, B, B, VPre, O,VMPst, IS, O,VMPst, VBlw, VPst,VMBlw,VMBlw,VMAbv, O, B, B, VPre, O,VMPst, IS, O,VMPst, VBlw, VPst,VMBlw,VMBlw,VMAbv, O, IS,VMBlw,
IS,VMBlw, B,VMPst,VMAbv,VMPst, CS, CS, B, N, N, O, HN, VPre, VBlw, VAbv, B,VMPst,VMAbv,VMPst, CS, CS, B, N, N, O, HN, VPre, VBlw, VAbv, IS,CMAbv,
IS,CMAbv, O, VPst, B, R, R,CMBlw, VAbv, VPre,VMAbv,VMAbv, H, VAbv,CMBlw,FMAbv, O, VPst, B, R, R,CMBlw, VAbv, VPre,VMAbv,VMAbv, H, VAbv,CMBlw,VMPst, O,VMAbv,
B, CS, CS, H,CMBlw,VMPst, H,VMPst, VAbv,VMAbv, VPst, IS, R, MPst, R, MPst, CMBlw, IS, R,FMAbv, B, CS, CS, H,CMBlw,VMPst, H,VMPst, VAbv,VMAbv, VPst, MPst,
CMBlw, B,FMBlw, VBlw,VMAbv, R, MBlw, MBlw, GB, FBlw, FBlw,CMAbv, IS, VBlw, IS, GB, R, MPst,CMBlw, B,FMBlw, VBlw,VMAbv, CS, SUB, SUB, GB, FBlw, FBlw,CMAbv, IS, VBlw,
VAbv, R,VMPst, G, G, J, J, J, SB, SE, J, HR, G, G, HM, HM, IS, R, MBlw, GB, VAbv, R,VMPst, G, G, J, J, J, SB, SE, J, HR,
HM, O, VBlw, G, G, HM, HM, HM, G, O, MPre, MPre, MPst,VMAbv, MBlw, VBlw, O, VBlw,
}; };
static const uint16_t static const uint16_t
hb_use_u16[808] = hb_use_u16[856] =
{ {
0, 0, 1, 2, 0, 3, 0, 3, 0, 0, 4, 5, 0, 6, 0, 0, 0, 0, 1, 2, 0, 3, 0, 3, 0, 0, 4, 5, 0, 6, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0,
@ -332,28 +343,31 @@ hb_use_u16[808] =
0, 0, 0, 0, 0, 0, 0,164, 0, 0, 0, 0, 0, 0, 0,165, 0, 0, 0, 0, 0, 0, 0,164, 0, 0, 0, 0, 0, 0, 0,165,
0, 0, 0, 0, 0, 0, 0,166,166,167, 34,168, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,166,166,167, 34,168, 0, 0, 0, 0,
169,170, 10,171, 95, 0, 0, 0, 0, 0, 0, 0, 70, 10,172, 0, 169,170, 10,171, 95, 0, 0, 0, 0, 0, 0, 0, 70, 10,172, 0,
10,173,174, 0, 0, 0, 0, 0, 10, 10,175, 2, 0, 0, 0, 0, 10,173,174, 0, 0, 0, 0, 0, 10, 10,175, 2, 9, 10,176, 10,
10, 10,176,173, 0, 0, 0, 0, 0, 0, 0, 10,177,178, 0, 10, 177, 0, 0, 0, 0, 0, 0, 0, 10, 10,178,173, 0, 0, 0, 0,
179, 0, 0,180,181, 0, 0, 0,182, 10, 10,183,184,185,186,187, 0, 0, 0, 10,179,180, 0, 10,181, 0, 0,182,183, 0, 0, 0,
188, 10, 10,189,190, 0, 0, 0,191, 10,192,193,194, 10, 10,195, 184, 10, 10,185,186,187,188,189,190, 10, 10,191,192, 0, 0, 0,
188, 10, 10,196,197,106,198,103, 10, 34,199,200,201, 0, 0, 0, 193, 10,194,195,196, 10, 10,197,190, 10, 10,198,199,106,200,103,
202,203, 95, 10, 10,204,205, 2,206, 21, 22,207,208,209,210,211, 10, 34,201,202,203, 0, 0, 0,204,205, 95, 10, 10,206,207, 2,
10, 10, 10,212,213,214,215, 0,198, 10, 10,216,217, 2, 0, 0, 208, 21, 22,209,210,211,212,213,214, 10, 10,215,216,217,218, 0,
10, 10,218,219,220,221, 0, 0, 10, 10, 10,222,223, 2, 0, 0, 10, 10, 10,219,220,221,222, 0,200, 10, 10,223,224, 2, 0, 0,
10, 10,224,225, 2, 0, 0, 0, 10,226,227,104,228, 0, 0, 0, 10, 10,225,226,227,228, 0, 0, 10, 10, 10,229,230, 2, 0, 0,
10, 10,229,230, 0, 0, 0, 0,231,232, 10,233,234, 2, 0, 0, 10, 10,231,232, 2, 10,141, 0, 10,233,234,104,235, 0, 0, 0,
0, 0,235, 10, 10,236,237, 0,238, 10, 10,239,240,241, 10, 10, 10, 10,236,237, 0, 0, 0, 0,238,239, 10,240,241, 2, 0, 0,
242,243, 0, 0, 0, 0, 0, 0, 22, 10,218,244, 8, 10, 71, 19, 0, 0,242, 10, 10,243,244, 0,245, 10, 10,246,247,248, 10, 10,
10,245, 74,246, 0, 0, 0, 0,247, 10, 10,248,249, 2,250, 10, 249,250, 0, 0, 0, 0, 0, 0, 22, 10,225,251, 8, 10, 71, 19,
251,252, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10,253, 10,252, 74,253, 0, 0, 0, 0,254, 10, 10,255,256, 2,257, 10,
254, 49, 10,255,256, 2, 0, 0,257,257,257,257,257,257,257,257, 258,259, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10,260,
257,257,257,258,259,260, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 261, 49, 10,262,263,264, 0, 0,265,265,265,265,265,265,265,265,
10, 10, 10,261, 0, 0, 0, 0, 10, 10, 10, 10,262,263,264,264, 265,265,265,266,267,268,265,265,265,265,265,265,265,265,265,269,
265,266, 0, 0, 0, 0,267, 0, 10, 10, 10, 10, 10, 10, 10, 10, 10,270,271, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,
10, 10, 10, 10, 10,268, 0, 0, 10, 10, 10, 10, 10, 10,106, 71, 10, 10, 10,272, 0, 0, 0, 0, 0, 0, 0, 0,273, 10,274, 2,
95,269, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,270, 10, 10, 10, 10,275,276,277,277,278,279, 0, 0, 0, 0,280, 0,
10, 10, 71,271,272, 0, 0, 0, 0, 10,273, 0, 10, 10,274, 2, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,177, 0,281,
0, 0, 0, 0, 0, 10,275, 2, 10, 10, 10, 10,276, 2, 0, 0, 10, 10, 10, 10, 10, 10,106, 71, 95,282, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,283, 10, 10, 71,284,285, 0, 0, 0,
0, 10,286, 0, 10, 10,287, 2, 0, 0, 0, 0, 0, 10,288, 2,
0, 0, 0, 0, 0, 10,289,106, 10, 10, 10, 10,290, 2, 0, 0,
130,130,130,130,130,130,130,130,163,163,163,163,163,163,163,163, 130,130,130,130,130,130,130,130,163,163,163,163,163,163,163,163,
163,163,163,163,163,163,163,130, 163,163,163,163,163,163,163,130,
}; };
@ -366,23 +380,23 @@ hb_use_b4 (const uint8_t* a, unsigned i)
static inline uint_fast8_t static inline uint_fast8_t
hb_use_get_category (unsigned u) hb_use_get_category (unsigned u)
{ {
return u<921600u?hb_use_u8[2809+(((hb_use_u8[593+(((hb_use_u16[((hb_use_u8[113+(((hb_use_b4(hb_use_u8,u>>1>>3>>3>>5))<<5)+((u>>1>>3>>3)&31u))])<<3)+((u>>1>>3)&7u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:O; return u<921600u?hb_use_u8[2953+(((hb_use_u8[625+(((hb_use_u16[((hb_use_u8[113+(((hb_use_b4(hb_use_u8,u>>1>>3>>3>>5))<<5)+((u>>1>>3>>3)&31u))])<<3)+((u>>1>>3)&7u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:O;
} }
#else #else
static const uint8_t static const uint8_t
hb_use_u8[3483] = hb_use_u8[3655] =
{ {
16, 50, 51, 51, 51, 52, 51, 83, 118, 131, 51, 57, 58, 179, 195, 61, 16, 50, 51, 51, 51, 52, 51, 83, 118, 131, 57, 58, 59, 195, 211, 62,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
14, 0, 1, 1, 2, 1, 1, 3, 4, 5, 6, 7, 8, 9, 10, 1, 15, 0, 1, 1, 2, 1, 1, 3, 4, 5, 6, 7, 8, 9, 10, 1,
11, 12, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 17, 18, 19, 1, 11, 12, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 17, 18, 19, 1,
1, 20, 1, 1, 1, 1, 21, 1, 22, 1, 1, 1, 1, 1, 23, 24, 1, 20, 1, 1, 1, 1, 21, 1, 22, 1, 1, 1, 1, 1, 23, 24,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@ -390,14 +404,15 @@ hb_use_u8[3483] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 29, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 29,
30, 1, 1, 1, 1, 1, 31, 1, 1, 1, 1, 32, 33, 1, 34, 35, 30, 1, 1, 1, 1, 1, 31, 1, 1, 1, 1, 32, 33, 1, 34, 35,
36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 1, 48, 49, 50, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 1, 48, 49, 50,
51, 52, 52, 52, 52, 53, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 51, 52, 52, 52, 52, 53, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 54, 55, 1, 1, 1, 52, 52, 52, 52, 54, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
56, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 57, 58, 1, 1, 1, 1, 55, 1, 1, 1, 1, 1, 1, 1, 1, 56, 57, 1, 58, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 59, 1, 1, 59, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 60, 61, 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, 62, 1, 1,
1, 1, 61, 62, 1, 63, 1, 1, 1, 1, 64, 1, 1, 1, 1, 1, 1, 1, 63, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 65, 66, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 1, 1, 64, 65, 1, 66, 67, 1, 1, 1, 68, 1, 1, 1, 1, 1,
65, 0, 1, 2, 2, 0, 3, 4, 0, 0, 0, 0, 0, 0, 0, 0, 1, 69, 70, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
69, 0, 1, 2, 2, 0, 3, 4, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 7, 8, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 0, 0, 9, 0, 0, 0, 0,
0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
@ -414,23 +429,25 @@ hb_use_u8[3483] =
122, 0, 0, 0, 0, 0, 0, 56, 123, 124, 0, 0, 0, 0, 0, 0, 122, 0, 0, 0, 0, 0, 0, 56, 123, 124, 0, 0, 0, 0, 0, 0,
125, 0, 0, 0, 0, 0, 0, 0, 126, 0, 0, 0, 127, 128, 129, 0, 125, 0, 0, 0, 0, 0, 0, 0, 126, 0, 0, 0, 127, 128, 129, 0,
0, 130, 131, 132, 0, 0, 0, 51, 133, 0, 0, 0, 0, 134, 135, 0, 0, 130, 131, 132, 0, 0, 0, 51, 133, 0, 0, 0, 0, 134, 135, 0,
0, 56, 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 137, 0, 0, 56, 136, 7, 137, 138, 0, 0, 0, 0, 0, 0, 0, 56, 139, 0,
0, 0, 101, 138, 101, 139, 140, 141, 0, 142, 143, 144, 145, 146, 147, 148, 0, 0, 101, 140, 101, 141, 142, 143, 0, 144, 145, 146, 147, 148, 149, 150,
0, 149, 150, 151, 152, 146, 153, 154, 155, 156, 157, 158, 0, 159, 160, 161, 0, 151, 152, 153, 154, 148, 155, 156, 157, 158, 159, 160, 0, 161, 162, 163,
162, 163, 164, 165, 166, 0, 0, 0, 0, 56, 167, 168, 169, 170, 171, 172, 164, 165, 166, 167, 168, 169, 170, 171, 172, 56, 173, 174, 175, 176, 177, 178,
0, 0, 0, 0, 0, 56, 173, 174, 0, 56, 175, 176, 0, 56, 177, 67, 0, 0, 0, 0, 0, 56, 179, 180, 0, 56, 181, 182, 0, 56, 183, 184,
0, 178, 179, 180, 0, 0, 0, 0, 0, 56, 181, 0, 0, 0, 0, 0, 185, 186, 187, 188, 0, 0, 0, 0, 0, 56, 189, 0, 0, 0, 0, 0,
0, 182, 183, 184, 0, 0, 185, 186, 187, 188, 189, 190, 56, 191, 0, 0, 0, 190, 191, 192, 0, 0, 193, 194, 195, 196, 197, 198, 56, 199, 0, 0,
0, 192, 193, 194, 195, 196, 197, 0, 0, 198, 199, 200, 201, 202, 67, 0, 0, 200, 201, 202, 203, 204, 205, 0, 0, 206, 207, 208, 209, 210, 67, 0,
0, 0, 0, 0, 0, 0, 0, 0, 203, 204, 205, 206, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 211, 212, 213, 214, 0, 0, 0, 0,
0, 207, 207, 207, 207, 207, 207, 207, 207, 207, 208, 209, 0, 0, 0, 0, 0, 215, 215, 215, 215, 215, 215, 215, 215, 215, 216, 217, 215, 215, 215, 215,
0, 0, 0, 0, 0, 0, 0, 67, 0, 56, 210, 0, 0, 0, 0, 0, 215, 215, 215, 215, 215, 215, 215, 215, 218, 219, 220, 0, 0, 0, 0, 0,
0, 56, 56, 211, 212, 213, 0, 0, 214, 56, 56, 56, 56, 56, 56, 56, 0, 0, 0, 0, 0, 0, 0, 67, 0, 56, 221, 0, 0, 0, 0, 0,
56, 56, 56, 56, 56, 56, 56, 215, 0, 56, 56, 56, 216, 217, 0, 0, 0, 0, 0, 222, 223, 0, 0, 0, 0, 56, 56, 224, 225, 226, 0, 0,
0, 0, 0, 0, 218, 0, 0, 0, 0, 56, 219, 220, 0, 0, 0, 0, 227, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 228,
0, 0, 0, 0, 0, 101, 221, 56, 222, 0, 0, 0, 0, 0, 0, 101, 229, 56, 56, 56, 230, 231, 0, 0, 0, 0, 0, 0, 232, 0, 0, 0,
223, 56, 56, 224, 0, 0, 0, 0, 0, 225, 225, 225, 225, 225, 225, 225, 0, 56, 233, 234, 0, 0, 0, 0, 0, 0, 0, 0, 0, 101, 235, 56,
225, 226, 226, 226, 226, 226, 226, 226, 227, 0, 0, 0, 0, 0, 0, 0, 236, 0, 0, 0, 0, 0, 0, 101, 237, 0, 0, 0, 0, 0, 0, 101,
238, 56, 56, 239, 0, 0, 0, 0, 0, 240, 240, 240, 240, 240, 240, 240,
240, 241, 241, 241, 241, 241, 241, 241, 242, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 2, 2, 2, 2, 0, 0,
0, 0, 0, 0, 0, 0, 3, 4, 0, 5, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 3, 4, 0, 5, 0, 0, 0, 0, 0, 6,
0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
@ -460,7 +477,7 @@ hb_use_u8[3483] =
0, 10, 29, 30, 2, 2, 2, 9, 2, 2, 2, 30, 2, 2, 0, 17, 0, 10, 29, 30, 2, 2, 2, 9, 2, 2, 2, 30, 2, 2, 0, 17,
45, 0, 0, 35, 47, 0, 0, 0, 9, 50, 51, 0, 0, 0, 0, 0, 45, 0, 0, 35, 47, 0, 0, 0, 9, 50, 51, 0, 0, 0, 0, 0,
0, 11, 29, 2, 2, 2, 2, 9, 2, 2, 2, 2, 2, 2, 52, 53, 0, 11, 29, 2, 2, 2, 2, 9, 2, 2, 2, 2, 2, 2, 52, 53,
23, 23, 19, 31, 48, 33, 48, 34, 54, 0, 0, 0, 35, 0, 0, 0, 23, 19, 20, 31, 48, 33, 48, 34, 54, 0, 0, 0, 35, 0, 0, 0,
30, 12, 29, 30, 2, 2, 2, 2, 2, 2, 2, 2, 9, 0, 2, 2, 30, 12, 29, 30, 2, 2, 2, 2, 2, 2, 2, 2, 9, 0, 2, 2,
2, 2, 30, 2, 2, 2, 2, 30, 0, 2, 2, 2, 9, 0, 55, 0, 2, 2, 30, 2, 2, 2, 2, 30, 0, 2, 2, 2, 9, 0, 55, 0,
35, 23, 22, 31, 31, 18, 48, 48, 25, 0, 23, 0, 0, 0, 0, 0, 35, 23, 22, 31, 31, 18, 48, 48, 25, 0, 23, 0, 0, 0, 0, 0,
@ -488,87 +505,94 @@ hb_use_u8[3483] =
63, 104, 16, 45, 22, 59, 21, 80, 48, 48, 76, 11, 11, 11, 105, 46, 63, 104, 16, 45, 22, 59, 21, 80, 48, 48, 76, 11, 11, 11, 105, 46,
40, 11, 106, 74, 2, 2, 2, 2, 2, 2, 2, 107, 22, 20, 20, 22, 40, 11, 106, 74, 2, 2, 2, 2, 2, 2, 2, 107, 22, 20, 20, 22,
48, 48, 22, 108, 2, 2, 2, 9, 0, 0, 0, 0, 0, 0, 109, 110, 48, 48, 22, 108, 2, 2, 2, 9, 0, 0, 0, 0, 0, 0, 109, 110,
111, 111, 111, 0, 0, 0, 0, 0, 0, 106, 74, 2, 2, 2, 2, 2, 110, 110, 110, 0, 0, 0, 0, 0, 0, 106, 74, 2, 2, 2, 2, 2,
2, 60, 61, 59, 25, 22, 112, 61, 2, 2, 2, 2, 107, 22, 23, 45, 2, 60, 61, 59, 25, 22, 111, 61, 2, 2, 2, 2, 107, 22, 23, 45,
45, 102, 14, 0, 0, 0, 0, 0, 0, 2, 2, 61, 18, 48, 23, 113, 45, 102, 14, 0, 0, 0, 0, 0, 0, 2, 2, 61, 18, 48, 23, 112,
102, 102, 102, 114, 115, 0, 0, 0, 0, 2, 2, 2, 2, 2, 0, 30, 102, 102, 102, 113, 114, 0, 0, 0, 0, 2, 2, 2, 2, 2, 0, 30,
2, 11, 46, 116, 116, 116, 11, 116, 116, 15, 116, 116, 116, 26, 0, 40, 2, 11, 46, 115, 115, 115, 11, 115, 115, 15, 115, 115, 115, 26, 0, 40,
0, 0, 0, 117, 51, 11, 5, 0, 0, 0, 0, 0, 0, 0, 118, 0, 0, 0, 0, 116, 51, 11, 5, 0, 0, 0, 0, 0, 0, 0, 117, 0,
0, 0, 0, 0, 0, 0, 6, 119, 120, 42, 42, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 118, 119, 42, 42, 5, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 120, 120, 121, 120, 120, 120, 120, 120, 120, 120, 0, 0, 0, 0, 0, 0, 119, 119, 120, 119, 119, 119, 119, 119, 119, 119,
120, 0, 0, 122, 0, 0, 0, 0, 0, 0, 7, 122, 0, 0, 0, 0, 119, 0, 0, 121, 0, 0, 0, 0, 0, 0, 7, 121, 0, 0, 0, 0,
0, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,
0, 0, 0, 0, 123, 123, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 122, 122, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0,
30, 0, 0, 0, 0, 0, 0, 0, 124, 0, 123, 123, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 123, 0, 122, 122, 0, 0, 0, 0,
0, 2, 53, 2, 108, 2, 10, 2, 2, 2, 65, 19, 16, 0, 0, 31, 0, 2, 53, 2, 108, 2, 10, 2, 2, 2, 65, 19, 16, 0, 0, 31,
0, 2, 2, 0, 0, 0, 0, 0, 0, 29, 2, 2, 2, 2, 2, 2, 0, 2, 2, 0, 0, 0, 0, 0, 0, 29, 2, 2, 2, 2, 2, 2,
2, 2, 2, 125, 23, 23, 23, 23, 23, 23, 23, 126, 0, 0, 0, 0, 2, 2, 2, 124, 23, 23, 23, 23, 23, 23, 23, 125, 0, 0, 0, 0,
0, 11, 11, 11, 11, 11, 11, 11, 11, 11, 2, 0, 0, 0, 0, 0, 0, 11, 11, 11, 11, 11, 11, 11, 11, 11, 2, 0, 0, 0, 0, 0,
52, 2, 2, 2, 22, 22, 127, 116, 0, 2, 2, 2, 128, 20, 59, 20, 52, 2, 2, 2, 22, 22, 126, 115, 0, 2, 2, 2, 127, 20, 59, 20,
113, 102, 129, 0, 0, 0, 0, 0, 0, 11, 130, 2, 2, 2, 2, 2, 112, 102, 128, 0, 0, 0, 0, 0, 0, 11, 129, 2, 2, 2, 2, 2,
2, 2, 131, 23, 22, 20, 48, 132, 133, 134, 0, 0, 0, 0, 0, 0, 2, 2, 130, 23, 22, 20, 48, 131, 132, 133, 0, 0, 0, 0, 0, 0,
0, 2, 2, 52, 30, 2, 2, 2, 2, 2, 2, 2, 2, 10, 22, 59, 0, 2, 2, 52, 30, 2, 2, 2, 2, 2, 2, 2, 2, 10, 22, 59,
99, 76, 135, 136, 137, 0, 0, 0, 0, 2, 138, 2, 2, 2, 2, 139, 99, 76, 134, 135, 136, 0, 0, 0, 0, 2, 137, 2, 2, 2, 2, 138,
0, 30, 2, 42, 5, 0, 79, 15, 2, 53, 22, 140, 52, 53, 2, 2, 0, 30, 2, 42, 5, 0, 79, 15, 2, 53, 22, 139, 52, 53, 2, 2,
105, 10, 9, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 141, 21, 105, 10, 9, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 140, 21,
25, 0, 0, 142, 143, 0, 0, 0, 0, 2, 65, 45, 23, 80, 47, 144, 25, 0, 0, 141, 142, 0, 0, 0, 0, 2, 65, 45, 23, 80, 47, 143,
0, 81, 81, 81, 81, 81, 81, 81, 81, 0, 0, 0, 0, 0, 0, 0, 0, 81, 81, 81, 81, 81, 81, 81, 81, 0, 0, 0, 0, 0, 0, 0,
6, 120, 120, 120, 120, 121, 0, 0, 0, 2, 2, 2, 2, 2, 9, 2, 6, 119, 119, 119, 119, 120, 0, 0, 0, 2, 2, 2, 2, 2, 9, 2,
2, 2, 9, 2, 30, 2, 2, 2, 2, 2, 30, 2, 2, 2, 30, 9, 2, 2, 9, 2, 30, 2, 2, 2, 2, 2, 30, 2, 2, 2, 30, 9,
0, 128, 20, 27, 31, 0, 0, 145, 146, 2, 2, 30, 2, 30, 2, 2, 0, 127, 20, 27, 31, 0, 0, 144, 145, 2, 2, 30, 2, 30, 2, 2,
2, 2, 2, 2, 0, 14, 37, 0, 147, 2, 2, 13, 37, 0, 30, 2, 2, 2, 2, 2, 0, 14, 37, 0, 146, 2, 2, 13, 37, 0, 30, 2,
2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 2, 2,
9, 2, 2, 11, 41, 0, 0, 0, 0, 2, 2, 2, 2, 2, 27, 38, 9, 2, 2, 11, 41, 0, 0, 0, 0, 2, 2, 2, 0, 27, 22, 22,
0, 2, 2, 2, 116, 116, 116, 116, 116, 148, 2, 9, 0, 0, 0, 0, 30, 2, 2, 2, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 27, 38,
0, 2, 2, 2, 115, 115, 115, 115, 115, 147, 2, 9, 0, 0, 0, 0,
0, 2, 14, 14, 0, 0, 0, 0, 0, 9, 2, 2, 9, 2, 2, 2, 0, 2, 14, 14, 0, 0, 0, 0, 0, 9, 2, 2, 9, 2, 2, 2,
2, 30, 2, 9, 0, 30, 2, 0, 0, 149, 150, 151, 2, 2, 2, 2, 2, 30, 2, 9, 0, 30, 2, 0, 0, 148, 149, 150, 2, 2, 2, 2,
2, 2, 2, 2, 2, 22, 22, 20, 20, 20, 22, 22, 134, 0, 0, 0, 2, 2, 2, 2, 2, 22, 22, 20, 20, 20, 22, 22, 133, 0, 0, 0,
0, 0, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 2, 2, 2, 2, 0, 0, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 2, 2, 2, 2,
2, 53, 52, 53, 0, 0, 0, 0, 153, 11, 74, 2, 2, 2, 2, 2, 2, 53, 52, 53, 0, 0, 0, 0, 152, 11, 74, 2, 2, 2, 2, 2,
2, 18, 19, 21, 16, 24, 37, 0, 0, 0, 31, 0, 0, 0, 0, 0, 2, 18, 19, 21, 16, 24, 37, 0, 0, 0, 31, 0, 0, 0, 0, 0,
0, 11, 49, 2, 2, 2, 2, 2, 2, 2, 2, 2, 128, 20, 22, 154, 0, 11, 49, 2, 2, 2, 2, 2, 2, 2, 2, 2, 127, 20, 22, 153,
22, 21, 155, 156, 2, 2, 2, 2, 2, 0, 0, 65, 157, 0, 0, 0, 22, 21, 154, 155, 2, 2, 2, 2, 2, 0, 0, 65, 156, 0, 0, 0,
0, 2, 13, 0, 0, 0, 0, 0, 0, 2, 65, 25, 20, 20, 20, 22, 0, 2, 13, 0, 0, 0, 0, 0, 0, 2, 65, 25, 20, 20, 20, 22,
22, 108, 158, 0, 0, 56, 159, 31, 160, 30, 2, 2, 2, 2, 2, 2, 22, 108, 157, 0, 0, 56, 158, 31, 159, 30, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 23, 19, 22, 22, 161, 44, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 23, 19, 22, 22, 160, 44, 0, 0, 0,
49, 128, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 9, 9, 2, 2, 49, 127, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 9, 9, 2, 2,
30, 2, 2, 2, 2, 2, 2, 2, 30, 2, 2, 2, 2, 2, 2, 2, 30, 2, 2, 2, 2, 2, 2, 2, 30, 2, 2, 2, 2, 2, 2, 2,
10, 18, 19, 21, 22, 162, 31, 0, 0, 11, 11, 30, 2, 2, 2, 9, 10, 18, 19, 21, 22, 161, 31, 0, 0, 11, 11, 30, 2, 2, 2, 9,
30, 9, 2, 30, 2, 2, 58, 17, 23, 16, 23, 47, 32, 33, 32, 34, 30, 9, 2, 30, 2, 2, 58, 17, 23, 16, 23, 47, 32, 33, 32, 34,
0, 0, 0, 0, 35, 0, 0, 0, 2, 2, 23, 0, 11, 11, 11, 46, 0, 0, 0, 0, 35, 0, 0, 0, 2, 2, 23, 0, 11, 11, 11, 46,
0, 11, 11, 46, 0, 0, 0, 0, 0, 2, 2, 65, 25, 20, 20, 20, 0, 11, 11, 46, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 30, 0,
22, 23, 126, 15, 17, 0, 0, 0, 0, 2, 2, 2, 2, 2, 0, 0, 9, 2, 2, 2, 30, 45, 59, 20, 20, 31, 33, 32, 32, 25, 162, 29,
163, 164, 0, 0, 0, 0, 0, 0, 0, 18, 19, 20, 20, 66, 99, 25, 163, 164, 37, 0, 0, 0, 0, 0, 0, 12, 26, 0, 0, 0, 0, 0,
160, 11, 165, 9, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 65, 25, 20, 20, 20, 22, 23, 125, 15, 17, 0, 0, 0,
65, 25, 20, 20, 0, 48, 48, 11, 166, 37, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 0, 0, 165, 166, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 2, 2, 20, 0, 23, 19, 20, 20, 21, 16, 82, 0, 18, 19, 20, 20, 66, 99, 25, 159, 11, 167, 9, 0, 0, 0, 0,
166, 38, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 10, 167, 0, 2, 2, 2, 2, 2, 2, 2, 65, 25, 20, 20, 0, 48, 48, 11,
25, 20, 22, 22, 165, 9, 0, 0, 0, 2, 2, 2, 2, 2, 9, 43, 168, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 20,
136, 23, 22, 20, 76, 21, 22, 0, 0, 2, 2, 2, 9, 0, 0, 0, 0, 23, 19, 20, 20, 21, 16, 82, 168, 38, 0, 0, 0, 0, 0, 0,
0, 2, 2, 2, 2, 2, 2, 18, 19, 20, 21, 22, 105, 166, 37, 0, 0, 2, 2, 2, 2, 2, 10, 169, 25, 20, 22, 22, 167, 9, 0, 0,
0, 2, 2, 2, 9, 30, 0, 2, 2, 2, 2, 30, 9, 2, 2, 2, 0, 2, 2, 2, 2, 2, 9, 43, 135, 23, 22, 20, 76, 21, 22, 0,
2, 23, 23, 18, 32, 33, 12, 168, 169, 170, 171, 0, 0, 0, 0, 0, 0, 2, 2, 2, 9, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 18,
0, 2, 2, 2, 2, 0, 2, 2, 2, 65, 25, 20, 20, 0, 22, 23, 19, 20, 21, 22, 105, 168, 37, 0, 0, 2, 2, 2, 9, 30, 0, 2,
29, 108, 0, 33, 0, 0, 0, 0, 0, 52, 20, 22, 22, 22, 140, 2, 2, 2, 2, 30, 9, 2, 2, 2, 2, 23, 23, 18, 32, 33, 12, 170,
2, 2, 172, 173, 11, 15, 174, 72, 175, 0, 0, 1, 147, 0, 0, 0, 164, 171, 172, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 0, 2, 2,
0, 52, 20, 22, 16, 19, 20, 2, 2, 2, 2, 158, 158, 158, 176, 176, 2, 65, 25, 20, 20, 0, 22, 23, 29, 108, 0, 33, 0, 0, 0, 0,
176, 176, 176, 176, 15, 177, 0, 30, 0, 22, 20, 20, 31, 22, 22, 11, 0, 52, 20, 22, 22, 22, 139, 2, 2, 2, 173, 174, 11, 15, 175, 61,
166, 0, 61, 61, 61, 61, 61, 61, 61, 66, 21, 82, 46, 0, 0, 0, 176, 0, 0, 1, 146, 0, 0, 0, 0, 52, 20, 22, 16, 19, 20, 2,
0, 2, 2, 2, 9, 2, 30, 2, 2, 52, 22, 22, 31, 0, 38, 22, 2, 2, 2, 157, 157, 157, 177, 177, 177, 177, 177, 177, 15, 178, 0, 30,
27, 11, 159, 178, 174, 0, 0, 0, 0, 2, 2, 2, 30, 9, 2, 2, 0, 22, 20, 20, 31, 22, 22, 11, 168, 0, 61, 61, 61, 61, 61, 61,
2, 2, 2, 2, 2, 2, 23, 23, 47, 22, 35, 82, 68, 0, 0, 0, 61, 66, 21, 82, 46, 0, 0, 0, 0, 2, 2, 2, 9, 2, 30, 2,
0, 2, 179, 66, 47, 0, 0, 0, 0, 11, 180, 2, 2, 2, 2, 2, 2, 52, 22, 22, 31, 0, 38, 22, 27, 11, 158, 179, 180, 0, 0, 0,
2, 2, 2, 23, 22, 20, 31, 0, 48, 16, 143, 0, 0, 0, 0, 0, 0, 2, 2, 2, 30, 9, 2, 2, 2, 2, 2, 2, 2, 2, 23, 23,
0, 181, 181, 181, 181, 181, 181, 181, 181, 182, 182, 182, 183, 184, 182, 181, 47, 22, 35, 82, 68, 0, 0, 0, 0, 2, 181, 66, 47, 0, 0, 0,
181, 185, 181, 181, 186, 187, 187, 187, 187, 187, 187, 187, 0, 0, 0, 0, 0, 11, 182, 2, 2, 2, 2, 2, 2, 2, 2, 23, 22, 20, 31, 0,
0, 11, 11, 11, 46, 0, 0, 0, 0, 2, 2, 2, 2, 2, 9, 0, 48, 16, 142, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 155, 0,
58, 188, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 0, 183, 183, 183, 183, 183, 183, 183, 183, 184, 184, 184, 185, 186, 184, 183,
20, 20, 20, 20, 20, 0, 0, 0, 40, 116, 26, 0, 0, 0, 0, 0, 183, 187, 183, 183, 188, 189, 189, 189, 189, 189, 189, 189, 0, 0, 0, 0,
0, 0, 0, 9, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 183, 183, 183, 183, 183, 190, 0, 0, 2, 2, 2, 2, 2, 2, 2,
0, 2, 2, 2, 2, 2, 0, 58, 37, 0, 6, 120, 120, 120, 121, 0, 22, 22, 22, 22, 22, 22, 191, 192, 193, 11, 11, 11, 46, 0, 0, 0,
0, 11, 11, 11, 49, 2, 2, 2, 0, 2, 2, 2, 2, 2, 0, 0, 0, 29, 74, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 65, 47,
2, 2, 2, 2, 2, 2, 2, 2, 46, 2, 2, 2, 2, 2, 2, 11, 0, 2, 2, 2, 2, 2, 9, 0, 58, 194, 20, 20, 20, 20, 20, 20,
11, 2, 2, 2, 2, 2, 2, 22, 22, 2, 2, 44, 44, 44, 92, 0, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 0, 0, 0,
40, 115, 26, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 30, 2, 2, 2, 2, 2, 0, 58,
37, 0, 6, 119, 119, 119, 120, 0, 0, 11, 11, 11, 49, 2, 2, 2,
0, 2, 2, 2, 2, 2, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2,
46, 2, 2, 2, 2, 2, 2, 11, 11, 2, 2, 2, 2, 2, 2, 22,
22, 2, 2, 2, 2, 2, 2, 2, 20, 2, 2, 44, 44, 44, 92, 0,
0, O, O, O, GB, B, B, O, SB, O, SE, GB, O, O, WJ,FMPst, 0, O, O, O, GB, B, B, O, SB, O, SE, GB, O, O, WJ,FMPst,
FMPst, O, CGJ, B, O, B,VMAbv,VMAbv,VMAbv, O,VMAbv, B,CMBlw,CMBlw,CMBlw,VMAbv, FMPst, O, CGJ, B, O, B,VMAbv,VMAbv,VMAbv, O,VMAbv, B,CMBlw,CMBlw,CMBlw,VMAbv,
VMPst, VAbv, VPst,CMBlw, B, VPst, VPre, VPst, VBlw, VBlw, VBlw, VBlw, VAbv, VAbv, VAbv, VPst, VMPst, VAbv, VPst,CMBlw, B, VPst, VPre, VPst, VBlw, VBlw, VBlw, VBlw, VAbv, VAbv, VAbv, VPst,
@ -582,20 +606,21 @@ hb_use_u8[3483] =
VMPst, VBlw, VPst, CGJ, CGJ, VPst,VMAbv,VMAbv,FMAbv, FAbv,CMAbv,FMAbv,VMAbv,FMAbv, VAbv, IS, VMPst, VBlw, VPst, CGJ, CGJ, VPst,VMAbv,VMAbv,FMAbv, FAbv,CMAbv,FMAbv,VMAbv,FMAbv, VAbv, IS,
FMAbv, B,FMAbv, B, CGJ, WJ, CGJ, GB,CMAbv,CMAbv, B, GB, B, VAbv, SUB, FPst, FMAbv, B,FMAbv, B, CGJ, WJ, CGJ, GB,CMAbv,CMAbv, B, GB, B, VAbv, SUB, FPst,
FPst,VMBlw, FPst, FPst, FBlw,VMAbv,FMBlw, VAbv, VPre, B, MPre, MBlw, SUB, FAbv, FAbv, MAbv, FPst,VMBlw, FPst, FPst, FBlw,VMAbv,FMBlw, VAbv, VPre, B, MPre, MBlw, SUB, FAbv, FAbv, MAbv,
SUB, Sk, VPst, VAbv,VMAbv,VMAbv, FAbv,CMAbv, VPst, H, B, O,SMAbv,SMBlw,SMAbv,SMAbv, SUB, Sk, VPst, VAbv,VMAbv,VMAbv, FAbv,CMAbv, VPst, H, B, O,SMAbv,SMAbv,SMAbv, VPst,
SMAbv, VPst, IS, VBlw, FAbv,VMPre,VMPre,FMAbv,CMBlw,VMBlw,VMBlw,VMAbv, CS, O,FMAbv, ZWNJ, IS, VBlw, FAbv,VMPre,VMPre,FMAbv,CMBlw,VMBlw,VMBlw,VMAbv, CS, O,FMAbv, ZWNJ, CGJ, WJ,
CGJ, WJ, WJ, WJ, O,FMPst, O, SB, SE, O, H, MPst, VPst, H,VMAbv, VAbv, WJ, WJ, O,FMPst, O, SB, SE, O, H, MPst, VPst, H,VMAbv, VAbv,VMBlw, B,
VMBlw, B, VBlw, FPst, VPst, FAbv,VMPst, B,CMAbv, VAbv, MBlw, MPst, MBlw, H, O, VBlw, VBlw, FPst, VPst, FAbv,VMPst, B,CMAbv, VAbv, MBlw, MPst, MBlw, H, O, VBlw, MPst, MPre,
MPst, MPre, MAbv, MBlw, O, B, FAbv, FAbv, FPst, VBlw, B, B, VPre, O,VMPst, IS, MAbv, MBlw, O, B, FAbv, FAbv, FPst, VBlw, B, B, VPre, O,VMPst, IS, O,VMPst,
O,VMPst, VBlw, VPst,VMBlw,VMBlw,VMAbv, O, IS,VMBlw, B,VMPst,VMAbv,VMPst, CS, CS, VBlw, VPst,VMBlw,VMBlw,VMAbv, O, IS,VMBlw, B,VMPst,VMAbv,VMPst, CS, CS, B, N,
B, N, N, O, HN, VPre, VBlw, VAbv, IS,CMAbv, O, VPst, B, R, R,CMBlw, N, O, HN, VPre, VBlw, VAbv, IS,CMAbv, O, VPst, B, R, R,CMBlw, VAbv, VPre,
VAbv, VPre,VMAbv,VMAbv, H, VAbv,CMBlw,FMAbv, B, CS, CS, H,CMBlw,VMPst, H,VMPst, VMAbv,VMAbv, H, VAbv,CMBlw,VMPst, O,VMAbv,CMBlw, IS, R,FMAbv, B, CS, CS, H,
VAbv,VMAbv, VPst, IS, R, MPst, R, MPst,CMBlw, B,FMBlw, VBlw,VMAbv, R, MBlw, MBlw, CMBlw,VMPst, H,VMPst, VAbv,VMAbv, VPst, MPst, R, MPst,CMBlw, B,FMBlw, VBlw,VMAbv, CS,
GB, FBlw, FBlw,CMAbv, IS, VBlw, IS, GB, VAbv, R,VMPst, G, G, J, J, J, SUB, SUB, GB, FBlw, FBlw,CMAbv, IS, VBlw, IS, R, MBlw, GB, VAbv, R,VMPst, G,
SB, SE, J, HR, G, G, HM, HM, HM, O, VBlw, G, J, J, J, SB, SE, J, HR, G, G, HM, HM, HM, G, O, MPre,
MPre, MPst,VMAbv, MBlw, VBlw, O, VBlw,
}; };
static const uint16_t static const uint16_t
hb_use_u16[456] = hb_use_u16[486] =
{ {
0, 0, 1, 2, 0, 3, 4, 5, 0, 6, 7, 0, 8, 0, 9, 10, 0, 0, 1, 2, 0, 3, 4, 5, 0, 6, 7, 0, 8, 0, 9, 10,
11, 12, 10, 13, 14, 10, 10, 15, 16, 17, 18, 19, 20, 21, 22, 23, 11, 12, 10, 13, 14, 10, 10, 15, 16, 17, 18, 19, 20, 21, 22, 23,
@ -614,18 +639,20 @@ hb_use_u16[456] =
148,149,150, 10, 10,151,152, 2,153, 99,154,155,156, 2, 10,157, 148,149,150, 10, 10,151,152, 2,153, 99,154,155,156, 2, 10,157,
10,158,159, 0,160,161,162, 2,163, 0, 0,164, 0,165, 0,166, 10,158,159, 0,160,161,162, 2,163, 0, 0,164, 0,165, 0,166,
166,167, 34,168,169,170, 10,171, 95, 0,172, 0, 10,173,174, 0, 166,167, 34,168,169,170, 10,171, 95, 0,172, 0, 10,173,174, 0,
175, 2,176,173,177,178,179, 0, 0,180,181, 0,182, 10, 10,183, 175, 2,176, 10,177, 0,178,173,179,180,181, 0, 0,182,183, 0,
184,185,186,187,188, 10, 10,189,190, 0,191, 10,192,193,194, 10, 184, 10, 10,185,186,187,188,189,190, 10, 10,191,192, 0,193, 10,
10,195, 10,196,197,106,198,103, 10, 34,199,200,201, 0,202,203, 194,195,196, 10, 10,197, 10,198,199,106,200,103, 10, 34,201,202,
95, 10, 10,204,205, 2,206, 21, 22,207,208,209,210,211, 10,212, 203, 0,204,205, 95, 10, 10,206,207, 2,208, 21, 22,209,210,211,
213,214,215, 0,198, 10, 10,216,217, 2,218,219,220,221, 10,222, 212,213,214, 10, 10,215,216,217,218, 0, 10,219,220,221,222, 0,
223, 2,224,225, 10,226,227,104,228, 0,229,230,231,232, 10,233, 200, 10, 10,223,224, 2,225,226,227,228, 10,229,230, 2,231,232,
234, 2,235, 10, 10,236,237, 0,238, 10, 10,239,240,241,242,243, 2, 10,141, 0, 10,233,234,104,235, 0,236,237,238,239, 10,240,
22, 10,218,244, 8, 10, 71, 19, 10,245, 74,246,247, 10, 10,248, 241, 2,242, 10, 10,243,244, 0,245, 10, 10,246,247,248,249,250,
249, 2,250, 10,251,252, 10,253,254, 49, 10,255,256, 2,257,257, 22, 10,225,251, 8, 10, 71, 19, 10,252, 74,253,254, 10, 10,255,
257,258,259,260, 10,261,262,263,264,264,265,266,267, 0, 10,268, 256, 2,257, 10,258,259, 10,260,261, 49, 10,262,263,264,265,265,
106, 71, 95,269, 0,270, 71,271,272, 0,273, 0,274, 2,275, 2, 265,266,267,268,265,269, 10,270,271, 2, 10,272,273, 10,274, 2,
276, 2,130,130,163,163,163,130, 275,276,277,277,278,279,280, 0, 10,177, 0,281,106, 71, 95,282,
0,283, 71,284,285, 0,286, 0,287, 2,288, 2,289,106,290, 2,
130,130,163,163,163,130,
}; };
static inline unsigned static inline unsigned
@ -636,7 +663,7 @@ hb_use_b4 (const uint8_t* a, unsigned i)
static inline uint_fast8_t static inline uint_fast8_t
hb_use_get_category (unsigned u) hb_use_get_category (unsigned u)
{ {
return u<921600u?hb_use_u8[3105+(((hb_use_u8[889+(((hb_use_u16[((hb_use_u8[353+(((hb_use_u8[113+(((hb_use_b4(hb_use_u8,u>>1>>3>>1>>3>>4))<<4)+((u>>1>>3>>1>>3)&15u))])<<3)+((u>>1>>3>>1)&7u))])<<1)+((u>>1>>3)&1u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:O; return u<921600u?hb_use_u8[3265+(((hb_use_u8[937+(((hb_use_u16[((hb_use_u8[369+(((hb_use_u8[113+(((hb_use_b4(hb_use_u8,u>>1>>3>>1>>3>>4))<<4)+((u>>1>>3>>1>>3)&15u))])<<3)+((u>>1>>3>>1)&7u))])<<1)+((u>>1>>3)&1u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:O;
} }
#endif #endif

View File

@ -10,8 +10,8 @@
* # Date: 2015-03-12, 21:17:00 GMT [AG] * # Date: 2015-03-12, 21:17:00 GMT [AG]
* # Date: 2019-11-08, 23:22:00 GMT [AG] * # Date: 2019-11-08, 23:22:00 GMT [AG]
* *
* # Scripts-15.1.0.txt * # Scripts-16.0.0.txt
* # Date: 2023-07-28, 16:01:07 GMT * # Date: 2024-04-30, 21:48:40 GMT
*/ */
#include "hb.hh" #include "hb.hh"

View File

@ -387,6 +387,15 @@ hb_ot_shaper_categorize (hb_script_t script,
case HB_SCRIPT_KAWI: case HB_SCRIPT_KAWI:
case HB_SCRIPT_NAG_MUNDARI: case HB_SCRIPT_NAG_MUNDARI:
/* Unicode-16.0 additions */
case HB_SCRIPT_GARAY:
case HB_SCRIPT_GURUNG_KHEMA:
case HB_SCRIPT_KIRAT_RAI:
case HB_SCRIPT_OL_ONAL:
case HB_SCRIPT_SUNUWAR:
case HB_SCRIPT_TODHRI:
case HB_SCRIPT_TULU_TIGALARI:
/* If the designer designed the font for the 'DFLT' script, /* If the designer designed the font for the 'DFLT' script,
* (or we ended up arbitrarily pick 'latn'), use the default shaper. * (or we ended up arbitrarily pick 'latn'), use the default shaper.
* Otherwise, use the specific shaper. * Otherwise, use the specific shaper.

View File

@ -354,10 +354,10 @@ struct AxisValue
{ {
switch (u.format) switch (u.format)
{ {
case 1: return u.format1.get_value (); case 1: hb_barrier (); return u.format1.get_value ();
case 2: return u.format2.get_value (); case 2: hb_barrier (); return u.format2.get_value ();
case 3: return u.format3.get_value (); case 3: hb_barrier (); return u.format3.get_value ();
case 4: return u.format4.get_axis_record (axis_index).get_value (); case 4: hb_barrier (); return u.format4.get_axis_record (axis_index).get_value ();
default:return 0.f; default:return 0.f;
} }
} }
@ -366,9 +366,9 @@ struct AxisValue
{ {
switch (u.format) switch (u.format)
{ {
case 1: return u.format1.get_axis_index (); case 1: hb_barrier (); return u.format1.get_axis_index ();
case 2: return u.format2.get_axis_index (); case 2: hb_barrier (); return u.format2.get_axis_index ();
case 3: return u.format3.get_axis_index (); case 3: hb_barrier (); return u.format3.get_axis_index ();
/* case 4: Makes more sense for variable fonts which are handled by fvar in hb-style */ /* case 4: Makes more sense for variable fonts which are handled by fvar in hb-style */
default:return -1; default:return -1;
} }
@ -378,10 +378,10 @@ struct AxisValue
{ {
switch (u.format) switch (u.format)
{ {
case 1: return u.format1.get_value_name_id (); case 1: hb_barrier (); return u.format1.get_value_name_id ();
case 2: return u.format2.get_value_name_id (); case 2: hb_barrier (); return u.format2.get_value_name_id ();
case 3: return u.format3.get_value_name_id (); case 3: hb_barrier (); return u.format3.get_value_name_id ();
case 4: return u.format4.get_value_name_id (); case 4: hb_barrier (); return u.format4.get_value_name_id ();
default:return HB_OT_NAME_ID_INVALID; default:return HB_OT_NAME_ID_INVALID;
} }
} }
@ -392,10 +392,10 @@ struct AxisValue
if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value (); if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
TRACE_DISPATCH (this, u.format); TRACE_DISPATCH (this, u.format);
switch (u.format) { switch (u.format) {
case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...)); case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...)); case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
case 3: return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...)); case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
case 4: return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...)); case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...));
default:return_trace (c->default_return_value ()); default:return_trace (c->default_return_value ());
} }
} }
@ -405,10 +405,10 @@ struct AxisValue
{ {
switch (u.format) switch (u.format)
{ {
case 1: return u.format1.keep_axis_value (axis_records, user_axes_location); case 1: hb_barrier (); return u.format1.keep_axis_value (axis_records, user_axes_location);
case 2: return u.format2.keep_axis_value (axis_records, user_axes_location); case 2: hb_barrier (); return u.format2.keep_axis_value (axis_records, user_axes_location);
case 3: return u.format3.keep_axis_value (axis_records, user_axes_location); case 3: hb_barrier (); return u.format3.keep_axis_value (axis_records, user_axes_location);
case 4: return u.format4.keep_axis_value (axis_records, user_axes_location); case 4: hb_barrier (); return u.format4.keep_axis_value (axis_records, user_axes_location);
default:return false; default:return false;
} }
} }
@ -422,10 +422,10 @@ struct AxisValue
switch (u.format) switch (u.format)
{ {
case 1: return_trace (u.format1.sanitize (c)); case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
case 2: return_trace (u.format2.sanitize (c)); case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
case 3: return_trace (u.format3.sanitize (c)); case 3: hb_barrier (); return_trace (u.format3.sanitize (c));
case 4: return_trace (u.format4.sanitize (c)); case 4: hb_barrier (); return_trace (u.format4.sanitize (c));
default:return_trace (true); default:return_trace (true);
} }
} }

View File

@ -238,8 +238,8 @@ struct tuple_delta_t
/* compiled data: header and deltas /* compiled data: header and deltas
* compiled point data is saved in a hashmap within tuple_variations_t cause * compiled point data is saved in a hashmap within tuple_variations_t cause
* some point sets might be reused by different tuple variations */ * some point sets might be reused by different tuple variations */
hb_vector_t<char> compiled_tuple_header; hb_vector_t<unsigned char> compiled_tuple_header;
hb_vector_t<char> compiled_deltas; hb_vector_t<unsigned char> compiled_deltas;
/* compiled peak coords, empty for non-gvar tuples */ /* compiled peak coords, empty for non-gvar tuples */
hb_vector_t<char> compiled_peak_coords; hb_vector_t<char> compiled_peak_coords;
@ -517,7 +517,7 @@ struct tuple_delta_t
static bool compile_deltas (const hb_vector_t<bool> &point_indices, static bool compile_deltas (const hb_vector_t<bool> &point_indices,
const hb_vector_t<double> &x_deltas, const hb_vector_t<double> &x_deltas,
const hb_vector_t<double> &y_deltas, const hb_vector_t<double> &y_deltas,
hb_vector_t<char> &compiled_deltas /* OUT */) hb_vector_t<unsigned char> &compiled_deltas /* OUT */)
{ {
hb_vector_t<int> rounded_deltas; hb_vector_t<int> rounded_deltas;
if (unlikely (!rounded_deltas.alloc (point_indices.length))) if (unlikely (!rounded_deltas.alloc (point_indices.length)))
@ -560,7 +560,7 @@ struct tuple_delta_t
return compiled_deltas.resize (encoded_len); return compiled_deltas.resize (encoded_len);
} }
static unsigned compile_deltas (hb_array_t<char> encoded_bytes, static unsigned compile_deltas (hb_array_t<unsigned char> encoded_bytes,
hb_array_t<const int> deltas) hb_array_t<const int> deltas)
{ {
return TupleValues::compile (deltas, encoded_bytes); return TupleValues::compile (deltas, encoded_bytes);
@ -705,20 +705,20 @@ struct tuple_delta_t
opt_indices.arrayZ[i] = false; opt_indices.arrayZ[i] = false;
} }
hb_vector_t<char> opt_point_data; hb_vector_t<unsigned char> opt_point_data;
if (!compile_point_set (opt_indices, opt_point_data)) if (!compile_point_set (opt_indices, opt_point_data))
return false; return false;
hb_vector_t<char> opt_deltas_data; hb_vector_t<unsigned char> opt_deltas_data;
if (!compile_deltas (opt_indices, if (!compile_deltas (opt_indices,
is_comp_glyph_wo_deltas ? opt_deltas_x : deltas_x, is_comp_glyph_wo_deltas ? opt_deltas_x : deltas_x,
is_comp_glyph_wo_deltas ? opt_deltas_y : deltas_y, is_comp_glyph_wo_deltas ? opt_deltas_y : deltas_y,
opt_deltas_data)) opt_deltas_data))
return false; return false;
hb_vector_t<char> point_data; hb_vector_t<unsigned char> point_data;
if (!compile_point_set (indices, point_data)) if (!compile_point_set (indices, point_data))
return false; return false;
hb_vector_t<char> deltas_data; hb_vector_t<unsigned char> deltas_data;
if (!compile_deltas (indices, deltas_x, deltas_y, deltas_data)) if (!compile_deltas (indices, deltas_x, deltas_y, deltas_data))
return false; return false;
@ -740,7 +740,7 @@ struct tuple_delta_t
} }
static bool compile_point_set (const hb_vector_t<bool> &point_indices, static bool compile_point_set (const hb_vector_t<bool> &point_indices,
hb_vector_t<char>& compiled_points /* OUT */) hb_vector_t<unsigned char>& compiled_points /* OUT */)
{ {
unsigned num_points = 0; unsigned num_points = 0;
for (bool i : point_indices) for (bool i : point_indices)
@ -1134,7 +1134,7 @@ struct TupleVariationData
continue; continue;
} }
hb_vector_t<char> compiled_point_data; hb_vector_t<unsigned char> compiled_point_data;
if (!tuple_delta_t::compile_point_set (*points_set, compiled_point_data)) if (!tuple_delta_t::compile_point_set (*points_set, compiled_point_data))
return false; return false;
@ -1663,7 +1663,9 @@ struct item_variations_t
} }
} }
if (!all_regions || !all_unique_regions) return false; /* regions are empty means no variation data, return true */
if (!all_regions || !all_unique_regions) return true;
if (!region_list.alloc (all_regions.get_population ())) if (!region_list.alloc (all_regions.get_population ()))
return false; return false;
@ -1728,7 +1730,8 @@ struct item_variations_t
bool as_item_varstore (bool optimize=true, bool use_no_variation_idx=true) bool as_item_varstore (bool optimize=true, bool use_no_variation_idx=true)
{ {
if (!region_list) return false; /* return true if no variation data */
if (!region_list) return true;
unsigned num_cols = region_list.length; unsigned num_cols = region_list.length;
/* pre-alloc a 2D vector for all sub_table's VarData rows */ /* pre-alloc a 2D vector for all sub_table's VarData rows */
unsigned total_rows = 0; unsigned total_rows = 0;

View File

@ -359,7 +359,10 @@ struct gvar
out->glyphCountX = hb_min (0xFFFFu, num_glyphs); out->glyphCountX = hb_min (0xFFFFu, num_glyphs);
unsigned glyph_var_data_size = glyph_vars.compiled_byte_size (); unsigned glyph_var_data_size = glyph_vars.compiled_byte_size ();
bool long_offset = glyph_var_data_size & ~0xFFFFu || force_long_offsets; /* According to the spec: If the short format (Offset16) is used for offsets,
* the value stored is the offset divided by 2, so the maximum data size should
* be 2 * 0xFFFFu, which is 0x1FFFEu */
bool long_offset = glyph_var_data_size > 0x1FFFEu || force_long_offsets;
out->flags = long_offset ? 1 : 0; out->flags = long_offset ? 1 : 0;
HBUINT8 *glyph_var_data_offsets = c->allocate_size<HBUINT8> ((long_offset ? 4 : 2) * (num_glyphs + 1), false); HBUINT8 *glyph_var_data_offsets = c->allocate_size<HBUINT8> ((long_offset ? 4 : 2) * (num_glyphs + 1), false);
@ -440,7 +443,10 @@ struct gvar
subset_data_size += get_glyph_var_data_bytes (c->source_blob, glyph_count, old_gid).length; subset_data_size += get_glyph_var_data_bytes (c->source_blob, glyph_count, old_gid).length;
} }
bool long_offset = (subset_data_size & ~0xFFFFu); /* According to the spec: If the short format (Offset16) is used for offsets,
* the value stored is the offset divided by 2, so the maximum data size should
* be 2 * 0xFFFFu, which is 0x1FFFEu */
bool long_offset = subset_data_size > 0x1FFFEu;
#ifdef HB_EXPERIMENTAL_API #ifdef HB_EXPERIMENTAL_API
long_offset = long_offset || (c->plan->flags & HB_SUBSET_FLAGS_IFTB_REQUIREMENTS); long_offset = long_offset || (c->plan->flags & HB_SUBSET_FLAGS_IFTB_REQUIREMENTS);
#endif #endif
@ -540,7 +546,7 @@ struct gvar
unsigned get_offset (unsigned glyph_count, unsigned i) const unsigned get_offset (unsigned glyph_count, unsigned i) const
{ {
if (unlikely (i > glyph_count)) return 0; if (unlikely (i > glyph_count)) return 0;
_hb_compiler_memory_r_barrier (); hb_barrier ();
return is_long_offset () ? get_long_offset_array ()[i] : get_short_offset_array ()[i] * 2; return is_long_offset () ? get_long_offset_array ()[i] : get_short_offset_array ()[i] * 2;
} }

View File

@ -70,7 +70,10 @@ struct hb_paint_extents_context_t
const hb_transform_t &t = transforms.tail (); const hb_transform_t &t = transforms.tail ();
t.transform_extents (extents); t.transform_extents (extents);
clips.push (hb_bounds_t {extents}); auto bounds = hb_bounds_t {extents};
bounds.intersect (clips.tail ());
clips.push (bounds);
} }
void pop_clip () void pop_clip ()

View File

@ -61,8 +61,8 @@ _hb_ratio_to_angle (float r)
* @style_tag: a style tag. * @style_tag: a style tag.
* *
* Searches variation axes of a #hb_font_t object for a specific axis first, * Searches variation axes of a #hb_font_t object for a specific axis first,
* if not set, then tries to get default style values from different * if not set, first tries to get default style values in `STAT` table
* tables of the font. * then tries to polyfill from different tables of the font.
* *
* Returns: Corresponding axis or default value to a style tag. * Returns: Corresponding axis or default value to a style tag.
* *

View File

@ -666,9 +666,6 @@ OT::cff2::accelerator_subset_t::serialize (hb_serialize_context_t *c,
bool bool
OT::cff2::accelerator_subset_t::subset (hb_subset_context_t *c) const OT::cff2::accelerator_subset_t::subset (hb_subset_context_t *c) const
{ {
if (c->plan->normalized_coords && !c->plan->all_axes_pinned)
fprintf (stdout, "warning: CFF partial instancing is not supported.\n");
cff2_subset_plan cff2_plan; cff2_subset_plan cff2_plan;
if (unlikely (!cff2_plan.create (*this, c->plan))) return false; if (unlikely (!cff2_plan.create (*this, c->plan))) return false;

View File

@ -376,7 +376,7 @@ double renormalizeValue (double v, const Triple &triple,
assert (lower <= def && def <= upper); assert (lower <= def && def <= upper);
if (!extrapolate) if (!extrapolate)
v = hb_max (hb_min (v, upper), lower); v = hb_clamp (v, lower, upper);
if (v == def) if (v == def)
return 0.0; return 0.0;

View File

@ -594,14 +594,20 @@ static void _attach_accelerator_data (hb_subset_plan_t* plan,
* @input: input to use for the subsetting. * @input: input to use for the subsetting.
* *
* Subsets a font according to provided input. Returns nullptr * Subsets a font according to provided input. Returns nullptr
* if the subset operation fails. * if the subset operation fails or the face has no glyphs.
* *
* Since: 2.9.0 * Since: 2.9.0
**/ **/
hb_face_t * hb_face_t *
hb_subset_or_fail (hb_face_t *source, const hb_subset_input_t *input) hb_subset_or_fail (hb_face_t *source, const hb_subset_input_t *input)
{ {
if (unlikely (!input || !source)) return hb_face_get_empty (); if (unlikely (!input || !source)) return nullptr;
if (unlikely (!source->get_num_glyphs ()))
{
DEBUG_MSG (SUBSET, nullptr, "No glyphs in source font.");
return nullptr;
}
hb_subset_plan_t *plan = hb_subset_plan_create_or_fail (source, input); hb_subset_plan_t *plan = hb_subset_plan_create_or_fail (source, input);
if (unlikely (!plan)) { if (unlikely (!plan)) {

File diff suppressed because it is too large Load Diff

View File

@ -7,13 +7,13 @@
* on file with this header: * on file with this header:
* *
* # emoji-data.txt * # emoji-data.txt
* # Date: 2023-02-01, 02:22:54 GMT * # Date: 2024-05-01, 21:25:24 GMT
* # © 2023 Unicode®, Inc. * # © 2024 Unicode®, Inc.
* # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. * # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
* # For terms of use, see https://www.unicode.org/terms_of_use.html * # For terms of use and license, see https://www.unicode.org/terms_of_use.html
* # * #
* # Emoji Data for UTS #51 * # Emoji Data for UTS #51
* # Used with Emoji Version 15.1 and subsequent minor revisions (if any) * # Used with Emoji Version 16.0 and subsequent minor revisions (if any)
* # * #
* # For documentation and usage, see https://www.unicode.org/reports/tr51 * # For documentation and usage, see https://www.unicode.org/reports/tr51
*/ */

View File

@ -34,6 +34,9 @@
#include "hb.hh" #include "hb.hh"
// Hack. See: https://github.com/harfbuzz/harfbuzz/pull/4529#discussion_r1769638033
#define _HB_UNICODE_GENERAL_CATEGORY_VARIATION_SELECTOR ((hb_unicode_general_category_t) 30)
extern HB_INTERNAL const uint8_t _hb_modified_combining_class[256]; extern HB_INTERNAL const uint8_t _hb_modified_combining_class[256];
/* /*

View File

@ -41,7 +41,7 @@ HB_BEGIN_DECLS
* *
* The major component of the library version available at compile-time. * The major component of the library version available at compile-time.
*/ */
#define HB_VERSION_MAJOR 9 #define HB_VERSION_MAJOR 10
/** /**
* HB_VERSION_MINOR: * HB_VERSION_MINOR:
* *
@ -53,14 +53,14 @@ HB_BEGIN_DECLS
* *
* The micro component of the library version available at compile-time. * The micro component of the library version available at compile-time.
*/ */
#define HB_VERSION_MICRO 0 #define HB_VERSION_MICRO 1
/** /**
* HB_VERSION_STRING: * HB_VERSION_STRING:
* *
* A string literal containing the library version available at compile-time. * A string literal containing the library version available at compile-time.
*/ */
#define HB_VERSION_STRING "9.0.0" #define HB_VERSION_STRING "10.0.1"
/** /**
* HB_VERSION_ATLEAST: * HB_VERSION_ATLEAST:

View File

@ -84,6 +84,7 @@
#pragma GCC diagnostic error "-Wredundant-decls" #pragma GCC diagnostic error "-Wredundant-decls"
#pragma GCC diagnostic error "-Wreorder" #pragma GCC diagnostic error "-Wreorder"
#pragma GCC diagnostic error "-Wsign-compare" #pragma GCC diagnostic error "-Wsign-compare"
#pragma GCC diagnostic error "-Wstrict-flex-arrays"
#pragma GCC diagnostic error "-Wstrict-prototypes" #pragma GCC diagnostic error "-Wstrict-prototypes"
#pragma GCC diagnostic error "-Wstring-conversion" #pragma GCC diagnostic error "-Wstring-conversion"
#pragma GCC diagnostic error "-Wswitch-enum" #pragma GCC diagnostic error "-Wswitch-enum"