summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-src/src
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src')
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-src/src/check-symbols.sh2
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-src/src/gen-indic-table.py4
-rwxr-xr-xBuild/source/libs/harfbuzz/harfbuzz-src/src/gen-use-table.py34
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/gen-vowel-constraints.py4
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-ankr-table.hh1
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-common.hh14
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-atomic.hh8
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.h7
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-common.cc49
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-common.h8
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc10
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.cc70
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.h5
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-dsalgs.hh5
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-graphite2.cc35
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-machinery.hh30
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-map.hh2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-null.hh31
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff-common.hh1
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff1-table.hh51
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-font.cc2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hdmx-table.hh19
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hmtx-table.hh102
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-common.hh4
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh4
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc13
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.hh13
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-maxp-table.hh2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-table.hh14
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic.cc6
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-hangul.cc3
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-machine.hh1244
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-machine.rl5
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-table.cc56
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic.cc18
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic.hh7
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer-machine.hh248
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer-machine.rl2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer.cc5
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-myanmar.cc3
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use-table.cc55
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use.cc3
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-vowel-constraints.cc7
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex.hh3
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape.cc3
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-tag-table.hh12
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-tag.cc46
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-vorg-table.hh30
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff-common.cc13
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff-common.hh117
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff1.cc77
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff2.cc30
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-glyf.cc252
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-input.cc27
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-input.hh1
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-plan.cc68
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-plan.hh61
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset.cc2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset.h6
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ucdn.cc4
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode-emoji-table.hh6
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb.hh3
62 files changed, 1694 insertions, 1273 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/check-symbols.sh b/Build/source/libs/harfbuzz/harfbuzz-src/src/check-symbols.sh
index cea8684889a..423d1861393 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/check-symbols.sh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/check-symbols.sh
@@ -26,7 +26,7 @@ for soname in harfbuzz harfbuzz-subset harfbuzz-icu harfbuzz-gobject; do
symprefix=
if test $suffix = dylib; then symprefix=_; fi
- EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRST] .' | grep -v " $symprefix\\($IGNORED_SYMBOLS\\>\\)" | cut -d' ' -f3 | c++filt`"
+ EXPORTED_SYMBOLS=`nm "$so" | grep ' [BCDGINRST] .' | grep -v " $symprefix\\($IGNORED_SYMBOLS\\>\\)" | cut -d' ' -f3 | c++filt`
prefix=$symprefix`basename "$so" | sed 's/libharfbuzz/hb/; s/-/_/g; s/[.].*//'`
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-indic-table.py b/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-indic-table.py
index 6532ee7e0f7..eedf420b733 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-indic-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-indic-table.py
@@ -79,10 +79,6 @@ data = combined
del combined
num = len (data)
-for u in [0x17CD, 0x17CE, 0x17CF, 0x17D0, 0x17D3]:
- if data[u][0] == 'Other':
- data[u][0] = "Vowel_Dependent"
-
# Move the outliers NO-BREAK SPACE and DOTTED CIRCLE out
singles = {}
for u in ALLOWED_SINGLES:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-use-table.py b/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-use-table.py
index be204b60bce..029e66e53a4 100755
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-use-table.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-use-table.py
@@ -48,7 +48,6 @@ defaults = ('Other', 'Not_Applicable', 'Cn', 'No_Block')
# TODO Characters that are not in Unicode Indic files, but used in USE
data[0][0x034F] = defaults[0]
data[0][0x2060] = defaults[0]
-data[0][0x20F0] = defaults[0]
# TODO https://github.com/roozbehp/unicode-data/issues/9
data[0][0x11C44] = 'Consonant_Placeholder'
data[0][0x11C45] = 'Consonant_Placeholder'
@@ -317,12 +316,11 @@ def map_to_use(data):
# Resolve Indic_Syllabic_Category
- # TODO: These don't have UISC assigned in Unicode 8.0, but have UIPC
- if U == 0x17DD: UISC = Vowel_Dependent
+ # TODO: These don't have UISC assigned in Unicode 12.0, but have UIPC
if 0x1CE2 <= U <= 0x1CE8: UISC = Cantillation_Mark
# Tibetan:
- # TODO: These don't have UISC assigned in Unicode 11.0, but have UIPC
+ # TODO: These don't have UISC assigned in Unicode 12.0, but have UIPC
if 0x0F18 <= U <= 0x0F19 or 0x0F3E <= U <= 0x0F3F: UISC = Vowel_Dependent
if 0x0F86 <= U <= 0x0F87: UISC = Tone_Mark
# Overrides to allow NFC order matching syllable
@@ -347,13 +345,7 @@ def map_to_use(data):
if U == 0x1CED: UISC = Tone_Mark
# TODO: https://github.com/harfbuzz/harfbuzz/issues/525
- if U == 0x1A7F: UISC = Consonant_Final; UIPC = Bottom
-
- # TODO: https://github.com/harfbuzz/harfbuzz/pull/609
- if U == 0x20F0: UISC = Cantillation_Mark; UIPC = Top
-
- # TODO: https://github.com/harfbuzz/harfbuzz/pull/626
- if U == 0xA8B4: UISC = Consonant_Medial
+ if U == 0x1A7F: UISC = Consonant_Final
# TODO: https://github.com/harfbuzz/harfbuzz/issues/1105
if U == 0x11134: UISC = Gemination_Mark
@@ -367,27 +359,19 @@ def map_to_use(data):
# Resolve Indic_Positional_Category
- # TODO: Not in Unicode 8.0 yet, but in spec.
- if U == 0x1B6C: UIPC = Bottom
-
- # TODO: These should die, but have UIPC in Unicode 8.0
+ # TODO: These should die, but have UIPC in Unicode 12.0
if U in [0x953, 0x954]: UIPC = Not_Applicable
- # TODO: In USE's override list but not in Unicode 11.0
+ # TODO: In USE's override list but not in Unicode 12.0
if U == 0x103C: UIPC = Left
- # TODO: These are not in USE's override list that we have, nor are they in Unicode 11.0
+ # TODO: These are not in USE's override list that we have, nor are they in Unicode 12.0
if 0xA926 <= U <= 0xA92A: UIPC = Top
- if U == 0x111CA: UIPC = Bottom
- if U == 0x11300: UIPC = Top
# TODO: https://github.com/harfbuzz/harfbuzz/pull/1037
- if U == 0x11302: UIPC = Top
- if U == 0x1133C: UIPC = Bottom
- if U == 0x1171E: UIPC = Left # Correct?!
- if 0x1CF2 <= U <= 0x1CF3: UIPC = Right
+ # and https://github.com/harfbuzz/harfbuzz/issues/1631
+ if U in [0x11302, 0x11303, 0x114C1]: UIPC = Top
+ if U == 0x1171E: UIPC = Left
if 0x1CF8 <= U <= 0x1CF9: UIPC = Top
- # https://github.com/roozbehp/unicode-data/issues/8
- if U == 0x0A51: UIPC = Bottom
assert (UIPC in [Not_Applicable, Visual_Order_Left] or
USE in use_positions), "%s %s %s %s %s" % (hex(U), UIPC, USE, UISC, UGC)
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-vowel-constraints.py b/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-vowel-constraints.py
index b7f6be2236f..afb21d92834 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-vowel-constraints.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-vowel-constraints.py
@@ -180,6 +180,9 @@ print ('_hb_preprocess_text_vowel_constraints (const hb_ot_shape_plan_t *plan HB
print ('\t\t\t\t hb_buffer_t *buffer,')
print ('\t\t\t\t hb_font_t *font HB_UNUSED)')
print ('{')
+print (' if (buffer->flags & HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE)')
+print (' return;')
+print ()
print (' /* UGLY UGLY UGLY business of adding dotted-circle in the middle of')
print (' * vowel-sequences that look like another vowel. Data for each script')
print (' * collected from the USE script development spec.')
@@ -212,6 +215,7 @@ print (' if (processed)')
print (' {')
print (' if (buffer->idx < count)')
print (' buffer->next_glyph ();')
+print (' buffer->swap_buffers ();')
print (' }')
print ('}')
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-ankr-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-ankr-table.hh
index 236e4aaf1e3..4087b8c1f02 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-ankr-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-ankr-table.hh
@@ -76,6 +76,7 @@ struct ankr
TRACE_SANITIZE (this);
return_trace (likely (c->check_struct (this) &&
version == 0 &&
+ c->check_range (this, anchorData) &&
lookupTable.sanitize (c, this, &(this+anchorData))));
}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-common.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-common.hh
index 27ade28fe19..2508276c2d0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-common.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-common.hh
@@ -418,15 +418,11 @@ struct Lookup
} /* Close namespace. */
/* Ugly hand-coded null objects for template Lookup<> :(. */
extern HB_INTERNAL const unsigned char _hb_Null_AAT_Lookup[2];
-template <>
-/*static*/ inline const AAT::Lookup<OT::HBUINT16>& Null<AAT::Lookup<OT::HBUINT16> > ()
-{ return *reinterpret_cast<const AAT::Lookup<OT::HBUINT16> *> (_hb_Null_AAT_Lookup); }
-template <>
-/*static*/ inline const AAT::Lookup<OT::HBUINT32>& Null<AAT::Lookup<OT::HBUINT32> > ()
-{ return *reinterpret_cast<const AAT::Lookup<OT::HBUINT32> *> (_hb_Null_AAT_Lookup); }
-template <>
-/*static*/ inline const AAT::Lookup<OT::Offset<OT::HBUINT16, false> >& Null<AAT::Lookup<OT::Offset<OT::HBUINT16, false> > > ()
-{ return *reinterpret_cast<const AAT::Lookup<OT::Offset<OT::HBUINT16, false> > *> (_hb_Null_AAT_Lookup); }
+template <typename T>
+struct Null<AAT::Lookup<T> > {
+ static AAT::Lookup<T> const & get_null ()
+ { return *reinterpret_cast<const AAT::Lookup<T> *> (_hb_Null_AAT_Lookup); }
+};
namespace AAT {
enum { DELETED_GLYPH = 0xFFFF };
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-atomic.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-atomic.hh
index 9321932e06f..f9afd4fff0e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-atomic.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-atomic.hh
@@ -85,11 +85,11 @@ _hb_atomic_ptr_impl_cmplexch (const void **P, const void *O_, const void *N)
#define hb_atomic_int_impl_add(AI, V) (reinterpret_cast<std::atomic<int> *> (AI)->fetch_add ((V), std::memory_order_acq_rel))
#define hb_atomic_int_impl_set_relaxed(AI, V) (reinterpret_cast<std::atomic<int> *> (AI)->store ((V), std::memory_order_relaxed))
#define hb_atomic_int_impl_set(AI, V) (reinterpret_cast<std::atomic<int> *> (AI)->store ((V), std::memory_order_release))
-#define hb_atomic_int_impl_get_relaxed(AI) (reinterpret_cast<std::atomic<int> *> (AI)->load (std::memory_order_relaxed))
-#define hb_atomic_int_impl_get(AI) (reinterpret_cast<std::atomic<int> *> (AI)->load (std::memory_order_acquire))
+#define hb_atomic_int_impl_get_relaxed(AI) (reinterpret_cast<std::atomic<int> const *> (AI)->load (std::memory_order_relaxed))
+#define hb_atomic_int_impl_get(AI) (reinterpret_cast<std::atomic<int> const *> (AI)->load (std::memory_order_acquire))
#define hb_atomic_ptr_impl_set_relaxed(P, V) (reinterpret_cast<std::atomic<void*> *> (P)->store ((V), std::memory_order_relaxed))
-#define hb_atomic_ptr_impl_get_relaxed(P) (reinterpret_cast<std::atomic<void*> *> (P)->load (std::memory_order_relaxed))
+#define hb_atomic_ptr_impl_get_relaxed(P) (reinterpret_cast<std::atomic<void*> const *> (P)->load (std::memory_order_relaxed))
#define hb_atomic_ptr_impl_get(P) (reinterpret_cast<std::atomic<void*> *> (P)->load (std::memory_order_acquire))
static inline bool
_hb_atomic_ptr_impl_cmplexch (const void **P, const void *O_, const void *N)
@@ -184,7 +184,7 @@ static inline bool _hb_compare_and_swap_ptr (void **P, void *O, void *N)
#endif
-#elif !defined(HB_NO_MT) && defined(_AIX) && defined(__IBMCPP__)
+#elif !defined(HB_NO_MT) && defined(_AIX) && (defined(__IBMCPP__) || defined(__ibmxl__))
#include <builtins.h>
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.h b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.h
index f989d25d6b4..ac1d4525a83 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-buffer.h
@@ -284,6 +284,10 @@ hb_buffer_guess_segment_properties (hb_buffer_t *buffer);
* space glyph and zeroing the advance width.)
* @HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES takes
* precedence over this flag. Since: 1.8.0
+ * @HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE:
+ * flag indicating that a dotted circle should
+ * not be inserted in the rendering of incorrect
+ * character sequences (such at <0905 093E>). Since: 2.4
*
* Since: 0.9.20
*/
@@ -292,7 +296,8 @@ typedef enum { /*< flags >*/
HB_BUFFER_FLAG_BOT = 0x00000001u, /* Beginning-of-text */
HB_BUFFER_FLAG_EOT = 0x00000002u, /* End-of-text */
HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES = 0x00000004u,
- HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES = 0x00000008u
+ HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES = 0x00000008u,
+ HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE = 0x00000010u
} hb_buffer_flags_t;
HB_EXTERN void
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-common.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-common.cc
index 93f5b7939ca..ab93bf42772 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-common.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-common.cc
@@ -731,7 +731,7 @@ parse_uint (const char **pp, const char *end, unsigned int *pv)
/* Intentionally use strtol instead of strtoul, such that
* -1 turns into "big number"... */
errno = 0;
- v = strtol (p, &pend, 0);
+ v = strtol (p, &pend, 10);
if (errno || p == pend)
return false;
@@ -755,7 +755,7 @@ parse_uint32 (const char **pp, const char *end, uint32_t *pv)
/* Intentionally use strtol instead of strtoul, such that
* -1 turns into "big number"... */
errno = 0;
- v = strtol (p, &pend, 0);
+ v = strtol (p, &pend, 10);
if (errno || p == pend)
return false;
@@ -857,9 +857,14 @@ parse_bool (const char **pp, const char *end, uint32_t *pv)
(*pp)++;
/* CSS allows on/off as aliases 1/0. */
- if (*pp - p == 2 && 0 == strncmp (p, "on", 2))
+ if (*pp - p == 2
+ && TOLOWER (p[0]) == 'o'
+ && TOLOWER (p[1]) == 'n')
*pv = 1;
- else if (*pp - p == 3 && 0 == strncmp (p, "off", 3))
+ else if (*pp - p == 3
+ && TOLOWER (p[0]) == 'o'
+ && TOLOWER (p[1]) == 'f'
+ && TOLOWER (p[2]) == 'f')
*pv = 0;
else
return false;
@@ -974,7 +979,41 @@ parse_one_feature (const char **pp, const char *end, hb_feature_t *feature)
*
* Parses a string into a #hb_feature_t.
*
- * TODO: document the syntax here.
+ * The format for specifying feature strings follows. All valid CSS
+ * font-feature-settings values other than 'normal' and the global values are
+ * also accepted, though not documented below. CSS string escapes are not
+ * supported.
+ *
+ * The range indices refer to the positions between Unicode characters. The
+ * position before the first character is always 0.
+ *
+ * The format is Python-esque. Here is how it all works:
+ *
+ * <informaltable pgwide='1' align='left' frame='none'>
+ * <tgroup cols='5'>
+ * <thead>
+ * <row><entry>Syntax</entry> <entry>Value</entry> <entry>Start</entry> <entry>End</entry></row>
+ * </thead>
+ * <tbody>
+ * <row><entry>Setting value:</entry></row>
+ * <row><entry>kern</entry> <entry>1</entry> <entry>0</entry> <entry>∞</entry> <entry>Turn feature on</entry></row>
+ * <row><entry>+kern</entry> <entry>1</entry> <entry>0</entry> <entry>∞</entry> <entry>Turn feature on</entry></row>
+ * <row><entry>-kern</entry> <entry>0</entry> <entry>0</entry> <entry>∞</entry> <entry>Turn feature off</entry></row>
+ * <row><entry>kern=0</entry> <entry>0</entry> <entry>0</entry> <entry>∞</entry> <entry>Turn feature off</entry></row>
+ * <row><entry>kern=1</entry> <entry>1</entry> <entry>0</entry> <entry>∞</entry> <entry>Turn feature on</entry></row>
+ * <row><entry>aalt=2</entry> <entry>2</entry> <entry>0</entry> <entry>∞</entry> <entry>Choose 2nd alternate</entry></row>
+ * <row><entry>Setting index:</entry></row>
+ * <row><entry>kern[]</entry> <entry>1</entry> <entry>0</entry> <entry>∞</entry> <entry>Turn feature on</entry></row>
+ * <row><entry>kern[:]</entry> <entry>1</entry> <entry>0</entry> <entry>∞</entry> <entry>Turn feature on</entry></row>
+ * <row><entry>kern[5:]</entry> <entry>1</entry> <entry>5</entry> <entry>∞</entry> <entry>Turn feature on, partial</entry></row>
+ * <row><entry>kern[:5]</entry> <entry>1</entry> <entry>0</entry> <entry>5</entry> <entry>Turn feature on, partial</entry></row>
+ * <row><entry>kern[3:5]</entry> <entry>1</entry> <entry>3</entry> <entry>5</entry> <entry>Turn feature on, range</entry></row>
+ * <row><entry>kern[3]</entry> <entry>1</entry> <entry>3</entry> <entry>3+1</entry> <entry>Turn feature on, single char</entry></row>
+ * <row><entry>Mixing it all:</entry></row>
+ * <row><entry>aalt[3:5]=2</entry> <entry>2</entry> <entry>3</entry> <entry>5</entry> <entry>Turn 2nd alternate on for range</entry></row>
+ * </tbody>
+ * </tgroup>
+ * </informaltable>
*
* Return value:
* %true if @str is successfully parsed, %false otherwise.
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-common.h b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-common.h
index 2b29e4441d4..fbabd71c8c7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-common.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-common.h
@@ -357,6 +357,14 @@ typedef enum
/*11.0*/HB_SCRIPT_OLD_SOGDIAN = HB_TAG ('S','o','g','o'),
/*11.0*/HB_SCRIPT_SOGDIAN = HB_TAG ('S','o','g','d'),
+ /*
+ * Since REPLACEME
+ */
+ /*12.0*/HB_SCRIPT_ELYMAIC = HB_TAG ('E','l','y','m'),
+ /*12.0*/HB_SCRIPT_NANDINAGARI = HB_TAG ('N','a','n','d'),
+ /*12.0*/HB_SCRIPT_NYIAKENG_PUACHUE_HMONG = HB_TAG ('H','m','n','p'),
+ /*12.0*/HB_SCRIPT_WANCHO = HB_TAG ('W','c','h','o'),
+
/* No script set. */
HB_SCRIPT_INVALID = HB_TAG_NONE,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc
index 42ea3ea2b3f..5989306784c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-coretext.cc
@@ -171,7 +171,7 @@ create_ct_font (CGFontRef cg_font, CGFloat font_size)
if (CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSText")) ||
CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSDisplay")))
{
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080
+#if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1080
# define kCTFontUIFontSystem kCTFontSystemFontType
# define kCTFontUIFontEmphasizedSystem kCTFontEmphasizedSystemFontType
#endif
@@ -214,7 +214,7 @@ create_ct_font (CGFontRef cg_font, CGFloat font_size)
}
CFURLRef original_url = nullptr;
-#if TARGET_OS_OSX && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+#if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
ATSFontRef atsFont;
FSRef fsref;
OSStatus status;
@@ -244,7 +244,7 @@ create_ct_font (CGFontRef cg_font, CGFloat font_size)
* process in Blink. This can be detected by the new file URL location
* that the newly found font points to. */
CFURLRef new_url = nullptr;
-#if TARGET_OS_OSX && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+#if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
atsFont = CTFontGetPlatformFont (new_ct_font, NULL);
status = ATSFontGetFileReference (atsFont, &fsref);
if (status == noErr)
@@ -711,7 +711,7 @@ resize_and_retry:
/* What's the iOS equivalent of this check?
* The symbols was introduced in iOS 7.0.
* At any rate, our fallback is safe and works fine. */
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
+#if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1090
# define kCTLanguageAttributeName CFSTR ("NSLanguage")
#endif
CFStringRef lang = CFStringCreateWithCStringNoCopy (kCFAllocatorDefault,
@@ -783,7 +783,7 @@ resize_and_retry:
int level = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1;
CFNumberRef level_number = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &level);
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+#if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel;
#endif
CFDictionaryRef options = CFDictionaryCreate (kCFAllocatorDefault,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.cc
index aaf10a1d6e4..137cd56c868 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.cc
@@ -1,5 +1,5 @@
/*
- * Copyright © 2015-2018 Ebrahim Byagowi
+ * Copyright © 2015-2019 Ebrahim Byagowi
*
* This is part of HarfBuzz, a text shaping library.
*
@@ -658,10 +658,10 @@ retry_getglyphs:
* alignment needed after the WORD array. sizeof (WORD) == 2. */
unsigned int glyphs_size = (scratch_size * sizeof (int) - 2)
/ (sizeof (WORD) +
- sizeof (DWRITE_SHAPING_GLYPH_PROPERTIES) +
- sizeof (int) +
- sizeof (DWRITE_GLYPH_OFFSET) +
- sizeof (uint32_t));
+ sizeof (DWRITE_SHAPING_GLYPH_PROPERTIES) +
+ sizeof (int) +
+ sizeof (DWRITE_GLYPH_OFFSET) +
+ sizeof (uint32_t));
ALLOCATE_ARRAY (uint32_t, vis_clusters, glyphs_size);
#undef ALLOCATE_ARRAY
@@ -868,3 +868,63 @@ hb_directwrite_shape_experimental_width (hb_font_t *font,
return res;
}
+
+struct _hb_directwrite_font_table_context {
+ IDWriteFontFace *face;
+ void *table_context;
+};
+
+static void
+_hb_directwrite_table_data_release (void *data)
+{
+ _hb_directwrite_font_table_context *context = (_hb_directwrite_font_table_context *) data;
+ context->face->ReleaseFontTable (context->table_context);
+ delete context;
+}
+
+static hb_blob_t *
+reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data)
+{
+ IDWriteFontFace *dw_face = ((IDWriteFontFace *) user_data);
+ const void *data;
+ uint32_t length;
+ void *table_context;
+ BOOL exists;
+ if (!dw_face || FAILED (dw_face->TryGetFontTable (hb_uint32_swap (tag), &data,
+ &length, &table_context, &exists)))
+ return nullptr;
+
+ if (!data || !exists || !length)
+ {
+ dw_face->ReleaseFontTable (table_context);
+ return nullptr;
+ }
+
+ _hb_directwrite_font_table_context *context = new _hb_directwrite_font_table_context;
+ context->face = dw_face;
+ context->table_context = table_context;
+
+ return hb_blob_create ((const char *) data, length, HB_MEMORY_MODE_READONLY,
+ context, _hb_directwrite_table_data_release);
+}
+
+static void
+_hb_directwrite_font_release (void *data)
+{
+ if (data)
+ ((IDWriteFontFace *) data)->Release ();
+}
+
+/**
+ * hb_directwrite_face_create:
+ * @font_face:
+ * Since: REPLACEME
+ **/
+hb_face_t *
+hb_directwrite_face_create (IDWriteFontFace *font_face)
+{
+ if (font_face)
+ font_face->AddRef ();
+ return hb_face_create_for_tables (reference_table, font_face,
+ _hb_directwrite_font_release);
+}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.h b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.h
index 9bfd1f727c4..09776fd09a3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.h
@@ -1,5 +1,5 @@
/*
- * Copyright © 2015 Ebrahim Byagowi
+ * Copyright © 2015-2019 Ebrahim Byagowi
*
* This is part of HarfBuzz, a text shaping library.
*
@@ -34,6 +34,9 @@ hb_directwrite_shape_experimental_width (hb_font_t *font, hb_buffer_t *buffer,
const hb_feature_t *features,
unsigned int num_features, float width);
+HB_EXTERN hb_face_t *
+hb_directwrite_face_create (IDWriteFontFace *font_face);
+
HB_END_DECLS
#endif /* HB_DIRECTWRITE_H */
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-dsalgs.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-dsalgs.hh
index 3dc4953abbb..0da244f0ae3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-dsalgs.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-dsalgs.hh
@@ -312,11 +312,6 @@ template <> struct hb_is_signed<uint64_t> { enum { value = false }; };
template <typename T> static inline bool
hb_in_range (T u, T lo, T hi)
{
- /* The sizeof() is here to force template instantiation.
- * I'm sure there are better ways to do this but can't think of
- * one right now. Declaring a variable won't work as HB_UNUSED
- * is unusable on some platforms and unused types are less likely
- * to generate a warning than unused variables. */
static_assert (!hb_is_signed<T>::value, "");
/* The casts below are important as if T is smaller than int,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-graphite2.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-graphite2.cc
index a1c602c293d..fdb545342df 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-graphite2.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-graphite2.cc
@@ -225,7 +225,7 @@ struct hb_graphite2_cluster_t {
unsigned int base_glyph;
unsigned int num_glyphs;
unsigned int cluster;
- float advance;
+ unsigned int advance;
};
hb_bool_t
@@ -253,7 +253,7 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan HB_UNUSED,
gr_segment *seg = nullptr;
const gr_slot *is;
unsigned int ci = 0, ic = 0;
- float curradvx = 0., curradvy = 0.;
+ unsigned int curradvx = 0, curradvy = 0;
unsigned int scratch_size;
hb_buffer_t::scratch_buffer_t *scratch = buffer->get_scratch_buffer (&scratch_size);
@@ -324,11 +324,15 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan HB_UNUSED,
hb_codepoint_t *pg = gids;
clusters[0].cluster = buffer->info[0].cluster;
- float curradv = 0.;
+ unsigned int upem = hb_face_get_upem (face);
+ float xscale = (float) font->x_scale / upem;
+ float yscale = (float) font->y_scale / upem;
+ yscale *= yscale / xscale;
+ unsigned int curradv = 0;
if (HB_DIRECTION_IS_BACKWARD(buffer->props.direction))
{
- curradv = gr_slot_origin_X(gr_seg_first_slot(seg));
- clusters[0].advance = gr_seg_advance_X(seg) - curradv;
+ curradv = gr_slot_origin_X(gr_seg_first_slot(seg)) * xscale;
+ clusters[0].advance = gr_seg_advance_X(seg) * xscale - curradv;
}
else
clusters[0].advance = 0;
@@ -355,14 +359,17 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan HB_UNUSED,
c->base_glyph = ic;
c->num_glyphs = 0;
if (HB_DIRECTION_IS_BACKWARD(buffer->props.direction))
- c->advance = curradv - gr_slot_origin_X(is);
+ {
+ c->advance = curradv - gr_slot_origin_X(is) * xscale;
+ curradv -= c->advance;
+ }
else
{
c->advance = 0;
- clusters[ci].advance += gr_slot_origin_X(is) - curradv;
+ clusters[ci].advance += gr_slot_origin_X(is) * xscale - curradv;
+ curradv += clusters[ci].advance;
}
ci++;
- curradv = gr_slot_origin_X(is);
}
clusters[ci].num_glyphs++;
@@ -373,7 +380,7 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan HB_UNUSED,
if (HB_DIRECTION_IS_BACKWARD(buffer->props.direction))
clusters[ci].advance += curradv;
else
- clusters[ci].advance += gr_seg_advance_X(seg) - curradv;
+ clusters[ci].advance += gr_seg_advance_X(seg) * xscale - curradv;
ci++;
for (unsigned int i = 0; i < ci; ++i)
@@ -388,10 +395,6 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan HB_UNUSED,
}
buffer->len = glyph_count;
- unsigned int upem = hb_face_get_upem (face);
- float xscale = (float) font->x_scale / upem;
- float yscale = (float) font->y_scale / upem;
- yscale *= yscale / xscale;
/* Positioning. */
unsigned int currclus = (unsigned int) -1;
const hb_glyph_info_t *info = buffer->info;
@@ -404,7 +407,7 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan HB_UNUSED,
pPos->x_offset = gr_slot_origin_X (is) * xscale - curradvx;
pPos->y_offset = gr_slot_origin_Y (is) * yscale - curradvy;
if (info->cluster != currclus) {
- pPos->x_advance = info->var1.i32 * xscale;
+ pPos->x_advance = info->var1.i32;
curradvx += pPos->x_advance;
currclus = info->cluster;
} else
@@ -421,7 +424,7 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan HB_UNUSED,
{
if (info->cluster != currclus)
{
- pPos->x_advance = info->var1.i32 * xscale;
+ pPos->x_advance = info->var1.i32;
curradvx -= pPos->x_advance;
currclus = info->cluster;
} else
@@ -429,7 +432,7 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan HB_UNUSED,
pPos->y_advance = gr_slot_advance_Y (is, grface, nullptr) * yscale;
curradvy -= pPos->y_advance;
- pPos->x_offset = (gr_slot_origin_X (is) - info->var1.i32) * xscale - curradvx + pPos->x_advance;
+ pPos->x_offset = gr_slot_origin_X (is) * xscale - info->var1.i32 - curradvx + pPos->x_advance;
pPos->y_offset = gr_slot_origin_Y (is) * yscale - curradvy;
}
hb_buffer_reverse_clusters (buffer);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-machinery.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-machinery.hh
index b22c2389c3c..ffa423d2fe4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-machinery.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-machinery.hh
@@ -326,27 +326,29 @@ struct hb_sanitize_context_t :
}
bool check_range (const void *base,
- unsigned int len) const
+ unsigned int len) const
{
const char *p = (const char *) base;
- bool ok = this->start <= p &&
- p <= this->end &&
- (unsigned int) (this->end - p) >= len &&
- this->max_ops-- > 0;
+ bool ok = !len ||
+ (this->start <= p &&
+ p <= this->end &&
+ (unsigned int) (this->end - p) >= len &&
+ this->max_ops-- > 0);
DEBUG_MSG_LEVEL (SANITIZE, p, this->debug_depth+1, 0,
- "check_range [%p..%p] (%d bytes) in [%p..%p] -> %s",
- p, p + len, len,
- this->start, this->end,
- ok ? "OK" : "OUT-OF-RANGE");
+ "check_range [%p..%p]"
+ " (%d bytes) in [%p..%p] -> %s",
+ p, p + len, len,
+ this->start, this->end,
+ ok ? "OK" : "OUT-OF-RANGE");
return likely (ok);
}
template <typename T>
bool check_range (const T *base,
- unsigned int a,
- unsigned int b) const
+ unsigned int a,
+ unsigned int b) const
{
return !hb_unsigned_mul_overflows (a, b) &&
this->check_range (base, a * b);
@@ -354,9 +356,9 @@ struct hb_sanitize_context_t :
template <typename T>
bool check_range (const T *base,
- unsigned int a,
- unsigned int b,
- unsigned int c) const
+ unsigned int a,
+ unsigned int b,
+ unsigned int c) const
{
return !hb_unsigned_mul_overflows (a, b) &&
this->check_range (base, a * b, c);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-map.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-map.hh
index 02d5406674c..f7156e51a04 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-map.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-map.hh
@@ -170,7 +170,7 @@ struct hb_map_t
void clear ()
{
- memset (items, 0xFF, ((size_t) mask + 1) * sizeof (item_t));
+ if (items) memset (items, 0xFF, ((size_t) mask + 1) * sizeof (item_t));
population = occupancy = 0;
}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-null.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-null.hh
index 204c2fefd83..baddd99b5c4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-null.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-null.hh
@@ -105,15 +105,18 @@ hb_vector_size_impl_t const _hb_NullPool[(HB_NULL_POOL_SIZE + sizeof (hb_vector_
/* Generic nul-content Null objects. */
template <typename Type>
-static inline Type const & Null () {
- static_assert (hb_null_size (Type) <= HB_NULL_POOL_SIZE, "Increase HB_NULL_POOL_SIZE.");
- return *reinterpret_cast<Type const *> (_hb_NullPool);
-}
+struct Null {
+ static Type const & get_null ()
+ {
+ static_assert (hb_null_size (Type) <= HB_NULL_POOL_SIZE, "Increase HB_NULL_POOL_SIZE.");
+ return *reinterpret_cast<Type const *> (_hb_NullPool);
+ }
+};
template <typename QType>
struct NullHelper
{
typedef typename hb_remove_const (typename hb_remove_reference (QType)) Type;
- static const Type & get_null () { return Null<Type> (); }
+ static const Type & get_null () { return Null<Type>::get_null (); }
};
#define Null(Type) NullHelper<Type>::get_null ()
@@ -122,9 +125,11 @@ struct NullHelper
} /* Close namespace. */ \
extern HB_INTERNAL const unsigned char _hb_Null_##Namespace##_##Type[Namespace::Type::null_size]; \
template <> \
- /*static*/ inline const Namespace::Type& Null<Namespace::Type> () { \
- return *reinterpret_cast<const Namespace::Type *> (_hb_Null_##Namespace##_##Type); \
- } \
+ struct Null<Namespace::Type> { \
+ static Namespace::Type const & get_null () { \
+ return *reinterpret_cast<const Namespace::Type *> (_hb_Null_##Namespace##_##Type); \
+ } \
+ }; \
namespace Namespace { \
static_assert (true, "Just so we take semicolon after.")
#define DEFINE_NULL_NAMESPACE_BYTES(Namespace, Type) \
@@ -134,10 +139,12 @@ struct NullHelper
#define DECLARE_NULL_INSTANCE(Type) \
extern HB_INTERNAL const Type _hb_Null_##Type; \
template <> \
- /*static*/ inline const Type& Null<Type> () { \
- return _hb_Null_##Type; \
- } \
-static_assert (true, "Just so we take semicolon after.")
+ struct Null<Type> { \
+ static Type const & get_null () { \
+ return _hb_Null_##Type; \
+ } \
+ }; \
+ static_assert (true, "Just so we take semicolon after.")
#define DEFINE_NULL_INSTANCE(Type) \
const Type _hb_Null_##Type
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff-common.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff-common.hh
index c645953e5b9..61e615cf0fb 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff-common.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff-common.hh
@@ -525,6 +525,7 @@ struct FDArray : CFFIndexOf<COUNT, FontDict>
for (unsigned i = 0; i < fontDicts.length; i++)
if (fdmap.includes (i))
{
+ if (unlikely (fid >= fdCount)) return_trace (false);
CFFIndexOf<COUNT, FontDict>::set_offset_at (fid++, offset);
offset += FontDict::calculate_serialized_size (fontDicts[i], opszr);
}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff1-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff1-table.hh
index 1effdf006cd..9d39242cfc9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff1-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-cff1-table.hh
@@ -59,14 +59,14 @@ struct Encoding0 {
bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return_trace (c->check_struct (this) && codes[nCodes - 1].sanitize (c));
+ return_trace (codes.sanitize (c));
}
hb_codepoint_t get_code (hb_codepoint_t glyph) const
{
assert (glyph > 0);
glyph--;
- if (glyph < nCodes)
+ if (glyph < nCodes ())
{
return (hb_codepoint_t)codes[glyph];
}
@@ -74,13 +74,12 @@ struct Encoding0 {
return CFF_UNDEF_CODE;
}
- unsigned int get_size () const
- { return HBUINT8::static_size * (nCodes + 1); }
+ HBUINT8 &nCodes () { return codes.len; }
+ HBUINT8 nCodes () const { return codes.len; }
- HBUINT8 nCodes;
- HBUINT8 codes[VAR];
+ ArrayOf<HBUINT8, HBUINT8> codes;
- DEFINE_SIZE_ARRAY(1, codes);
+ DEFINE_SIZE_ARRAY_SIZED (1, codes);
};
struct Encoding1_Range {
@@ -97,20 +96,17 @@ struct Encoding1_Range {
};
struct Encoding1 {
- unsigned int get_size () const
- { return HBUINT8::static_size + Encoding1_Range::static_size * nRanges; }
-
bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return_trace (c->check_struct (this) && ((nRanges == 0) || (ranges[nRanges - 1]).sanitize (c)));
+ return_trace (ranges.sanitize (c));
}
hb_codepoint_t get_code (hb_codepoint_t glyph) const
{
assert (glyph > 0);
glyph--;
- for (unsigned int i = 0; i < nRanges; i++)
+ for (unsigned int i = 0; i < nRanges (); i++)
{
if (glyph <= ranges[i].nLeft)
{
@@ -121,10 +117,12 @@ struct Encoding1 {
return CFF_UNDEF_CODE;
}
- HBUINT8 nRanges;
- Encoding1_Range ranges[VAR];
+ HBUINT8 &nRanges () { return ranges.len; }
+ HBUINT8 nRanges () const { return ranges.len; }
- DEFINE_SIZE_ARRAY (1, ranges);
+ ArrayOf<Encoding1_Range, HBUINT8> ranges;
+
+ DEFINE_SIZE_ARRAY_SIZED (1, ranges);
};
struct SuppEncoding {
@@ -144,23 +142,22 @@ struct CFF1SuppEncData {
bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
- return_trace (c->check_struct (this) && ((nSups == 0) || (supps[nSups - 1]).sanitize (c)));
+ return_trace (supps.sanitize (c));
}
void get_codes (hb_codepoint_t sid, hb_vector_t<hb_codepoint_t> &codes) const
{
- for (unsigned int i = 0; i < nSups; i++)
+ for (unsigned int i = 0; i < nSups (); i++)
if (sid == supps[i].glyph)
codes.push (supps[i].code);
}
- unsigned int get_size () const
- { return HBUINT8::static_size + SuppEncoding::static_size * nSups; }
+ HBUINT8 &nSups () { return supps.len; }
+ HBUINT8 nSups () const { return supps.len; }
- HBUINT8 nSups;
- SuppEncoding supps[VAR];
+ ArrayOf<SuppEncoding, HBUINT8> supps;
- DEFINE_SIZE_ARRAY (1, supps);
+ DEFINE_SIZE_ARRAY_SIZED (1, supps);
};
struct Encoding {
@@ -204,7 +201,7 @@ struct Encoding {
{
Encoding0 *fmt0 = c->allocate_size<Encoding0> (Encoding0::min_size + HBUINT8::static_size * enc_count);
if (unlikely (fmt0 == nullptr)) return_trace (false);
- fmt0->nCodes.set (enc_count);
+ fmt0->nCodes ().set (enc_count);
unsigned int glyph = 0;
for (unsigned int i = 0; i < code_ranges.length; i++)
{
@@ -219,7 +216,7 @@ struct Encoding {
{
Encoding1 *fmt1 = c->allocate_size<Encoding1> (Encoding1::min_size + Encoding1_Range::static_size * code_ranges.length);
if (unlikely (fmt1 == nullptr)) return_trace (false);
- fmt1->nRanges.set (code_ranges.length);
+ fmt1->nRanges ().set (code_ranges.length);
for (unsigned int i = 0; i < code_ranges.length; i++)
{
if (unlikely (!((code_ranges[i].code <= 0xFF) && (code_ranges[i].glyph <= 0xFF))))
@@ -232,7 +229,7 @@ struct Encoding {
{
CFF1SuppEncData *suppData = c->allocate_size<CFF1SuppEncData> (CFF1SuppEncData::min_size + SuppEncoding::static_size * supp_codes.length);
if (unlikely (suppData == nullptr)) return_trace (false);
- suppData->nSups.set (supp_codes.length);
+ suppData->nSups ().set (supp_codes.length);
for (unsigned int i = 0; i < supp_codes.length; i++)
{
suppData->supps[i].code.set (supp_codes[i].code);
@@ -291,9 +288,9 @@ struct Encoding {
const CFF1SuppEncData &suppEncData () const
{
if ((format & 0x7F) == 0)
- return StructAfter<CFF1SuppEncData> (u.format0.codes[u.format0.nCodes-1]);
+ return StructAfter<CFF1SuppEncData> (u.format0.codes[u.format0.nCodes ()-1]);
else
- return StructAfter<CFF1SuppEncData> (u.format1.ranges[u.format1.nRanges-1]);
+ return StructAfter<CFF1SuppEncData> (u.format1.ranges[u.format1.nRanges ()-1]);
}
public:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-font.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-font.cc
index 20b09df524c..94a9fdc479f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-font.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-font.cc
@@ -52,7 +52,7 @@
* @short_description: OpenType font implementation
* @include: hb-ot.h
*
- * Functions for using OpenType fonts with hb_shape(). Not that fonts returned
+ * Functions for using OpenType fonts with hb_shape(). Note that fonts returned
* by hb_font_create() default to using these functions, so most clients would
* never need to call these functions directly.
**/
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hdmx-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hdmx-table.hh
index 95229c523b7..953ccab80ef 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hdmx-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hdmx-table.hh
@@ -57,16 +57,19 @@ struct DeviceRecord
}
unsigned int len () const
- { return this->subset_plan->glyphs.length; }
+ { return this->subset_plan->num_output_glyphs (); }
- const HBUINT8* operator [] (unsigned int i) const
+ const HBUINT8* operator [] (unsigned int new_gid) const
{
- if (unlikely (i >= len ())) return nullptr;
- hb_codepoint_t gid = this->subset_plan->glyphs [i];
+ if (unlikely (new_gid >= len ())) return nullptr;
- if (gid >= sizeDeviceRecord - DeviceRecord::min_size)
+ hb_codepoint_t old_gid;
+ if (!this->subset_plan->old_gid_for_new_gid (new_gid, &old_gid))
+ return &Null(HBUINT8);
+
+ if (old_gid >= sizeDeviceRecord - DeviceRecord::min_size)
return nullptr;
- return &(this->source_device_record->widthsZ[gid]);
+ return &(this->source_device_record->widthsZ[old_gid]);
}
};
@@ -140,7 +143,7 @@ struct hdmx
this->version.set (source_hdmx->version);
this->numRecords.set (source_hdmx->numRecords);
- this->sizeDeviceRecord.set (DeviceRecord::get_size (plan->glyphs.length));
+ this->sizeDeviceRecord.set (DeviceRecord::get_size (plan->num_output_glyphs ()));
for (unsigned int i = 0; i < source_hdmx->numRecords; i++)
{
@@ -156,7 +159,7 @@ struct hdmx
static size_t get_subsetted_size (const hdmx *source_hdmx, hb_subset_plan_t *plan)
{
- return min_size + source_hdmx->numRecords * DeviceRecord::get_size (plan->glyphs.length);
+ return min_size + source_hdmx->numRecords * DeviceRecord::get_size (plan->num_output_glyphs ());
}
bool subset (hb_subset_plan_t *plan) const
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hmtx-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hmtx-table.hh
index a95a56f32de..9ef1f57168d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hmtx-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hmtx-table.hh
@@ -66,7 +66,7 @@ struct hmtxvmtx
bool subset_update_header (hb_subset_plan_t *plan,
- unsigned int num_hmetrics) const
+ unsigned int num_hmetrics) const
{
hb_blob_t *src_blob = hb_sanitize_context_t ().reference_table<H> (plan->source, H::tableTag);
hb_blob_t *dest_blob = hb_blob_copy_writable_or_fail (src_blob);
@@ -93,75 +93,49 @@ struct hmtxvmtx
/* All the trailing glyphs with the same advance can use one LongMetric
* and just keep LSB */
- hb_vector_t<hb_codepoint_t> &gids = plan->glyphs;
- unsigned int num_advances = gids.length;
- unsigned int last_advance = _mtx.get_advance (gids[num_advances - 1]);
- while (num_advances > 1 &&
- last_advance == _mtx.get_advance (gids[num_advances - 2]))
- {
- num_advances--;
- }
+ unsigned int num_output_glyphs = plan->num_output_glyphs ();
+ unsigned int num_advances = _mtx.num_advances_for_subset (plan);
/* alloc the new table */
size_t dest_sz = num_advances * 4
- + (gids.length - num_advances) * 2;
+ + (num_output_glyphs - num_advances) * 2;
void *dest = (void *) malloc (dest_sz);
if (unlikely (!dest))
{
return false;
}
DEBUG_MSG(SUBSET, nullptr, "%c%c%c%c in src has %d advances, %d lsbs", HB_UNTAG(T::tableTag), _mtx.num_advances, _mtx.num_metrics - _mtx.num_advances);
- DEBUG_MSG(SUBSET, nullptr, "%c%c%c%c in dest has %d advances, %d lsbs, %u bytes", HB_UNTAG(T::tableTag), num_advances, gids.length - num_advances, (unsigned int) dest_sz);
+ DEBUG_MSG(SUBSET, nullptr, "%c%c%c%c in dest has %d advances, %d lsbs, %u bytes",
+ HB_UNTAG(T::tableTag), num_advances, num_output_glyphs - num_advances, (unsigned int) dest_sz);
- const char *source_table = hb_blob_get_data (_mtx.table.get_blob (), nullptr);
// Copy everything over
- LongMetric * old_metrics = (LongMetric *) source_table;
- FWORD *lsbs = (FWORD *) (old_metrics + _mtx.num_advances);
char * dest_pos = (char *) dest;
bool failed = false;
- for (unsigned int i = 0; i < gids.length; i++)
+ for (unsigned int i = 0; i < num_output_glyphs; i++)
{
- /* the last metric or the one for gids[i] */
- LongMetric *src_metric = old_metrics + MIN ((hb_codepoint_t) _mtx.num_advances - 1, gids[i]);
- if (gids[i] < _mtx.num_advances)
+ unsigned int side_bearing = 0;
+ unsigned int advance = 0;
+ hb_codepoint_t old_gid;
+ if (plan->old_gid_for_new_gid (i, &old_gid))
+ {
+ // Glyph is not an empty glyph so copy advance and side bearing
+ // from the input font.
+ side_bearing = _mtx.get_side_bearing (old_gid);
+ advance = _mtx.get_advance (old_gid);
+ }
+
+ bool has_advance = i < num_advances;
+ if (has_advance)
{
- /* src is a LongMetric */
- if (i < num_advances)
- {
- /* dest is a LongMetric, copy it */
- *((LongMetric *) dest_pos) = *src_metric;
- }
- else
- {
- /* dest just sb */
- *((FWORD *) dest_pos) = src_metric->sb;
- }
+ ((LongMetric *) dest_pos)->advance.set (advance);
+ ((LongMetric *) dest_pos)->sb.set (side_bearing);
}
else
{
- if (gids[i] >= _mtx.num_metrics)
- {
- DEBUG_MSG(SUBSET, nullptr, "gid %d is >= number of source metrics %d",
- gids[i], _mtx.num_metrics);
- failed = true;
- break;
- }
- FWORD src_sb = *(lsbs + gids[i] - _mtx.num_advances);
- if (i < num_advances)
- {
- /* dest needs a full LongMetric */
- LongMetric *metric = (LongMetric *)dest_pos;
- metric->advance = src_metric->advance;
- metric->sb = src_sb;
- }
- else
- {
- /* dest just needs an sb */
- *((FWORD *) dest_pos) = src_sb;
- }
+ ((FWORD *) dest_pos)->set (side_bearing);
}
- dest_pos += (i < num_advances ? 4 : 2);
+ dest_pos += (has_advance ? 4 : 2);
}
_mtx.fini ();
@@ -187,7 +161,7 @@ struct hmtxvmtx
friend struct hmtxvmtx;
void init (hb_face_t *face,
- unsigned int default_advance_ = 0)
+ unsigned int default_advance_ = 0)
{
default_advance = default_advance_ ? default_advance_ : hb_face_get_upem (face);
@@ -280,6 +254,32 @@ struct hmtxvmtx
return advance;
}
+ unsigned int num_advances_for_subset (const hb_subset_plan_t *plan) const
+ {
+ unsigned int num_advances = plan->num_output_glyphs ();
+ unsigned int last_advance = _advance_for_new_gid (plan,
+ num_advances - 1);
+ while (num_advances > 1 &&
+ last_advance == _advance_for_new_gid (plan,
+ num_advances - 2))
+ {
+ num_advances--;
+ }
+
+ return num_advances;
+ }
+
+ private:
+ unsigned int _advance_for_new_gid (const hb_subset_plan_t *plan,
+ hb_codepoint_t new_gid) const
+ {
+ hb_codepoint_t old_gid;
+ if (!plan->old_gid_for_new_gid (new_gid, &old_gid))
+ return 0;
+
+ return get_advance (old_gid);
+ }
+
public:
bool has_font_extents;
int ascender;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-common.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-common.hh
index 39a8bbabdff..9b172257bca 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-common.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-common.hh
@@ -1222,7 +1222,7 @@ struct ClassDefFormat1
bool subset (hb_subset_context_t *c) const
{
TRACE_SUBSET (this);
- const hb_set_t &glyphset = *c->plan->glyphset;
+ const hb_set_t &glyphset = *c->plan->glyphset ();
const hb_map_t &glyph_map = *c->plan->glyph_map;
hb_vector_t<GlyphID> glyphs;
hb_vector_t<HBUINT16> klasses;
@@ -1369,7 +1369,7 @@ struct ClassDefFormat2
bool subset (hb_subset_context_t *c) const
{
TRACE_SUBSET (this);
- const hb_set_t &glyphset = *c->plan->glyphset;
+ const hb_set_t &glyphset = *c->plan->glyphset ();
const hb_map_t &glyph_map = *c->plan->glyph_map;
hb_vector_t<GlyphID> glyphs;
hb_vector_t<HBUINT16> klasses;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh
index 33b8f0ebda1..cc10634759b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh
@@ -105,7 +105,7 @@ struct SingleSubstFormat1
bool subset (hb_subset_context_t *c) const
{
TRACE_SUBSET (this);
- const hb_set_t &glyphset = *c->plan->glyphset;
+ const hb_set_t &glyphset = *c->plan->glyphset ();
const hb_map_t &glyph_map = *c->plan->glyph_map;
hb_vector_t<GlyphID> from;
hb_vector_t<GlyphID> to;
@@ -202,7 +202,7 @@ struct SingleSubstFormat2
bool subset (hb_subset_context_t *c) const
{
TRACE_SUBSET (this);
- const hb_set_t &glyphset = *c->plan->glyphset;
+ const hb_set_t &glyphset = *c->plan->glyphset ();
const hb_map_t &glyph_map = *c->plan->glyph_map;
hb_vector_t<GlyphID> from;
hb_vector_t<GlyphID> to;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc
index d32be04a812..1365a3e21d8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc
@@ -958,19 +958,6 @@ hb_ot_layout_lookup_would_substitute (hb_face_t *face,
unsigned int glyphs_length,
hb_bool_t zero_context)
{
- return hb_ot_layout_lookup_would_substitute_fast (face,
- lookup_index,
- glyphs, glyphs_length,
- zero_context);
-}
-
-bool
-hb_ot_layout_lookup_would_substitute_fast (hb_face_t *face,
- unsigned int lookup_index,
- const hb_codepoint_t *glyphs,
- unsigned int glyphs_length,
- bool zero_context)
-{
if (unlikely (lookup_index >= face->table.GSUB->lookup_count)) return false;
OT::hb_would_apply_context_t c (face, glyphs, glyphs_length, (bool) zero_context);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.hh
index a00b940b2ab..be7ef02636b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.hh
@@ -96,13 +96,6 @@ HB_MARK_AS_FLAG_T (hb_ot_layout_glyph_props_flags_t);
* GSUB/GPOS
*/
-HB_INTERNAL bool
-hb_ot_layout_lookup_would_substitute_fast (hb_face_t *face,
- unsigned int lookup_index,
- const hb_codepoint_t *glyphs,
- unsigned int glyphs_length,
- bool zero_context);
-
/* Should be called before all the substitute_lookup's are done. */
HB_INTERNAL void
@@ -215,7 +208,7 @@ _hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_buffer_t *buffer)
unsigned int gen_cat = (unsigned int) unicode->general_category (u);
unsigned int props = gen_cat;
- if (u >= 0x80)
+ if (u >= 0x80u)
{
buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_NON_ASCII;
@@ -232,10 +225,10 @@ _hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_buffer_t *buffer)
* FVSes are GC=Mn, we have use a separate bit to remember them.
* Fixes:
* https://github.com/harfbuzz/harfbuzz/issues/234 */
- else if (unlikely (hb_in_range (u, 0x180Bu, 0x180Du))) props |= UPROPS_MASK_HIDDEN;
+ else if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x180Bu, 0x180Du))) props |= UPROPS_MASK_HIDDEN;
/* TAG characters need similar treatment. Fixes:
* https://github.com/harfbuzz/harfbuzz/issues/463 */
- else if (unlikely (hb_in_range (u, 0xE0020u, 0xE007Fu))) props |= UPROPS_MASK_HIDDEN;
+ else if (unlikely (hb_in_range<hb_codepoint_t> (u, 0xE0020u, 0xE007Fu))) props |= UPROPS_MASK_HIDDEN;
/* COMBINING GRAPHEME JOINER should not be skipped; at least some times.
* https://github.com/harfbuzz/harfbuzz/issues/554 */
else if (unlikely (u == 0x034Fu))
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-maxp-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-maxp-table.hh
index e4b67ab2915..10bd592e889 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-maxp-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-maxp-table.hh
@@ -105,7 +105,7 @@ struct maxp
}
maxp *maxp_prime = (maxp *) hb_blob_get_data (maxp_prime_blob, nullptr);
- maxp_prime->set_num_glyphs (plan->glyphs.length);
+ maxp_prime->set_num_glyphs (plan->num_output_glyphs ());
if (plan->drop_hints)
drop_hint_fields (plan, maxp_prime);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-table.hh
index 9459aad3d6c..719fabd353f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-table.hh
@@ -6,10 +6,10 @@
*
* on files with these headers:
*
- * # ArabicShaping-11.0.0.txt
- * # Date: 2018-02-21, 14:50:00 GMT [KW, RP]
- * # Blocks-11.0.0.txt
- * # Date: 2017-10-16, 24:39:00 GMT [KW]
+ * # ArabicShaping-12.0.0.txt
+ * # Date: 2018-09-22, 23:54:00 GMT [KW, RP]
+ * # Blocks-12.0.0.txt
+ * # Date: 2018-07-30, 19:40:00 GMT [KW]
* UnicodeData.txt does not have a header.
*/
@@ -152,9 +152,9 @@ static const uint8_t joining_table[] =
/* 1E900 */ 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,
+ /* 1E940 */ D,D,D,D,X,X,X,X,X,X,X,T,
-}; /* Table items: 1304; occupancy: 56% */
+}; /* Table items: 1312; occupancy: 56% */
static unsigned int
@@ -190,7 +190,7 @@ joining_type (hb_codepoint_t u)
break;
case 0x1Eu:
- if (hb_in_range<hb_codepoint_t> (u, 0x1E900u, 0x1E943u)) return joining_table[u - 0x1E900u + joining_offset_0x1e900u];
+ if (hb_in_range<hb_codepoint_t> (u, 0x1E900u, 0x1E94Bu)) return joining_table[u - 0x1E900u + joining_offset_0x1e900u];
break;
default:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic.cc
index 50a52136b7f..bdebde0f42e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic.cc
@@ -467,7 +467,7 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED,
unsigned int j = new_len;
for (unsigned int i = count; i; i--)
{
- if (!hb_in_range<unsigned> (info[i - 1].arabic_shaping_action(), STCH_FIXED, STCH_REPEATING))
+ if (!hb_in_range<uint8_t> (info[i - 1].arabic_shaping_action(), STCH_FIXED, STCH_REPEATING))
{
if (step == CUT)
{
@@ -488,7 +488,7 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED,
unsigned int end = i;
while (i &&
- hb_in_range<unsigned> (info[i - 1].arabic_shaping_action(), STCH_FIXED, STCH_REPEATING))
+ hb_in_range<uint8_t> (info[i - 1].arabic_shaping_action(), STCH_FIXED, STCH_REPEATING))
{
i--;
hb_position_t width = font->get_glyph_h_advance (info[i].codepoint);
@@ -506,7 +506,7 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED,
unsigned int start = i;
unsigned int context = i;
while (context &&
- !hb_in_range<unsigned> (info[context - 1].arabic_shaping_action(), STCH_FIXED, STCH_REPEATING) &&
+ !hb_in_range<uint8_t> (info[context - 1].arabic_shaping_action(), STCH_FIXED, STCH_REPEATING) &&
(_hb_glyph_info_is_default_ignorable (&info[context - 1]) ||
HB_ARABIC_GENERAL_CATEGORY_IS_WORD (_hb_glyph_info_get_general_category (&info[context - 1]))))
{
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-hangul.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-hangul.cc
index e143867e13a..f084f6ad6b5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-hangul.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-hangul.cc
@@ -214,7 +214,8 @@ preprocess_text_hangul (const hb_ot_shape_plan_t *plan HB_UNUSED,
else
{
/* No valid syllable as base for tone mark; try to insert dotted circle. */
- if (font->has_glyph (0x25CCu))
+ if (!(buffer->flags & HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE) &&
+ font->has_glyph (0x25CCu))
{
hb_codepoint_t chars[2];
if (!is_zero_width_char (font, u)) {
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-machine.hh
index e2ecfb89ca2..08b90e91312 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-machine.hh
@@ -51,40 +51,40 @@ static const unsigned char _indic_syllable_machine_trans_keys[] = {
5u, 7u, 7u, 7u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u,
4u, 8u, 6u, 6u, 16u, 16u, 4u, 8u, 6u, 6u, 16u, 16u, 4u, 13u, 4u, 8u,
4u, 13u, 4u, 8u, 4u, 13u, 4u, 8u, 4u, 13u, 4u, 8u, 4u, 13u, 4u, 13u,
- 5u, 8u, 8u, 8u, 1u, 19u, 3u, 13u, 3u, 10u, 4u, 10u, 1u, 16u, 3u, 13u,
- 3u, 10u, 4u, 10u, 1u, 16u, 3u, 13u, 3u, 10u, 4u, 10u, 1u, 16u, 3u, 13u,
- 3u, 10u, 4u, 10u, 1u, 16u, 3u, 13u, 3u, 10u, 4u, 10u, 5u, 10u, 5u, 10u,
+ 5u, 8u, 8u, 8u, 1u, 19u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u,
+ 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u,
+ 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 5u, 10u, 5u, 10u,
5u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 5u, 10u, 3u, 10u, 5u, 10u, 3u, 10u,
4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u,
- 3u, 10u, 4u, 10u, 3u, 10u, 3u, 13u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 10u,
- 3u, 13u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 10u, 3u, 13u, 1u, 16u, 1u, 16u,
- 1u, 16u, 3u, 10u, 3u, 13u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 10u, 3u, 13u,
- 3u, 13u, 3u, 10u, 4u, 10u, 1u, 16u, 3u, 13u, 3u, 10u, 4u, 10u, 1u, 16u,
- 3u, 13u, 3u, 10u, 4u, 10u, 1u, 16u, 3u, 13u, 3u, 10u, 4u, 10u, 1u, 16u,
- 3u, 13u, 3u, 10u, 4u, 10u, 5u, 10u, 5u, 10u, 5u, 10u, 10u, 10u, 10u, 10u,
- 10u, 10u, 5u, 10u, 3u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u,
- 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 3u, 10u,
- 3u, 13u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 10u, 3u, 13u, 1u, 16u, 1u, 16u,
- 1u, 16u, 3u, 10u, 3u, 13u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 10u, 3u, 13u,
- 1u, 16u, 1u, 16u, 1u, 16u, 4u, 8u, 3u, 10u, 3u, 10u, 4u, 10u, 1u, 16u,
- 3u, 13u, 3u, 10u, 4u, 10u, 1u, 16u, 3u, 13u, 3u, 10u, 4u, 10u, 1u, 16u,
- 3u, 13u, 3u, 10u, 4u, 10u, 1u, 16u, 3u, 13u, 3u, 10u, 4u, 10u, 5u, 10u,
- 5u, 10u, 5u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 5u, 10u, 3u, 10u, 5u, 10u,
+ 3u, 10u, 4u, 10u, 4u, 10u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u,
+ 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u,
+ 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u,
+ 3u, 17u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u,
+ 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u,
+ 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 5u, 10u, 5u, 10u, 5u, 10u, 10u, 10u,
+ 10u, 10u, 10u, 10u, 5u, 10u, 3u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u,
3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u,
- 5u, 10u, 3u, 10u, 4u, 10u, 3u, 10u, 3u, 13u, 1u, 16u, 1u, 16u, 1u, 16u,
- 3u, 10u, 3u, 13u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 10u, 3u, 13u, 1u, 16u,
- 1u, 16u, 1u, 16u, 3u, 10u, 3u, 13u, 1u, 16u, 1u, 16u, 1u, 16u, 4u, 13u,
- 3u, 10u, 4u, 8u, 3u, 13u, 3u, 10u, 4u, 10u, 1u, 16u, 3u, 13u, 3u, 10u,
- 4u, 10u, 1u, 16u, 3u, 13u, 3u, 10u, 4u, 10u, 1u, 16u, 3u, 13u, 3u, 10u,
- 4u, 10u, 1u, 16u, 3u, 13u, 3u, 10u, 4u, 10u, 5u, 10u, 5u, 10u, 5u, 10u,
- 10u, 10u, 10u, 10u, 10u, 10u, 5u, 10u, 3u, 10u, 5u, 10u, 3u, 10u, 4u, 10u,
+ 4u, 10u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u,
+ 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u,
+ 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 4u, 8u, 3u, 17u, 3u, 17u,
+ 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u,
+ 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u,
+ 4u, 17u, 5u, 10u, 5u, 10u, 5u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 5u, 10u,
+ 3u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u,
+ 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 4u, 10u, 3u, 17u, 3u, 17u,
+ 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u,
+ 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u,
+ 1u, 16u, 1u, 16u, 4u, 13u, 3u, 17u, 4u, 8u, 3u, 17u, 3u, 17u, 4u, 17u,
+ 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u,
+ 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u, 1u, 16u, 3u, 17u, 3u, 17u, 4u, 17u,
+ 5u, 10u, 5u, 10u, 5u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 5u, 10u, 3u, 10u,
5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 5u, 10u, 3u, 10u,
- 4u, 10u, 3u, 10u, 3u, 13u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 10u, 3u, 13u,
- 1u, 16u, 1u, 16u, 1u, 16u, 3u, 10u, 3u, 13u, 1u, 16u, 1u, 16u, 1u, 16u,
- 3u, 10u, 3u, 13u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 10u, 1u, 16u, 3u, 13u,
- 1u, 16u, 4u, 13u, 5u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 5u, 10u, 1u, 16u,
- 3u, 10u, 5u, 10u, 5u, 10u, 10u, 10u, 10u, 10u, 10u, 10u, 5u, 10u, 1u, 16u,
- 0
+ 4u, 10u, 5u, 10u, 3u, 10u, 4u, 10u, 4u, 10u, 3u, 17u, 3u, 17u, 1u, 16u,
+ 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u,
+ 3u, 17u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 17u, 3u, 17u, 1u, 16u, 1u, 16u,
+ 1u, 16u, 3u, 17u, 1u, 17u, 3u, 17u, 1u, 17u, 4u, 13u, 5u, 10u, 10u, 10u,
+ 10u, 10u, 10u, 10u, 5u, 10u, 1u, 16u, 3u, 10u, 5u, 10u, 5u, 10u, 10u, 10u,
+ 10u, 10u, 10u, 10u, 5u, 10u, 1u, 16u, 0
};
static const char _indic_syllable_machine_key_spans[] = {
@@ -105,39 +105,40 @@ static const char _indic_syllable_machine_key_spans[] = {
3, 1, 5, 1, 1, 5, 1, 1,
5, 1, 1, 5, 1, 1, 10, 5,
10, 5, 10, 5, 10, 5, 10, 10,
- 4, 1, 19, 11, 8, 7, 16, 11,
- 8, 7, 16, 11, 8, 7, 16, 11,
- 8, 7, 16, 11, 8, 7, 6, 6,
+ 4, 1, 19, 15, 15, 14, 16, 15,
+ 15, 14, 16, 15, 15, 14, 16, 15,
+ 15, 14, 16, 15, 15, 14, 6, 6,
6, 1, 1, 1, 6, 8, 6, 8,
7, 6, 8, 7, 6, 8, 7, 6,
- 8, 7, 8, 11, 16, 16, 16, 8,
- 11, 16, 16, 16, 8, 11, 16, 16,
- 16, 8, 11, 16, 16, 16, 8, 11,
- 11, 8, 7, 16, 11, 8, 7, 16,
- 11, 8, 7, 16, 11, 8, 7, 16,
- 11, 8, 7, 6, 6, 6, 1, 1,
- 1, 6, 8, 6, 8, 7, 6, 8,
- 7, 6, 8, 7, 6, 8, 7, 8,
- 11, 16, 16, 16, 8, 11, 16, 16,
- 16, 8, 11, 16, 16, 16, 8, 11,
- 16, 16, 16, 5, 8, 8, 7, 16,
- 11, 8, 7, 16, 11, 8, 7, 16,
- 11, 8, 7, 16, 11, 8, 7, 6,
- 6, 6, 1, 1, 1, 6, 8, 6,
+ 8, 7, 7, 15, 15, 16, 16, 16,
+ 15, 15, 16, 16, 16, 15, 15, 16,
+ 16, 16, 15, 15, 16, 16, 16, 15,
+ 15, 15, 15, 14, 16, 15, 15, 14,
+ 16, 15, 15, 14, 16, 15, 15, 14,
+ 16, 15, 15, 14, 6, 6, 6, 1,
+ 1, 1, 6, 8, 6, 8, 7, 6,
8, 7, 6, 8, 7, 6, 8, 7,
- 6, 8, 7, 8, 11, 16, 16, 16,
- 8, 11, 16, 16, 16, 8, 11, 16,
- 16, 16, 8, 11, 16, 16, 16, 10,
- 8, 5, 11, 8, 7, 16, 11, 8,
- 7, 16, 11, 8, 7, 16, 11, 8,
- 7, 16, 11, 8, 7, 6, 6, 6,
- 1, 1, 1, 6, 8, 6, 8, 7,
+ 7, 15, 15, 16, 16, 16, 15, 15,
+ 16, 16, 16, 15, 15, 16, 16, 16,
+ 15, 15, 16, 16, 16, 5, 15, 15,
+ 14, 16, 15, 15, 14, 16, 15, 15,
+ 14, 16, 15, 15, 14, 16, 15, 15,
+ 14, 6, 6, 6, 1, 1, 1, 6,
+ 8, 6, 8, 7, 6, 8, 7, 6,
+ 8, 7, 6, 8, 7, 7, 15, 15,
+ 16, 16, 16, 15, 15, 16, 16, 16,
+ 15, 15, 16, 16, 16, 15, 15, 16,
+ 16, 16, 10, 15, 5, 15, 15, 14,
+ 16, 15, 15, 14, 16, 15, 15, 14,
+ 16, 15, 15, 14, 16, 15, 15, 14,
+ 6, 6, 6, 1, 1, 1, 6, 8,
6, 8, 7, 6, 8, 7, 6, 8,
- 7, 8, 11, 16, 16, 16, 8, 11,
- 16, 16, 16, 8, 11, 16, 16, 16,
- 8, 11, 16, 16, 16, 8, 16, 11,
- 16, 10, 6, 1, 1, 1, 6, 16,
- 8, 6, 6, 1, 1, 1, 6, 16
+ 7, 6, 8, 7, 7, 15, 15, 16,
+ 16, 16, 15, 15, 16, 16, 16, 15,
+ 15, 16, 16, 16, 15, 15, 16, 16,
+ 16, 15, 17, 15, 17, 10, 6, 1,
+ 1, 1, 6, 16, 8, 6, 6, 1,
+ 1, 1, 6, 16
};
static const short _indic_syllable_machine_index_offsets[] = {
@@ -158,39 +159,40 @@ static const short _indic_syllable_machine_index_offsets[] = {
528, 532, 534, 540, 542, 544, 550, 552,
554, 560, 562, 564, 570, 572, 574, 585,
591, 602, 608, 619, 625, 636, 642, 653,
- 664, 669, 671, 691, 703, 712, 720, 737,
- 749, 758, 766, 783, 795, 804, 812, 829,
- 841, 850, 858, 875, 887, 896, 904, 911,
- 918, 925, 927, 929, 931, 938, 947, 954,
- 963, 971, 978, 987, 995, 1002, 1011, 1019,
- 1026, 1035, 1043, 1052, 1064, 1081, 1098, 1115,
- 1124, 1136, 1153, 1170, 1187, 1196, 1208, 1225,
- 1242, 1259, 1268, 1280, 1297, 1314, 1331, 1340,
- 1352, 1364, 1373, 1381, 1398, 1410, 1419, 1427,
- 1444, 1456, 1465, 1473, 1490, 1502, 1511, 1519,
- 1536, 1548, 1557, 1565, 1572, 1579, 1586, 1588,
- 1590, 1592, 1599, 1608, 1615, 1624, 1632, 1639,
- 1648, 1656, 1663, 1672, 1680, 1687, 1696, 1704,
- 1713, 1725, 1742, 1759, 1776, 1785, 1797, 1814,
- 1831, 1848, 1857, 1869, 1886, 1903, 1920, 1929,
- 1941, 1958, 1975, 1992, 1998, 2007, 2016, 2024,
- 2041, 2053, 2062, 2070, 2087, 2099, 2108, 2116,
- 2133, 2145, 2154, 2162, 2179, 2191, 2200, 2208,
- 2215, 2222, 2229, 2231, 2233, 2235, 2242, 2251,
- 2258, 2267, 2275, 2282, 2291, 2299, 2306, 2315,
- 2323, 2330, 2339, 2347, 2356, 2368, 2385, 2402,
- 2419, 2428, 2440, 2457, 2474, 2491, 2500, 2512,
- 2529, 2546, 2563, 2572, 2584, 2601, 2618, 2635,
- 2646, 2655, 2661, 2673, 2682, 2690, 2707, 2719,
- 2728, 2736, 2753, 2765, 2774, 2782, 2799, 2811,
- 2820, 2828, 2845, 2857, 2866, 2874, 2881, 2888,
- 2895, 2897, 2899, 2901, 2908, 2917, 2924, 2933,
- 2941, 2948, 2957, 2965, 2972, 2981, 2989, 2996,
- 3005, 3013, 3022, 3034, 3051, 3068, 3085, 3094,
- 3106, 3123, 3140, 3157, 3166, 3178, 3195, 3212,
- 3229, 3238, 3250, 3267, 3284, 3301, 3310, 3327,
- 3339, 3356, 3367, 3374, 3376, 3378, 3380, 3387,
- 3404, 3413, 3420, 3427, 3429, 3431, 3433, 3440
+ 664, 669, 671, 691, 707, 723, 738, 755,
+ 771, 787, 802, 819, 835, 851, 866, 883,
+ 899, 915, 930, 947, 963, 979, 994, 1001,
+ 1008, 1015, 1017, 1019, 1021, 1028, 1037, 1044,
+ 1053, 1061, 1068, 1077, 1085, 1092, 1101, 1109,
+ 1116, 1125, 1133, 1141, 1157, 1173, 1190, 1207,
+ 1224, 1240, 1256, 1273, 1290, 1307, 1323, 1339,
+ 1356, 1373, 1390, 1406, 1422, 1439, 1456, 1473,
+ 1489, 1505, 1521, 1537, 1552, 1569, 1585, 1601,
+ 1616, 1633, 1649, 1665, 1680, 1697, 1713, 1729,
+ 1744, 1761, 1777, 1793, 1808, 1815, 1822, 1829,
+ 1831, 1833, 1835, 1842, 1851, 1858, 1867, 1875,
+ 1882, 1891, 1899, 1906, 1915, 1923, 1930, 1939,
+ 1947, 1955, 1971, 1987, 2004, 2021, 2038, 2054,
+ 2070, 2087, 2104, 2121, 2137, 2153, 2170, 2187,
+ 2204, 2220, 2236, 2253, 2270, 2287, 2293, 2309,
+ 2325, 2340, 2357, 2373, 2389, 2404, 2421, 2437,
+ 2453, 2468, 2485, 2501, 2517, 2532, 2549, 2565,
+ 2581, 2596, 2603, 2610, 2617, 2619, 2621, 2623,
+ 2630, 2639, 2646, 2655, 2663, 2670, 2679, 2687,
+ 2694, 2703, 2711, 2718, 2727, 2735, 2743, 2759,
+ 2775, 2792, 2809, 2826, 2842, 2858, 2875, 2892,
+ 2909, 2925, 2941, 2958, 2975, 2992, 3008, 3024,
+ 3041, 3058, 3075, 3086, 3102, 3108, 3124, 3140,
+ 3155, 3172, 3188, 3204, 3219, 3236, 3252, 3268,
+ 3283, 3300, 3316, 3332, 3347, 3364, 3380, 3396,
+ 3411, 3418, 3425, 3432, 3434, 3436, 3438, 3445,
+ 3454, 3461, 3470, 3478, 3485, 3494, 3502, 3509,
+ 3518, 3526, 3533, 3542, 3550, 3558, 3574, 3590,
+ 3607, 3624, 3641, 3657, 3673, 3690, 3707, 3724,
+ 3740, 3756, 3773, 3790, 3807, 3823, 3839, 3856,
+ 3873, 3890, 3906, 3924, 3940, 3958, 3969, 3976,
+ 3978, 3980, 3982, 3989, 4006, 4015, 4022, 4029,
+ 4031, 4033, 4035, 4042
};
static const short _indic_syllable_machine_indicies[] = {
@@ -279,410 +281,485 @@ static const short _indic_syllable_machine_indicies[] = {
76, 73, 72, 72, 72, 72, 144, 72,
78, 78, 76, 1, 0, 146, 145, 148,
149, 150, 151, 152, 153, 76, 73, 147,
- 154, 155, 155, 144, 147, 156, 157, 147,
- 158, 159, 147, 161, 162, 163, 164, 4,
- 1, 160, 165, 160, 160, 35, 160, 166,
- 162, 167, 167, 4, 1, 160, 165, 160,
- 162, 167, 167, 4, 1, 160, 165, 160,
- 168, 160, 160, 160, 17, 169, 160, 1,
- 160, 165, 160, 160, 160, 160, 160, 168,
- 160, 170, 171, 172, 173, 4, 1, 160,
- 165, 160, 160, 33, 160, 174, 171, 175,
- 175, 4, 1, 160, 165, 160, 171, 175,
- 175, 4, 1, 160, 165, 160, 176, 160,
- 160, 160, 17, 177, 160, 1, 160, 165,
- 160, 160, 160, 160, 160, 176, 160, 178,
- 179, 180, 181, 4, 1, 160, 165, 160,
- 160, 31, 160, 182, 179, 183, 183, 4,
- 1, 160, 165, 160, 179, 183, 183, 4,
- 1, 160, 165, 160, 184, 160, 160, 160,
- 17, 185, 160, 1, 160, 165, 160, 160,
- 160, 160, 160, 184, 160, 186, 187, 188,
- 189, 4, 1, 160, 165, 160, 160, 29,
- 160, 190, 187, 191, 191, 4, 1, 160,
- 165, 160, 187, 191, 191, 4, 1, 160,
- 165, 160, 192, 160, 160, 160, 17, 193,
- 160, 1, 160, 165, 160, 160, 160, 160,
- 160, 192, 160, 194, 195, 196, 197, 4,
- 1, 160, 165, 160, 160, 27, 160, 198,
- 195, 199, 199, 4, 1, 160, 165, 160,
- 195, 199, 199, 4, 1, 160, 165, 160,
- 17, 200, 160, 1, 160, 165, 160, 201,
- 201, 160, 1, 160, 165, 160, 202, 160,
- 160, 203, 160, 165, 160, 165, 160, 204,
- 160, 205, 160, 202, 160, 160, 160, 160,
- 165, 160, 17, 160, 201, 201, 160, 1,
- 160, 165, 160, 201, 200, 160, 1, 160,
- 165, 160, 206, 26, 207, 208, 7, 1,
- 160, 165, 160, 26, 207, 208, 7, 1,
- 160, 165, 160, 207, 207, 7, 1, 160,
- 165, 160, 209, 23, 210, 211, 10, 1,
- 160, 165, 160, 23, 210, 211, 10, 1,
- 160, 165, 160, 210, 210, 10, 1, 160,
- 165, 160, 212, 20, 213, 214, 13, 1,
- 160, 165, 160, 20, 213, 214, 13, 1,
- 160, 165, 160, 213, 213, 13, 1, 160,
- 165, 160, 215, 17, 201, 216, 160, 1,
- 160, 165, 160, 17, 201, 216, 160, 1,
- 160, 165, 160, 194, 195, 199, 199, 4,
- 1, 160, 165, 160, 194, 195, 196, 199,
- 4, 1, 160, 165, 160, 160, 27, 160,
- 192, 160, 217, 160, 201, 201, 160, 1,
- 160, 165, 160, 160, 160, 160, 160, 192,
- 160, 192, 160, 160, 160, 201, 201, 160,
- 1, 160, 165, 160, 160, 160, 160, 160,
- 192, 160, 192, 160, 160, 160, 201, 193,
- 160, 1, 160, 165, 160, 160, 160, 160,
- 160, 192, 160, 186, 187, 191, 191, 4,
- 1, 160, 165, 160, 186, 187, 188, 191,
- 4, 1, 160, 165, 160, 160, 29, 160,
- 184, 160, 218, 160, 201, 201, 160, 1,
- 160, 165, 160, 160, 160, 160, 160, 184,
- 160, 184, 160, 160, 160, 201, 201, 160,
- 1, 160, 165, 160, 160, 160, 160, 160,
- 184, 160, 184, 160, 160, 160, 201, 185,
- 160, 1, 160, 165, 160, 160, 160, 160,
- 160, 184, 160, 178, 179, 183, 183, 4,
- 1, 160, 165, 160, 178, 179, 180, 183,
- 4, 1, 160, 165, 160, 160, 31, 160,
- 176, 160, 219, 160, 201, 201, 160, 1,
- 160, 165, 160, 160, 160, 160, 160, 176,
- 160, 176, 160, 160, 160, 201, 201, 160,
- 1, 160, 165, 160, 160, 160, 160, 160,
- 176, 160, 176, 160, 160, 160, 201, 177,
- 160, 1, 160, 165, 160, 160, 160, 160,
- 160, 176, 160, 170, 171, 175, 175, 4,
- 1, 160, 165, 160, 170, 171, 172, 175,
- 4, 1, 160, 165, 160, 160, 33, 160,
- 168, 160, 220, 160, 201, 201, 160, 1,
- 160, 165, 160, 160, 160, 160, 160, 168,
- 160, 168, 160, 160, 160, 201, 201, 160,
- 1, 160, 165, 160, 160, 160, 160, 160,
- 168, 160, 168, 160, 160, 160, 201, 169,
- 160, 1, 160, 165, 160, 160, 160, 160,
- 160, 168, 160, 161, 162, 167, 167, 4,
- 1, 160, 165, 160, 161, 162, 163, 167,
- 4, 1, 160, 165, 160, 160, 35, 160,
- 222, 223, 224, 225, 40, 37, 221, 226,
- 221, 221, 71, 221, 227, 223, 228, 225,
- 40, 37, 221, 226, 221, 223, 228, 225,
- 40, 37, 221, 226, 221, 229, 221, 221,
- 221, 53, 230, 221, 37, 221, 226, 221,
- 221, 221, 221, 221, 229, 221, 231, 232,
- 233, 234, 40, 37, 221, 226, 221, 221,
- 69, 221, 235, 232, 236, 236, 40, 37,
- 221, 226, 221, 232, 236, 236, 40, 37,
- 221, 226, 221, 237, 221, 221, 221, 53,
- 238, 221, 37, 221, 226, 221, 221, 221,
- 221, 221, 237, 221, 239, 240, 241, 242,
- 40, 37, 221, 226, 221, 221, 67, 221,
- 243, 240, 244, 244, 40, 37, 221, 226,
- 221, 240, 244, 244, 40, 37, 221, 226,
- 221, 245, 221, 221, 221, 53, 246, 221,
- 37, 221, 226, 221, 221, 221, 221, 221,
- 245, 221, 247, 248, 249, 250, 40, 37,
- 221, 226, 221, 221, 65, 221, 251, 248,
- 252, 252, 40, 37, 221, 226, 221, 248,
- 252, 252, 40, 37, 221, 226, 221, 253,
- 221, 221, 221, 53, 254, 221, 37, 221,
- 226, 221, 221, 221, 221, 221, 253, 221,
- 255, 256, 257, 258, 40, 37, 221, 226,
- 221, 221, 63, 221, 259, 256, 260, 260,
- 40, 37, 221, 226, 221, 256, 260, 260,
- 40, 37, 221, 226, 221, 53, 261, 221,
- 37, 221, 226, 221, 262, 262, 221, 37,
- 221, 226, 221, 263, 221, 221, 264, 221,
- 226, 221, 226, 221, 265, 221, 266, 221,
- 263, 221, 221, 221, 221, 226, 221, 53,
- 221, 262, 262, 221, 37, 221, 226, 221,
- 262, 261, 221, 37, 221, 226, 221, 267,
- 62, 268, 269, 43, 37, 221, 226, 221,
- 62, 268, 269, 43, 37, 221, 226, 221,
- 268, 268, 43, 37, 221, 226, 221, 270,
- 59, 271, 272, 46, 37, 221, 226, 221,
- 59, 271, 272, 46, 37, 221, 226, 221,
- 271, 271, 46, 37, 221, 226, 221, 273,
- 56, 274, 275, 49, 37, 221, 226, 221,
- 56, 274, 275, 49, 37, 221, 226, 221,
- 274, 274, 49, 37, 221, 226, 221, 276,
- 53, 262, 277, 221, 37, 221, 226, 221,
- 53, 262, 277, 221, 37, 221, 226, 221,
- 255, 256, 260, 260, 40, 37, 221, 226,
- 221, 255, 256, 257, 260, 40, 37, 221,
- 226, 221, 221, 63, 221, 253, 221, 278,
- 221, 262, 262, 221, 37, 221, 226, 221,
- 221, 221, 221, 221, 253, 221, 253, 221,
- 221, 221, 262, 262, 221, 37, 221, 226,
- 221, 221, 221, 221, 221, 253, 221, 253,
- 221, 221, 221, 262, 254, 221, 37, 221,
- 226, 221, 221, 221, 221, 221, 253, 221,
- 247, 248, 252, 252, 40, 37, 221, 226,
- 221, 247, 248, 249, 252, 40, 37, 221,
- 226, 221, 221, 65, 221, 245, 221, 279,
- 221, 262, 262, 221, 37, 221, 226, 221,
- 221, 221, 221, 221, 245, 221, 245, 221,
- 221, 221, 262, 262, 221, 37, 221, 226,
- 221, 221, 221, 221, 221, 245, 221, 245,
- 221, 221, 221, 262, 246, 221, 37, 221,
- 226, 221, 221, 221, 221, 221, 245, 221,
- 239, 240, 244, 244, 40, 37, 221, 226,
- 221, 239, 240, 241, 244, 40, 37, 221,
- 226, 221, 221, 67, 221, 237, 221, 280,
- 221, 262, 262, 221, 37, 221, 226, 221,
- 221, 221, 221, 221, 237, 221, 237, 221,
- 221, 221, 262, 262, 221, 37, 221, 226,
- 221, 221, 221, 221, 221, 237, 221, 237,
- 221, 221, 221, 262, 238, 221, 37, 221,
- 226, 221, 221, 221, 221, 221, 237, 221,
- 231, 232, 236, 236, 40, 37, 221, 226,
- 221, 231, 232, 233, 236, 40, 37, 221,
- 226, 221, 221, 69, 221, 229, 221, 281,
- 221, 262, 262, 221, 37, 221, 226, 221,
- 221, 221, 221, 221, 229, 221, 229, 221,
- 221, 221, 262, 262, 221, 37, 221, 226,
- 221, 221, 221, 221, 221, 229, 221, 229,
- 221, 221, 221, 262, 230, 221, 37, 221,
- 226, 221, 221, 221, 221, 221, 229, 221,
- 70, 39, 39, 40, 37, 221, 222, 223,
- 228, 225, 40, 37, 221, 226, 221, 283,
- 151, 284, 284, 76, 73, 282, 154, 282,
- 151, 284, 284, 76, 73, 282, 154, 282,
- 285, 282, 282, 282, 90, 286, 282, 73,
- 282, 154, 282, 282, 282, 282, 282, 285,
- 282, 287, 288, 289, 290, 76, 73, 282,
- 154, 282, 282, 106, 282, 291, 288, 292,
- 292, 76, 73, 282, 154, 282, 288, 292,
- 292, 76, 73, 282, 154, 282, 293, 282,
- 282, 282, 90, 294, 282, 73, 282, 154,
- 282, 282, 282, 282, 282, 293, 282, 295,
- 296, 297, 298, 76, 73, 282, 154, 282,
- 282, 104, 282, 299, 296, 300, 300, 76,
- 73, 282, 154, 282, 296, 300, 300, 76,
- 73, 282, 154, 282, 301, 282, 282, 282,
- 90, 302, 282, 73, 282, 154, 282, 282,
- 282, 282, 282, 301, 282, 303, 304, 305,
- 306, 76, 73, 282, 154, 282, 282, 102,
- 282, 307, 304, 308, 308, 76, 73, 282,
- 154, 282, 304, 308, 308, 76, 73, 282,
- 154, 282, 309, 282, 282, 282, 90, 310,
- 282, 73, 282, 154, 282, 282, 282, 282,
- 282, 309, 282, 311, 312, 313, 314, 76,
- 73, 282, 154, 282, 282, 100, 282, 315,
- 312, 316, 316, 76, 73, 282, 154, 282,
- 312, 316, 316, 76, 73, 282, 154, 282,
- 90, 317, 282, 73, 282, 154, 282, 318,
- 318, 282, 73, 282, 154, 282, 319, 282,
- 282, 320, 282, 154, 282, 154, 282, 321,
- 282, 322, 282, 319, 282, 282, 282, 282,
- 154, 282, 90, 282, 318, 318, 282, 73,
- 282, 154, 282, 318, 317, 282, 73, 282,
- 154, 282, 323, 99, 324, 325, 80, 73,
- 282, 154, 282, 99, 324, 325, 80, 73,
- 282, 154, 282, 324, 324, 80, 73, 282,
- 154, 282, 326, 96, 327, 328, 83, 73,
- 282, 154, 282, 96, 327, 328, 83, 73,
- 282, 154, 282, 327, 327, 83, 73, 282,
- 154, 282, 329, 93, 330, 331, 86, 73,
- 282, 154, 282, 93, 330, 331, 86, 73,
- 282, 154, 282, 330, 330, 86, 73, 282,
- 154, 282, 332, 90, 318, 333, 282, 73,
- 282, 154, 282, 90, 318, 333, 282, 73,
- 282, 154, 282, 311, 312, 316, 316, 76,
- 73, 282, 154, 282, 311, 312, 313, 316,
- 76, 73, 282, 154, 282, 282, 100, 282,
- 309, 282, 334, 282, 318, 318, 282, 73,
- 282, 154, 282, 282, 282, 282, 282, 309,
- 282, 309, 282, 282, 282, 318, 318, 282,
- 73, 282, 154, 282, 282, 282, 282, 282,
- 309, 282, 309, 282, 282, 282, 318, 310,
- 282, 73, 282, 154, 282, 282, 282, 282,
- 282, 309, 282, 303, 304, 308, 308, 76,
- 73, 282, 154, 282, 303, 304, 305, 308,
- 76, 73, 282, 154, 282, 282, 102, 282,
- 301, 282, 335, 282, 318, 318, 282, 73,
- 282, 154, 282, 282, 282, 282, 282, 301,
- 282, 301, 282, 282, 282, 318, 318, 282,
- 73, 282, 154, 282, 282, 282, 282, 282,
- 301, 282, 301, 282, 282, 282, 318, 302,
- 282, 73, 282, 154, 282, 282, 282, 282,
- 282, 301, 282, 295, 296, 300, 300, 76,
- 73, 282, 154, 282, 295, 296, 297, 300,
- 76, 73, 282, 154, 282, 282, 104, 282,
- 293, 282, 336, 282, 318, 318, 282, 73,
- 282, 154, 282, 282, 282, 282, 282, 293,
- 282, 293, 282, 282, 282, 318, 318, 282,
- 73, 282, 154, 282, 282, 282, 282, 282,
- 293, 282, 293, 282, 282, 282, 318, 294,
- 282, 73, 282, 154, 282, 282, 282, 282,
- 282, 293, 282, 287, 288, 292, 292, 76,
- 73, 282, 154, 282, 287, 288, 289, 292,
- 76, 73, 282, 154, 282, 282, 106, 282,
- 285, 282, 337, 282, 318, 318, 282, 73,
- 282, 154, 282, 282, 282, 282, 282, 285,
- 282, 285, 282, 282, 282, 318, 318, 282,
- 73, 282, 154, 282, 282, 282, 282, 282,
- 285, 282, 285, 282, 282, 282, 318, 286,
- 282, 73, 282, 154, 282, 282, 282, 282,
- 282, 285, 282, 107, 75, 75, 76, 73,
- 338, 338, 338, 338, 144, 338, 150, 151,
- 284, 284, 76, 73, 282, 154, 282, 107,
- 75, 75, 76, 73, 338, 340, 341, 342,
- 343, 112, 109, 339, 344, 339, 339, 143,
- 339, 345, 341, 343, 343, 112, 109, 339,
- 344, 339, 341, 343, 343, 112, 109, 339,
- 344, 339, 346, 339, 339, 339, 125, 347,
- 339, 109, 339, 344, 339, 339, 339, 339,
- 339, 346, 339, 348, 349, 350, 351, 112,
- 109, 339, 344, 339, 339, 141, 339, 352,
- 349, 353, 353, 112, 109, 339, 344, 339,
- 349, 353, 353, 112, 109, 339, 344, 339,
- 354, 339, 339, 339, 125, 355, 339, 109,
- 339, 344, 339, 339, 339, 339, 339, 354,
- 339, 356, 357, 358, 359, 112, 109, 339,
- 344, 339, 339, 139, 339, 360, 357, 361,
- 361, 112, 109, 339, 344, 339, 357, 361,
- 361, 112, 109, 339, 344, 339, 362, 339,
- 339, 339, 125, 363, 339, 109, 339, 344,
- 339, 339, 339, 339, 339, 362, 339, 364,
- 365, 366, 367, 112, 109, 339, 344, 339,
- 339, 137, 339, 368, 365, 369, 369, 112,
- 109, 339, 344, 339, 365, 369, 369, 112,
- 109, 339, 344, 339, 370, 339, 339, 339,
- 125, 371, 339, 109, 339, 344, 339, 339,
- 339, 339, 339, 370, 339, 372, 373, 374,
- 375, 112, 109, 339, 344, 339, 339, 135,
- 339, 376, 373, 377, 377, 112, 109, 339,
- 344, 339, 373, 377, 377, 112, 109, 339,
- 344, 339, 125, 378, 339, 109, 339, 344,
- 339, 379, 379, 339, 109, 339, 344, 339,
- 380, 339, 339, 381, 339, 344, 339, 344,
- 339, 382, 339, 383, 339, 380, 339, 339,
- 339, 339, 344, 339, 125, 339, 379, 379,
- 339, 109, 339, 344, 339, 379, 378, 339,
- 109, 339, 344, 339, 384, 134, 385, 386,
- 115, 109, 339, 344, 339, 134, 385, 386,
- 115, 109, 339, 344, 339, 385, 385, 115,
- 109, 339, 344, 339, 387, 131, 388, 389,
- 118, 109, 339, 344, 339, 131, 388, 389,
- 118, 109, 339, 344, 339, 388, 388, 118,
- 109, 339, 344, 339, 390, 128, 391, 392,
- 121, 109, 339, 344, 339, 128, 391, 392,
- 121, 109, 339, 344, 339, 391, 391, 121,
- 109, 339, 344, 339, 393, 125, 379, 394,
- 339, 109, 339, 344, 339, 125, 379, 394,
- 339, 109, 339, 344, 339, 372, 373, 377,
- 377, 112, 109, 339, 344, 339, 372, 373,
- 374, 377, 112, 109, 339, 344, 339, 339,
- 135, 339, 370, 339, 395, 339, 379, 379,
- 339, 109, 339, 344, 339, 339, 339, 339,
- 339, 370, 339, 370, 339, 339, 339, 379,
- 379, 339, 109, 339, 344, 339, 339, 339,
- 339, 339, 370, 339, 370, 339, 339, 339,
- 379, 371, 339, 109, 339, 344, 339, 339,
- 339, 339, 339, 370, 339, 364, 365, 369,
- 369, 112, 109, 339, 344, 339, 364, 365,
- 366, 369, 112, 109, 339, 344, 339, 339,
- 137, 339, 362, 339, 396, 339, 379, 379,
- 339, 109, 339, 344, 339, 339, 339, 339,
- 339, 362, 339, 362, 339, 339, 339, 379,
- 379, 339, 109, 339, 344, 339, 339, 339,
- 339, 339, 362, 339, 362, 339, 339, 339,
- 379, 363, 339, 109, 339, 344, 339, 339,
- 339, 339, 339, 362, 339, 356, 357, 361,
- 361, 112, 109, 339, 344, 339, 356, 357,
- 358, 361, 112, 109, 339, 344, 339, 339,
- 139, 339, 354, 339, 397, 339, 379, 379,
- 339, 109, 339, 344, 339, 339, 339, 339,
- 339, 354, 339, 354, 339, 339, 339, 379,
- 379, 339, 109, 339, 344, 339, 339, 339,
- 339, 339, 354, 339, 354, 339, 339, 339,
- 379, 355, 339, 109, 339, 344, 339, 339,
- 339, 339, 339, 354, 339, 348, 349, 353,
- 353, 112, 109, 339, 344, 339, 348, 349,
- 350, 353, 112, 109, 339, 344, 339, 339,
- 141, 339, 346, 339, 398, 339, 379, 379,
- 339, 109, 339, 344, 339, 339, 339, 339,
- 339, 346, 339, 346, 339, 339, 339, 379,
- 379, 339, 109, 339, 344, 339, 339, 339,
- 339, 339, 346, 339, 346, 339, 339, 339,
- 379, 347, 339, 109, 339, 344, 339, 339,
- 339, 339, 339, 346, 339, 340, 341, 343,
- 343, 112, 109, 339, 344, 339, 148, 149,
- 150, 151, 399, 284, 76, 73, 282, 154,
- 155, 155, 144, 282, 282, 148, 282, 161,
- 400, 163, 164, 4, 1, 160, 165, 160,
- 160, 35, 160, 168, 149, 150, 151, 401,
- 402, 76, 403, 160, 404, 160, 155, 144,
- 160, 160, 168, 160, 107, 405, 405, 76,
- 403, 160, 165, 160, 160, 144, 160, 406,
- 160, 160, 407, 160, 404, 160, 404, 160,
- 408, 160, 205, 160, 406, 160, 160, 160,
- 160, 404, 160, 168, 160, 220, 107, 405,
- 405, 76, 403, 160, 165, 160, 160, 160,
- 160, 160, 168, 160, 410, 409, 411, 411,
- 409, 146, 409, 412, 409, 411, 411, 409,
- 146, 409, 412, 409, 413, 409, 409, 414,
- 409, 412, 409, 412, 409, 415, 409, 416,
- 409, 413, 409, 409, 409, 409, 412, 409,
- 148, 338, 338, 338, 338, 338, 338, 338,
- 338, 338, 155, 338, 338, 338, 338, 148,
- 338, 0
+ 154, 155, 155, 144, 147, 156, 157, 158,
+ 159, 160, 147, 162, 163, 164, 165, 4,
+ 1, 161, 166, 161, 161, 35, 161, 161,
+ 161, 167, 161, 168, 163, 169, 169, 4,
+ 1, 161, 166, 161, 161, 161, 161, 161,
+ 161, 167, 161, 163, 169, 169, 4, 1,
+ 161, 166, 161, 161, 161, 161, 161, 161,
+ 167, 161, 170, 161, 161, 161, 17, 171,
+ 161, 1, 161, 166, 161, 161, 161, 161,
+ 161, 170, 161, 172, 173, 174, 175, 4,
+ 1, 161, 166, 161, 161, 33, 161, 161,
+ 161, 167, 161, 176, 173, 177, 177, 4,
+ 1, 161, 166, 161, 161, 161, 161, 161,
+ 161, 167, 161, 173, 177, 177, 4, 1,
+ 161, 166, 161, 161, 161, 161, 161, 161,
+ 167, 161, 178, 161, 161, 161, 17, 179,
+ 161, 1, 161, 166, 161, 161, 161, 161,
+ 161, 178, 161, 180, 181, 182, 183, 4,
+ 1, 161, 166, 161, 161, 31, 161, 161,
+ 161, 167, 161, 184, 181, 185, 185, 4,
+ 1, 161, 166, 161, 161, 161, 161, 161,
+ 161, 167, 161, 181, 185, 185, 4, 1,
+ 161, 166, 161, 161, 161, 161, 161, 161,
+ 167, 161, 186, 161, 161, 161, 17, 187,
+ 161, 1, 161, 166, 161, 161, 161, 161,
+ 161, 186, 161, 188, 189, 190, 191, 4,
+ 1, 161, 166, 161, 161, 29, 161, 161,
+ 161, 167, 161, 192, 189, 193, 193, 4,
+ 1, 161, 166, 161, 161, 161, 161, 161,
+ 161, 167, 161, 189, 193, 193, 4, 1,
+ 161, 166, 161, 161, 161, 161, 161, 161,
+ 167, 161, 194, 161, 161, 161, 17, 195,
+ 161, 1, 161, 166, 161, 161, 161, 161,
+ 161, 194, 161, 196, 197, 198, 199, 4,
+ 1, 161, 166, 161, 161, 27, 161, 161,
+ 161, 167, 161, 200, 197, 201, 201, 4,
+ 1, 161, 166, 161, 161, 161, 161, 161,
+ 161, 167, 161, 197, 201, 201, 4, 1,
+ 161, 166, 161, 161, 161, 161, 161, 161,
+ 167, 161, 17, 202, 161, 1, 161, 166,
+ 161, 203, 203, 161, 1, 161, 166, 161,
+ 204, 161, 161, 205, 161, 166, 161, 166,
+ 161, 206, 161, 207, 161, 204, 161, 161,
+ 161, 161, 166, 161, 17, 161, 203, 203,
+ 161, 1, 161, 166, 161, 203, 202, 161,
+ 1, 161, 166, 161, 208, 26, 209, 210,
+ 7, 1, 161, 166, 161, 26, 209, 210,
+ 7, 1, 161, 166, 161, 209, 209, 7,
+ 1, 161, 166, 161, 211, 23, 212, 213,
+ 10, 1, 161, 166, 161, 23, 212, 213,
+ 10, 1, 161, 166, 161, 212, 212, 10,
+ 1, 161, 166, 161, 214, 20, 215, 216,
+ 13, 1, 161, 166, 161, 20, 215, 216,
+ 13, 1, 161, 166, 161, 215, 215, 13,
+ 1, 161, 166, 161, 217, 17, 203, 218,
+ 161, 1, 161, 166, 161, 17, 203, 218,
+ 161, 1, 161, 166, 161, 197, 201, 201,
+ 4, 1, 161, 166, 161, 196, 197, 201,
+ 201, 4, 1, 161, 166, 161, 161, 161,
+ 161, 161, 161, 167, 161, 196, 197, 198,
+ 201, 4, 1, 161, 166, 161, 161, 27,
+ 161, 161, 161, 167, 161, 194, 161, 219,
+ 161, 203, 203, 161, 1, 161, 166, 161,
+ 161, 161, 161, 161, 194, 161, 194, 161,
+ 161, 161, 203, 203, 161, 1, 161, 166,
+ 161, 161, 161, 161, 161, 194, 161, 194,
+ 161, 161, 161, 203, 195, 161, 1, 161,
+ 166, 161, 161, 161, 161, 161, 194, 161,
+ 188, 189, 193, 193, 4, 1, 161, 166,
+ 161, 161, 161, 161, 161, 161, 167, 161,
+ 188, 189, 190, 193, 4, 1, 161, 166,
+ 161, 161, 29, 161, 161, 161, 167, 161,
+ 186, 161, 220, 161, 203, 203, 161, 1,
+ 161, 166, 161, 161, 161, 161, 161, 186,
+ 161, 186, 161, 161, 161, 203, 203, 161,
+ 1, 161, 166, 161, 161, 161, 161, 161,
+ 186, 161, 186, 161, 161, 161, 203, 187,
+ 161, 1, 161, 166, 161, 161, 161, 161,
+ 161, 186, 161, 180, 181, 185, 185, 4,
+ 1, 161, 166, 161, 161, 161, 161, 161,
+ 161, 167, 161, 180, 181, 182, 185, 4,
+ 1, 161, 166, 161, 161, 31, 161, 161,
+ 161, 167, 161, 178, 161, 221, 161, 203,
+ 203, 161, 1, 161, 166, 161, 161, 161,
+ 161, 161, 178, 161, 178, 161, 161, 161,
+ 203, 203, 161, 1, 161, 166, 161, 161,
+ 161, 161, 161, 178, 161, 178, 161, 161,
+ 161, 203, 179, 161, 1, 161, 166, 161,
+ 161, 161, 161, 161, 178, 161, 172, 173,
+ 177, 177, 4, 1, 161, 166, 161, 161,
+ 161, 161, 161, 161, 167, 161, 172, 173,
+ 174, 177, 4, 1, 161, 166, 161, 161,
+ 33, 161, 161, 161, 167, 161, 170, 161,
+ 222, 161, 203, 203, 161, 1, 161, 166,
+ 161, 161, 161, 161, 161, 170, 161, 170,
+ 161, 161, 161, 203, 203, 161, 1, 161,
+ 166, 161, 161, 161, 161, 161, 170, 161,
+ 170, 161, 161, 161, 203, 171, 161, 1,
+ 161, 166, 161, 161, 161, 161, 161, 170,
+ 161, 162, 163, 169, 169, 4, 1, 161,
+ 166, 161, 161, 161, 161, 161, 161, 167,
+ 161, 162, 163, 164, 169, 4, 1, 161,
+ 166, 161, 161, 35, 161, 161, 161, 167,
+ 161, 224, 225, 226, 227, 40, 37, 223,
+ 228, 223, 223, 71, 223, 223, 223, 229,
+ 223, 230, 225, 231, 227, 40, 37, 223,
+ 228, 223, 223, 223, 223, 223, 223, 229,
+ 223, 225, 231, 227, 40, 37, 223, 228,
+ 223, 223, 223, 223, 223, 223, 229, 223,
+ 232, 223, 223, 223, 53, 233, 223, 37,
+ 223, 228, 223, 223, 223, 223, 223, 232,
+ 223, 234, 235, 236, 237, 40, 37, 223,
+ 228, 223, 223, 69, 223, 223, 223, 229,
+ 223, 238, 235, 239, 239, 40, 37, 223,
+ 228, 223, 223, 223, 223, 223, 223, 229,
+ 223, 235, 239, 239, 40, 37, 223, 228,
+ 223, 223, 223, 223, 223, 223, 229, 223,
+ 240, 223, 223, 223, 53, 241, 223, 37,
+ 223, 228, 223, 223, 223, 223, 223, 240,
+ 223, 242, 243, 244, 245, 40, 37, 223,
+ 228, 223, 223, 67, 223, 223, 223, 229,
+ 223, 246, 243, 247, 247, 40, 37, 223,
+ 228, 223, 223, 223, 223, 223, 223, 229,
+ 223, 243, 247, 247, 40, 37, 223, 228,
+ 223, 223, 223, 223, 223, 223, 229, 223,
+ 248, 223, 223, 223, 53, 249, 223, 37,
+ 223, 228, 223, 223, 223, 223, 223, 248,
+ 223, 250, 251, 252, 253, 40, 37, 223,
+ 228, 223, 223, 65, 223, 223, 223, 229,
+ 223, 254, 251, 255, 255, 40, 37, 223,
+ 228, 223, 223, 223, 223, 223, 223, 229,
+ 223, 251, 255, 255, 40, 37, 223, 228,
+ 223, 223, 223, 223, 223, 223, 229, 223,
+ 256, 223, 223, 223, 53, 257, 223, 37,
+ 223, 228, 223, 223, 223, 223, 223, 256,
+ 223, 258, 259, 260, 261, 40, 37, 223,
+ 228, 223, 223, 63, 223, 223, 223, 229,
+ 223, 262, 259, 263, 263, 40, 37, 223,
+ 228, 223, 223, 223, 223, 223, 223, 229,
+ 223, 259, 263, 263, 40, 37, 223, 228,
+ 223, 223, 223, 223, 223, 223, 229, 223,
+ 53, 264, 223, 37, 223, 228, 223, 265,
+ 265, 223, 37, 223, 228, 223, 266, 223,
+ 223, 267, 223, 228, 223, 228, 223, 268,
+ 223, 269, 223, 266, 223, 223, 223, 223,
+ 228, 223, 53, 223, 265, 265, 223, 37,
+ 223, 228, 223, 265, 264, 223, 37, 223,
+ 228, 223, 270, 62, 271, 272, 43, 37,
+ 223, 228, 223, 62, 271, 272, 43, 37,
+ 223, 228, 223, 271, 271, 43, 37, 223,
+ 228, 223, 273, 59, 274, 275, 46, 37,
+ 223, 228, 223, 59, 274, 275, 46, 37,
+ 223, 228, 223, 274, 274, 46, 37, 223,
+ 228, 223, 276, 56, 277, 278, 49, 37,
+ 223, 228, 223, 56, 277, 278, 49, 37,
+ 223, 228, 223, 277, 277, 49, 37, 223,
+ 228, 223, 279, 53, 265, 280, 223, 37,
+ 223, 228, 223, 53, 265, 280, 223, 37,
+ 223, 228, 223, 259, 263, 263, 40, 37,
+ 223, 228, 223, 258, 259, 263, 263, 40,
+ 37, 223, 228, 223, 223, 223, 223, 223,
+ 223, 229, 223, 258, 259, 260, 263, 40,
+ 37, 223, 228, 223, 223, 63, 223, 223,
+ 223, 229, 223, 256, 223, 281, 223, 265,
+ 265, 223, 37, 223, 228, 223, 223, 223,
+ 223, 223, 256, 223, 256, 223, 223, 223,
+ 265, 265, 223, 37, 223, 228, 223, 223,
+ 223, 223, 223, 256, 223, 256, 223, 223,
+ 223, 265, 257, 223, 37, 223, 228, 223,
+ 223, 223, 223, 223, 256, 223, 250, 251,
+ 255, 255, 40, 37, 223, 228, 223, 223,
+ 223, 223, 223, 223, 229, 223, 250, 251,
+ 252, 255, 40, 37, 223, 228, 223, 223,
+ 65, 223, 223, 223, 229, 223, 248, 223,
+ 282, 223, 265, 265, 223, 37, 223, 228,
+ 223, 223, 223, 223, 223, 248, 223, 248,
+ 223, 223, 223, 265, 265, 223, 37, 223,
+ 228, 223, 223, 223, 223, 223, 248, 223,
+ 248, 223, 223, 223, 265, 249, 223, 37,
+ 223, 228, 223, 223, 223, 223, 223, 248,
+ 223, 242, 243, 247, 247, 40, 37, 223,
+ 228, 223, 223, 223, 223, 223, 223, 229,
+ 223, 242, 243, 244, 247, 40, 37, 223,
+ 228, 223, 223, 67, 223, 223, 223, 229,
+ 223, 240, 223, 283, 223, 265, 265, 223,
+ 37, 223, 228, 223, 223, 223, 223, 223,
+ 240, 223, 240, 223, 223, 223, 265, 265,
+ 223, 37, 223, 228, 223, 223, 223, 223,
+ 223, 240, 223, 240, 223, 223, 223, 265,
+ 241, 223, 37, 223, 228, 223, 223, 223,
+ 223, 223, 240, 223, 234, 235, 239, 239,
+ 40, 37, 223, 228, 223, 223, 223, 223,
+ 223, 223, 229, 223, 234, 235, 236, 239,
+ 40, 37, 223, 228, 223, 223, 69, 223,
+ 223, 223, 229, 223, 232, 223, 284, 223,
+ 265, 265, 223, 37, 223, 228, 223, 223,
+ 223, 223, 223, 232, 223, 232, 223, 223,
+ 223, 265, 265, 223, 37, 223, 228, 223,
+ 223, 223, 223, 223, 232, 223, 232, 223,
+ 223, 223, 265, 233, 223, 37, 223, 228,
+ 223, 223, 223, 223, 223, 232, 223, 70,
+ 39, 39, 40, 37, 223, 224, 225, 231,
+ 227, 40, 37, 223, 228, 223, 223, 223,
+ 223, 223, 223, 229, 223, 286, 151, 287,
+ 287, 76, 73, 285, 154, 285, 285, 285,
+ 285, 285, 285, 158, 285, 151, 287, 287,
+ 76, 73, 285, 154, 285, 285, 285, 285,
+ 285, 285, 158, 285, 288, 285, 285, 285,
+ 90, 289, 285, 73, 285, 154, 285, 285,
+ 285, 285, 285, 288, 285, 290, 291, 292,
+ 293, 76, 73, 285, 154, 285, 285, 106,
+ 285, 285, 285, 158, 285, 294, 291, 295,
+ 295, 76, 73, 285, 154, 285, 285, 285,
+ 285, 285, 285, 158, 285, 291, 295, 295,
+ 76, 73, 285, 154, 285, 285, 285, 285,
+ 285, 285, 158, 285, 296, 285, 285, 285,
+ 90, 297, 285, 73, 285, 154, 285, 285,
+ 285, 285, 285, 296, 285, 298, 299, 300,
+ 301, 76, 73, 285, 154, 285, 285, 104,
+ 285, 285, 285, 158, 285, 302, 299, 303,
+ 303, 76, 73, 285, 154, 285, 285, 285,
+ 285, 285, 285, 158, 285, 299, 303, 303,
+ 76, 73, 285, 154, 285, 285, 285, 285,
+ 285, 285, 158, 285, 304, 285, 285, 285,
+ 90, 305, 285, 73, 285, 154, 285, 285,
+ 285, 285, 285, 304, 285, 306, 307, 308,
+ 309, 76, 73, 285, 154, 285, 285, 102,
+ 285, 285, 285, 158, 285, 310, 307, 311,
+ 311, 76, 73, 285, 154, 285, 285, 285,
+ 285, 285, 285, 158, 285, 307, 311, 311,
+ 76, 73, 285, 154, 285, 285, 285, 285,
+ 285, 285, 158, 285, 312, 285, 285, 285,
+ 90, 313, 285, 73, 285, 154, 285, 285,
+ 285, 285, 285, 312, 285, 314, 315, 316,
+ 317, 76, 73, 285, 154, 285, 285, 100,
+ 285, 285, 285, 158, 285, 318, 315, 319,
+ 319, 76, 73, 285, 154, 285, 285, 285,
+ 285, 285, 285, 158, 285, 315, 319, 319,
+ 76, 73, 285, 154, 285, 285, 285, 285,
+ 285, 285, 158, 285, 90, 320, 285, 73,
+ 285, 154, 285, 321, 321, 285, 73, 285,
+ 154, 285, 322, 285, 285, 323, 285, 154,
+ 285, 154, 285, 324, 285, 325, 285, 322,
+ 285, 285, 285, 285, 154, 285, 90, 285,
+ 321, 321, 285, 73, 285, 154, 285, 321,
+ 320, 285, 73, 285, 154, 285, 326, 99,
+ 327, 328, 80, 73, 285, 154, 285, 99,
+ 327, 328, 80, 73, 285, 154, 285, 327,
+ 327, 80, 73, 285, 154, 285, 329, 96,
+ 330, 331, 83, 73, 285, 154, 285, 96,
+ 330, 331, 83, 73, 285, 154, 285, 330,
+ 330, 83, 73, 285, 154, 285, 332, 93,
+ 333, 334, 86, 73, 285, 154, 285, 93,
+ 333, 334, 86, 73, 285, 154, 285, 333,
+ 333, 86, 73, 285, 154, 285, 335, 90,
+ 321, 336, 285, 73, 285, 154, 285, 90,
+ 321, 336, 285, 73, 285, 154, 285, 315,
+ 319, 319, 76, 73, 285, 154, 285, 314,
+ 315, 319, 319, 76, 73, 285, 154, 285,
+ 285, 285, 285, 285, 285, 158, 285, 314,
+ 315, 316, 319, 76, 73, 285, 154, 285,
+ 285, 100, 285, 285, 285, 158, 285, 312,
+ 285, 337, 285, 321, 321, 285, 73, 285,
+ 154, 285, 285, 285, 285, 285, 312, 285,
+ 312, 285, 285, 285, 321, 321, 285, 73,
+ 285, 154, 285, 285, 285, 285, 285, 312,
+ 285, 312, 285, 285, 285, 321, 313, 285,
+ 73, 285, 154, 285, 285, 285, 285, 285,
+ 312, 285, 306, 307, 311, 311, 76, 73,
+ 285, 154, 285, 285, 285, 285, 285, 285,
+ 158, 285, 306, 307, 308, 311, 76, 73,
+ 285, 154, 285, 285, 102, 285, 285, 285,
+ 158, 285, 304, 285, 338, 285, 321, 321,
+ 285, 73, 285, 154, 285, 285, 285, 285,
+ 285, 304, 285, 304, 285, 285, 285, 321,
+ 321, 285, 73, 285, 154, 285, 285, 285,
+ 285, 285, 304, 285, 304, 285, 285, 285,
+ 321, 305, 285, 73, 285, 154, 285, 285,
+ 285, 285, 285, 304, 285, 298, 299, 303,
+ 303, 76, 73, 285, 154, 285, 285, 285,
+ 285, 285, 285, 158, 285, 298, 299, 300,
+ 303, 76, 73, 285, 154, 285, 285, 104,
+ 285, 285, 285, 158, 285, 296, 285, 339,
+ 285, 321, 321, 285, 73, 285, 154, 285,
+ 285, 285, 285, 285, 296, 285, 296, 285,
+ 285, 285, 321, 321, 285, 73, 285, 154,
+ 285, 285, 285, 285, 285, 296, 285, 296,
+ 285, 285, 285, 321, 297, 285, 73, 285,
+ 154, 285, 285, 285, 285, 285, 296, 285,
+ 290, 291, 295, 295, 76, 73, 285, 154,
+ 285, 285, 285, 285, 285, 285, 158, 285,
+ 290, 291, 292, 295, 76, 73, 285, 154,
+ 285, 285, 106, 285, 285, 285, 158, 285,
+ 288, 285, 340, 285, 321, 321, 285, 73,
+ 285, 154, 285, 285, 285, 285, 285, 288,
+ 285, 288, 285, 285, 285, 321, 321, 285,
+ 73, 285, 154, 285, 285, 285, 285, 285,
+ 288, 285, 288, 285, 285, 285, 321, 289,
+ 285, 73, 285, 154, 285, 285, 285, 285,
+ 285, 288, 285, 107, 75, 75, 76, 73,
+ 341, 341, 341, 341, 144, 341, 150, 151,
+ 287, 287, 76, 73, 285, 154, 285, 285,
+ 285, 285, 285, 285, 158, 285, 107, 75,
+ 75, 76, 73, 341, 343, 344, 345, 346,
+ 112, 109, 342, 347, 342, 342, 143, 342,
+ 342, 342, 348, 342, 349, 344, 346, 346,
+ 112, 109, 342, 347, 342, 342, 342, 342,
+ 342, 342, 348, 342, 344, 346, 346, 112,
+ 109, 342, 347, 342, 342, 342, 342, 342,
+ 342, 348, 342, 350, 342, 342, 342, 125,
+ 351, 342, 109, 342, 347, 342, 342, 342,
+ 342, 342, 350, 342, 352, 353, 354, 355,
+ 112, 109, 342, 347, 342, 342, 141, 342,
+ 342, 342, 348, 342, 356, 353, 357, 357,
+ 112, 109, 342, 347, 342, 342, 342, 342,
+ 342, 342, 348, 342, 353, 357, 357, 112,
+ 109, 342, 347, 342, 342, 342, 342, 342,
+ 342, 348, 342, 358, 342, 342, 342, 125,
+ 359, 342, 109, 342, 347, 342, 342, 342,
+ 342, 342, 358, 342, 360, 361, 362, 363,
+ 112, 109, 342, 347, 342, 342, 139, 342,
+ 342, 342, 348, 342, 364, 361, 365, 365,
+ 112, 109, 342, 347, 342, 342, 342, 342,
+ 342, 342, 348, 342, 361, 365, 365, 112,
+ 109, 342, 347, 342, 342, 342, 342, 342,
+ 342, 348, 342, 366, 342, 342, 342, 125,
+ 367, 342, 109, 342, 347, 342, 342, 342,
+ 342, 342, 366, 342, 368, 369, 370, 371,
+ 112, 109, 342, 347, 342, 342, 137, 342,
+ 342, 342, 348, 342, 372, 369, 373, 373,
+ 112, 109, 342, 347, 342, 342, 342, 342,
+ 342, 342, 348, 342, 369, 373, 373, 112,
+ 109, 342, 347, 342, 342, 342, 342, 342,
+ 342, 348, 342, 374, 342, 342, 342, 125,
+ 375, 342, 109, 342, 347, 342, 342, 342,
+ 342, 342, 374, 342, 376, 377, 378, 379,
+ 112, 109, 342, 347, 342, 342, 135, 342,
+ 342, 342, 348, 342, 380, 377, 381, 381,
+ 112, 109, 342, 347, 342, 342, 342, 342,
+ 342, 342, 348, 342, 377, 381, 381, 112,
+ 109, 342, 347, 342, 342, 342, 342, 342,
+ 342, 348, 342, 125, 382, 342, 109, 342,
+ 347, 342, 383, 383, 342, 109, 342, 347,
+ 342, 384, 342, 342, 385, 342, 347, 342,
+ 347, 342, 386, 342, 387, 342, 384, 342,
+ 342, 342, 342, 347, 342, 125, 342, 383,
+ 383, 342, 109, 342, 347, 342, 383, 382,
+ 342, 109, 342, 347, 342, 388, 134, 389,
+ 390, 115, 109, 342, 347, 342, 134, 389,
+ 390, 115, 109, 342, 347, 342, 389, 389,
+ 115, 109, 342, 347, 342, 391, 131, 392,
+ 393, 118, 109, 342, 347, 342, 131, 392,
+ 393, 118, 109, 342, 347, 342, 392, 392,
+ 118, 109, 342, 347, 342, 394, 128, 395,
+ 396, 121, 109, 342, 347, 342, 128, 395,
+ 396, 121, 109, 342, 347, 342, 395, 395,
+ 121, 109, 342, 347, 342, 397, 125, 383,
+ 398, 342, 109, 342, 347, 342, 125, 383,
+ 398, 342, 109, 342, 347, 342, 377, 381,
+ 381, 112, 109, 342, 347, 342, 376, 377,
+ 381, 381, 112, 109, 342, 347, 342, 342,
+ 342, 342, 342, 342, 348, 342, 376, 377,
+ 378, 381, 112, 109, 342, 347, 342, 342,
+ 135, 342, 342, 342, 348, 342, 374, 342,
+ 399, 342, 383, 383, 342, 109, 342, 347,
+ 342, 342, 342, 342, 342, 374, 342, 374,
+ 342, 342, 342, 383, 383, 342, 109, 342,
+ 347, 342, 342, 342, 342, 342, 374, 342,
+ 374, 342, 342, 342, 383, 375, 342, 109,
+ 342, 347, 342, 342, 342, 342, 342, 374,
+ 342, 368, 369, 373, 373, 112, 109, 342,
+ 347, 342, 342, 342, 342, 342, 342, 348,
+ 342, 368, 369, 370, 373, 112, 109, 342,
+ 347, 342, 342, 137, 342, 342, 342, 348,
+ 342, 366, 342, 400, 342, 383, 383, 342,
+ 109, 342, 347, 342, 342, 342, 342, 342,
+ 366, 342, 366, 342, 342, 342, 383, 383,
+ 342, 109, 342, 347, 342, 342, 342, 342,
+ 342, 366, 342, 366, 342, 342, 342, 383,
+ 367, 342, 109, 342, 347, 342, 342, 342,
+ 342, 342, 366, 342, 360, 361, 365, 365,
+ 112, 109, 342, 347, 342, 342, 342, 342,
+ 342, 342, 348, 342, 360, 361, 362, 365,
+ 112, 109, 342, 347, 342, 342, 139, 342,
+ 342, 342, 348, 342, 358, 342, 401, 342,
+ 383, 383, 342, 109, 342, 347, 342, 342,
+ 342, 342, 342, 358, 342, 358, 342, 342,
+ 342, 383, 383, 342, 109, 342, 347, 342,
+ 342, 342, 342, 342, 358, 342, 358, 342,
+ 342, 342, 383, 359, 342, 109, 342, 347,
+ 342, 342, 342, 342, 342, 358, 342, 352,
+ 353, 357, 357, 112, 109, 342, 347, 342,
+ 342, 342, 342, 342, 342, 348, 342, 352,
+ 353, 354, 357, 112, 109, 342, 347, 342,
+ 342, 141, 342, 342, 342, 348, 342, 350,
+ 342, 402, 342, 383, 383, 342, 109, 342,
+ 347, 342, 342, 342, 342, 342, 350, 342,
+ 350, 342, 342, 342, 383, 383, 342, 109,
+ 342, 347, 342, 342, 342, 342, 342, 350,
+ 342, 350, 342, 342, 342, 383, 351, 342,
+ 109, 342, 347, 342, 342, 342, 342, 342,
+ 350, 342, 343, 344, 346, 346, 112, 109,
+ 342, 347, 342, 342, 342, 342, 342, 342,
+ 348, 342, 148, 149, 150, 151, 403, 287,
+ 76, 73, 285, 154, 155, 155, 144, 285,
+ 285, 148, 158, 285, 162, 404, 164, 165,
+ 4, 1, 161, 166, 161, 161, 35, 161,
+ 161, 161, 167, 161, 170, 149, 150, 151,
+ 405, 406, 76, 407, 161, 408, 161, 155,
+ 144, 161, 161, 170, 158, 161, 107, 409,
+ 409, 76, 407, 161, 166, 161, 161, 144,
+ 161, 410, 161, 161, 411, 161, 408, 161,
+ 408, 161, 412, 161, 207, 161, 410, 161,
+ 161, 161, 161, 408, 161, 170, 161, 222,
+ 107, 409, 409, 76, 407, 161, 166, 161,
+ 161, 161, 161, 161, 170, 161, 414, 413,
+ 415, 415, 413, 146, 413, 416, 413, 415,
+ 415, 413, 146, 413, 416, 413, 417, 413,
+ 413, 418, 413, 416, 413, 416, 413, 419,
+ 413, 420, 413, 417, 413, 413, 413, 413,
+ 416, 413, 148, 341, 341, 341, 341, 341,
+ 341, 341, 341, 341, 155, 341, 341, 341,
+ 341, 148, 341, 0
};
static const short _indic_syllable_machine_trans_targs[] = {
138, 160, 166, 2, 167, 3, 5, 170,
6, 8, 173, 9, 11, 176, 12, 14,
15, 159, 17, 18, 175, 20, 21, 172,
- 23, 24, 169, 178, 182, 183, 187, 188,
- 192, 193, 197, 198, 138, 221, 227, 36,
- 228, 37, 39, 231, 40, 42, 234, 43,
- 45, 237, 46, 48, 49, 220, 51, 52,
- 236, 54, 55, 233, 57, 58, 230, 239,
- 243, 244, 248, 249, 253, 254, 258, 260,
- 138, 281, 287, 70, 288, 138, 71, 73,
- 291, 74, 76, 294, 77, 79, 297, 80,
- 82, 83, 280, 85, 86, 296, 88, 89,
- 293, 91, 92, 290, 299, 303, 304, 308,
- 309, 313, 314, 318, 138, 343, 349, 103,
- 350, 104, 106, 353, 107, 109, 356, 110,
- 112, 359, 113, 115, 116, 342, 118, 119,
- 358, 121, 122, 355, 124, 125, 352, 361,
- 365, 366, 370, 371, 375, 376, 380, 381,
- 320, 138, 394, 138, 139, 200, 261, 263,
- 319, 321, 283, 322, 382, 383, 392, 399,
- 138, 140, 142, 33, 199, 162, 141, 32,
- 143, 195, 144, 146, 31, 194, 145, 30,
- 147, 190, 148, 150, 29, 189, 149, 28,
- 151, 185, 152, 154, 27, 184, 153, 26,
- 155, 180, 156, 158, 25, 179, 157, 1,
- 165, 0, 161, 164, 163, 138, 168, 4,
- 22, 171, 7, 19, 174, 10, 16, 177,
- 13, 181, 186, 191, 196, 138, 201, 203,
- 67, 259, 223, 202, 66, 204, 256, 205,
- 207, 65, 255, 206, 64, 208, 251, 209,
- 211, 63, 250, 210, 62, 212, 246, 213,
- 215, 61, 245, 214, 60, 216, 241, 217,
- 219, 59, 240, 218, 35, 226, 34, 222,
- 225, 224, 138, 229, 38, 56, 232, 41,
- 53, 235, 44, 50, 238, 47, 242, 247,
- 252, 257, 138, 262, 100, 264, 316, 265,
- 267, 99, 315, 266, 98, 268, 311, 269,
- 271, 97, 310, 270, 96, 272, 306, 273,
- 275, 95, 305, 274, 94, 276, 301, 277,
- 279, 93, 300, 278, 69, 286, 68, 282,
- 285, 284, 138, 289, 72, 90, 292, 75,
- 87, 295, 78, 84, 298, 81, 302, 307,
- 312, 317, 138, 138, 323, 325, 134, 133,
- 345, 324, 326, 378, 327, 329, 132, 377,
- 328, 131, 330, 373, 331, 333, 130, 372,
- 332, 129, 334, 368, 335, 337, 128, 367,
- 336, 127, 338, 363, 339, 341, 126, 362,
- 340, 102, 348, 101, 344, 347, 346, 138,
- 351, 105, 123, 354, 108, 120, 357, 111,
- 117, 360, 114, 364, 369, 374, 379, 135,
- 384, 385, 391, 386, 388, 136, 387, 390,
- 389, 138, 393, 137, 396, 395, 398, 397,
- 138
+ 23, 24, 169, 179, 183, 184, 188, 189,
+ 193, 194, 198, 199, 138, 222, 228, 36,
+ 229, 37, 39, 232, 40, 42, 235, 43,
+ 45, 238, 46, 48, 49, 221, 51, 52,
+ 237, 54, 55, 234, 57, 58, 231, 241,
+ 245, 246, 250, 251, 255, 256, 260, 262,
+ 138, 283, 289, 70, 290, 138, 71, 73,
+ 293, 74, 76, 296, 77, 79, 299, 80,
+ 82, 83, 282, 85, 86, 298, 88, 89,
+ 295, 91, 92, 292, 302, 306, 307, 311,
+ 312, 316, 317, 321, 138, 346, 352, 103,
+ 353, 104, 106, 356, 107, 109, 359, 110,
+ 112, 362, 113, 115, 116, 345, 118, 119,
+ 361, 121, 122, 358, 124, 125, 355, 365,
+ 369, 370, 374, 375, 379, 380, 384, 385,
+ 323, 138, 398, 138, 139, 201, 263, 265,
+ 322, 324, 285, 325, 386, 387, 301, 396,
+ 403, 138, 140, 142, 33, 200, 162, 178,
+ 141, 32, 143, 196, 144, 146, 31, 195,
+ 145, 30, 147, 191, 148, 150, 29, 190,
+ 149, 28, 151, 186, 152, 154, 27, 185,
+ 153, 26, 155, 181, 156, 158, 25, 180,
+ 157, 1, 165, 0, 161, 164, 163, 138,
+ 168, 4, 22, 171, 7, 19, 174, 10,
+ 16, 177, 13, 182, 187, 192, 197, 138,
+ 202, 204, 67, 261, 224, 240, 203, 66,
+ 205, 258, 206, 208, 65, 257, 207, 64,
+ 209, 253, 210, 212, 63, 252, 211, 62,
+ 213, 248, 214, 216, 61, 247, 215, 60,
+ 217, 243, 218, 220, 59, 242, 219, 35,
+ 227, 34, 223, 226, 225, 138, 230, 38,
+ 56, 233, 41, 53, 236, 44, 50, 239,
+ 47, 244, 249, 254, 259, 138, 264, 100,
+ 266, 319, 267, 269, 99, 318, 268, 98,
+ 270, 314, 271, 273, 97, 313, 272, 96,
+ 274, 309, 275, 277, 95, 308, 276, 94,
+ 278, 304, 279, 281, 93, 303, 280, 69,
+ 288, 68, 284, 287, 286, 138, 291, 72,
+ 90, 294, 75, 87, 297, 78, 84, 300,
+ 81, 305, 310, 315, 320, 138, 138, 326,
+ 328, 134, 133, 348, 364, 327, 329, 382,
+ 330, 332, 132, 381, 331, 131, 333, 377,
+ 334, 336, 130, 376, 335, 129, 337, 372,
+ 338, 340, 128, 371, 339, 127, 341, 367,
+ 342, 344, 126, 366, 343, 102, 351, 101,
+ 347, 350, 349, 138, 354, 105, 123, 357,
+ 108, 120, 360, 111, 117, 363, 114, 368,
+ 373, 378, 383, 135, 388, 389, 395, 390,
+ 392, 136, 391, 394, 393, 138, 397, 137,
+ 400, 399, 402, 401, 138
};
static const char _indic_syllable_machine_trans_actions[] = {
@@ -705,40 +782,40 @@ static const char _indic_syllable_machine_trans_actions[] = {
2, 0, 0, 2, 0, 0, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2,
6, 8, 0, 11, 2, 2, 6, 0,
- 12, 12, 0, 2, 6, 2, 2, 0,
- 13, 2, 0, 0, 2, 0, 2, 0,
+ 12, 12, 0, 2, 6, 2, 6, 2,
+ 0, 13, 2, 0, 0, 2, 0, 2,
+ 2, 0, 2, 2, 2, 0, 0, 2,
+ 2, 0, 2, 2, 2, 0, 0, 2,
+ 2, 0, 2, 2, 2, 0, 0, 2,
+ 2, 0, 2, 2, 2, 0, 0, 2,
+ 2, 0, 2, 0, 0, 0, 0, 14,
+ 2, 0, 0, 2, 0, 0, 2, 0,
+ 0, 2, 0, 2, 2, 2, 2, 15,
+ 2, 0, 0, 2, 0, 2, 2, 0,
2, 2, 2, 0, 0, 2, 2, 0,
2, 2, 2, 0, 0, 2, 2, 0,
2, 2, 2, 0, 0, 2, 2, 0,
2, 2, 2, 0, 0, 2, 2, 0,
- 2, 0, 0, 0, 0, 14, 2, 0,
+ 2, 0, 0, 0, 0, 16, 2, 0,
0, 2, 0, 0, 2, 0, 0, 2,
- 0, 2, 2, 2, 2, 15, 2, 0,
- 0, 2, 0, 2, 0, 2, 2, 2,
- 0, 0, 2, 2, 0, 2, 2, 2,
- 0, 0, 2, 2, 0, 2, 2, 2,
- 0, 0, 2, 2, 0, 2, 2, 2,
- 0, 0, 2, 2, 0, 2, 0, 0,
- 0, 0, 16, 2, 0, 0, 2, 0,
- 0, 2, 0, 0, 2, 0, 2, 2,
- 2, 2, 17, 6, 0, 6, 2, 6,
- 0, 0, 6, 6, 0, 6, 2, 6,
- 0, 0, 6, 6, 0, 6, 2, 6,
- 0, 0, 6, 6, 0, 6, 2, 6,
- 0, 0, 6, 6, 0, 2, 0, 0,
- 0, 0, 18, 2, 0, 0, 2, 0,
- 0, 2, 0, 0, 2, 0, 2, 2,
- 2, 2, 19, 20, 2, 0, 0, 0,
- 0, 2, 2, 2, 2, 0, 0, 2,
- 2, 0, 2, 2, 2, 0, 0, 2,
- 2, 0, 2, 2, 2, 0, 0, 2,
- 2, 0, 2, 2, 2, 0, 0, 2,
- 2, 0, 2, 0, 0, 0, 0, 21,
- 2, 0, 0, 2, 0, 0, 2, 0,
- 0, 2, 0, 2, 2, 2, 2, 0,
- 0, 22, 22, 0, 0, 0, 0, 0,
- 0, 23, 2, 0, 0, 0, 0, 0,
- 24
+ 0, 2, 2, 2, 2, 17, 6, 0,
+ 6, 2, 6, 0, 0, 6, 6, 0,
+ 6, 2, 6, 0, 0, 6, 6, 0,
+ 6, 2, 6, 0, 0, 6, 6, 0,
+ 6, 2, 6, 0, 0, 6, 6, 0,
+ 2, 0, 0, 0, 0, 18, 2, 0,
+ 0, 2, 0, 0, 2, 0, 0, 2,
+ 0, 2, 2, 2, 2, 19, 20, 2,
+ 0, 0, 0, 0, 2, 2, 2, 2,
+ 2, 0, 0, 2, 2, 0, 2, 2,
+ 2, 0, 0, 2, 2, 0, 2, 2,
+ 2, 0, 0, 2, 2, 0, 2, 2,
+ 2, 0, 0, 2, 2, 0, 2, 0,
+ 0, 0, 0, 21, 2, 0, 0, 2,
+ 0, 0, 2, 0, 0, 2, 0, 2,
+ 2, 2, 2, 0, 0, 22, 22, 0,
+ 0, 0, 0, 0, 0, 23, 2, 0,
+ 0, 0, 0, 0, 24
};
static const char _indic_syllable_machine_to_state_actions[] = {
@@ -791,7 +868,8 @@ static const char _indic_syllable_machine_to_state_actions[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0
};
static const char _indic_syllable_machine_from_state_actions[] = {
@@ -844,7 +922,8 @@ static const char _indic_syllable_machine_from_state_actions[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0
};
static const short _indic_syllable_machine_eof_trans[] = {
@@ -865,39 +944,40 @@ static const short _indic_syllable_machine_eof_trans[] = {
109, 109, 109, 109, 109, 109, 109, 109,
109, 109, 109, 109, 109, 109, 109, 109,
109, 109, 109, 109, 109, 109, 109, 73,
- 1, 146, 0, 161, 161, 161, 161, 161,
- 161, 161, 161, 161, 161, 161, 161, 161,
- 161, 161, 161, 161, 161, 161, 161, 161,
- 161, 161, 161, 161, 161, 161, 161, 161,
- 161, 161, 161, 161, 161, 161, 161, 161,
- 161, 161, 161, 161, 161, 161, 161, 161,
- 161, 161, 161, 161, 161, 161, 161, 161,
- 161, 161, 161, 161, 161, 161, 161, 161,
- 222, 222, 222, 222, 222, 222, 222, 222,
- 222, 222, 222, 222, 222, 222, 222, 222,
- 222, 222, 222, 222, 222, 222, 222, 222,
- 222, 222, 222, 222, 222, 222, 222, 222,
- 222, 222, 222, 222, 222, 222, 222, 222,
- 222, 222, 222, 222, 222, 222, 222, 222,
- 222, 222, 222, 222, 222, 222, 222, 222,
- 222, 222, 222, 222, 222, 283, 283, 283,
- 283, 283, 283, 283, 283, 283, 283, 283,
- 283, 283, 283, 283, 283, 283, 283, 283,
- 283, 283, 283, 283, 283, 283, 283, 283,
- 283, 283, 283, 283, 283, 283, 283, 283,
- 283, 283, 283, 283, 283, 283, 283, 283,
- 283, 283, 283, 283, 283, 283, 283, 283,
- 283, 283, 283, 283, 283, 283, 283, 339,
- 283, 339, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 283, 161,
- 161, 161, 161, 161, 161, 161, 161, 161,
- 410, 410, 410, 410, 410, 410, 410, 339
+ 1, 146, 0, 162, 162, 162, 162, 162,
+ 162, 162, 162, 162, 162, 162, 162, 162,
+ 162, 162, 162, 162, 162, 162, 162, 162,
+ 162, 162, 162, 162, 162, 162, 162, 162,
+ 162, 162, 162, 162, 162, 162, 162, 162,
+ 162, 162, 162, 162, 162, 162, 162, 162,
+ 162, 162, 162, 162, 162, 162, 162, 162,
+ 162, 162, 162, 162, 162, 162, 162, 162,
+ 162, 224, 224, 224, 224, 224, 224, 224,
+ 224, 224, 224, 224, 224, 224, 224, 224,
+ 224, 224, 224, 224, 224, 224, 224, 224,
+ 224, 224, 224, 224, 224, 224, 224, 224,
+ 224, 224, 224, 224, 224, 224, 224, 224,
+ 224, 224, 224, 224, 224, 224, 224, 224,
+ 224, 224, 224, 224, 224, 224, 224, 224,
+ 224, 224, 224, 224, 224, 224, 224, 286,
+ 286, 286, 286, 286, 286, 286, 286, 286,
+ 286, 286, 286, 286, 286, 286, 286, 286,
+ 286, 286, 286, 286, 286, 286, 286, 286,
+ 286, 286, 286, 286, 286, 286, 286, 286,
+ 286, 286, 286, 286, 286, 286, 286, 286,
+ 286, 286, 286, 286, 286, 286, 286, 286,
+ 286, 286, 286, 286, 286, 286, 286, 286,
+ 286, 286, 342, 286, 342, 343, 343, 343,
+ 343, 343, 343, 343, 343, 343, 343, 343,
+ 343, 343, 343, 343, 343, 343, 343, 343,
+ 343, 343, 343, 343, 343, 343, 343, 343,
+ 343, 343, 343, 343, 343, 343, 343, 343,
+ 343, 343, 343, 343, 343, 343, 343, 343,
+ 343, 343, 343, 343, 343, 343, 343, 343,
+ 343, 343, 343, 343, 343, 343, 343, 343,
+ 343, 343, 286, 162, 162, 162, 162, 162,
+ 162, 162, 162, 162, 414, 414, 414, 414,
+ 414, 414, 414, 342
};
static const int indic_syllable_machine_start = 138;
@@ -911,7 +991,7 @@ static const int indic_syllable_machine_en_main = 138;
-#line 92 "hb-ot-shape-complex-indic-machine.rl"
+#line 93 "hb-ot-shape-complex-indic-machine.rl"
#define found_syllable(syllable_type) \
@@ -930,7 +1010,7 @@ find_syllables (hb_buffer_t *buffer)
int cs;
hb_glyph_info_t *info = buffer->info;
-#line 934 "hb-ot-shape-complex-indic-machine.hh"
+#line 1014 "hb-ot-shape-complex-indic-machine.hh"
{
cs = indic_syllable_machine_start;
ts = 0;
@@ -938,7 +1018,7 @@ find_syllables (hb_buffer_t *buffer)
act = 0;
}
-#line 112 "hb-ot-shape-complex-indic-machine.rl"
+#line 113 "hb-ot-shape-complex-indic-machine.rl"
p = 0;
@@ -946,7 +1026,7 @@ find_syllables (hb_buffer_t *buffer)
unsigned int syllable_serial = 1;
-#line 950 "hb-ot-shape-complex-indic-machine.hh"
+#line 1030 "hb-ot-shape-complex-indic-machine.hh"
{
int _slen;
int _trans;
@@ -960,7 +1040,7 @@ _resume:
#line 1 "NONE"
{ts = p;}
break;
-#line 964 "hb-ot-shape-complex-indic-machine.hh"
+#line 1044 "hb-ot-shape-complex-indic-machine.hh"
}
_keys = _indic_syllable_machine_trans_keys + (cs<<1);
@@ -983,71 +1063,71 @@ _eof_trans:
{te = p+1;}
break;
case 14:
-#line 83 "hb-ot-shape-complex-indic-machine.rl"
+#line 84 "hb-ot-shape-complex-indic-machine.rl"
{te = p+1;{ found_syllable (consonant_syllable); }}
break;
case 16:
-#line 84 "hb-ot-shape-complex-indic-machine.rl"
+#line 85 "hb-ot-shape-complex-indic-machine.rl"
{te = p+1;{ found_syllable (vowel_syllable); }}
break;
case 21:
-#line 85 "hb-ot-shape-complex-indic-machine.rl"
+#line 86 "hb-ot-shape-complex-indic-machine.rl"
{te = p+1;{ found_syllable (standalone_cluster); }}
break;
case 24:
-#line 86 "hb-ot-shape-complex-indic-machine.rl"
+#line 87 "hb-ot-shape-complex-indic-machine.rl"
{te = p+1;{ found_syllable (symbol_cluster); }}
break;
case 18:
-#line 87 "hb-ot-shape-complex-indic-machine.rl"
+#line 88 "hb-ot-shape-complex-indic-machine.rl"
{te = p+1;{ found_syllable (broken_cluster); }}
break;
case 11:
-#line 88 "hb-ot-shape-complex-indic-machine.rl"
+#line 89 "hb-ot-shape-complex-indic-machine.rl"
{te = p+1;{ found_syllable (non_indic_cluster); }}
break;
case 13:
-#line 83 "hb-ot-shape-complex-indic-machine.rl"
+#line 84 "hb-ot-shape-complex-indic-machine.rl"
{te = p;p--;{ found_syllable (consonant_syllable); }}
break;
case 15:
-#line 84 "hb-ot-shape-complex-indic-machine.rl"
+#line 85 "hb-ot-shape-complex-indic-machine.rl"
{te = p;p--;{ found_syllable (vowel_syllable); }}
break;
case 20:
-#line 85 "hb-ot-shape-complex-indic-machine.rl"
+#line 86 "hb-ot-shape-complex-indic-machine.rl"
{te = p;p--;{ found_syllable (standalone_cluster); }}
break;
case 23:
-#line 86 "hb-ot-shape-complex-indic-machine.rl"
+#line 87 "hb-ot-shape-complex-indic-machine.rl"
{te = p;p--;{ found_syllable (symbol_cluster); }}
break;
case 17:
-#line 87 "hb-ot-shape-complex-indic-machine.rl"
+#line 88 "hb-ot-shape-complex-indic-machine.rl"
{te = p;p--;{ found_syllable (broken_cluster); }}
break;
case 19:
-#line 88 "hb-ot-shape-complex-indic-machine.rl"
+#line 89 "hb-ot-shape-complex-indic-machine.rl"
{te = p;p--;{ found_syllable (non_indic_cluster); }}
break;
case 1:
-#line 83 "hb-ot-shape-complex-indic-machine.rl"
+#line 84 "hb-ot-shape-complex-indic-machine.rl"
{{p = ((te))-1;}{ found_syllable (consonant_syllable); }}
break;
case 3:
-#line 84 "hb-ot-shape-complex-indic-machine.rl"
+#line 85 "hb-ot-shape-complex-indic-machine.rl"
{{p = ((te))-1;}{ found_syllable (vowel_syllable); }}
break;
case 7:
-#line 85 "hb-ot-shape-complex-indic-machine.rl"
+#line 86 "hb-ot-shape-complex-indic-machine.rl"
{{p = ((te))-1;}{ found_syllable (standalone_cluster); }}
break;
case 8:
-#line 86 "hb-ot-shape-complex-indic-machine.rl"
+#line 87 "hb-ot-shape-complex-indic-machine.rl"
{{p = ((te))-1;}{ found_syllable (symbol_cluster); }}
break;
case 4:
-#line 87 "hb-ot-shape-complex-indic-machine.rl"
+#line 88 "hb-ot-shape-complex-indic-machine.rl"
{{p = ((te))-1;}{ found_syllable (broken_cluster); }}
break;
case 5:
@@ -1068,22 +1148,22 @@ _eof_trans:
case 22:
#line 1 "NONE"
{te = p+1;}
-#line 83 "hb-ot-shape-complex-indic-machine.rl"
+#line 84 "hb-ot-shape-complex-indic-machine.rl"
{act = 1;}
break;
case 6:
#line 1 "NONE"
{te = p+1;}
-#line 87 "hb-ot-shape-complex-indic-machine.rl"
+#line 88 "hb-ot-shape-complex-indic-machine.rl"
{act = 5;}
break;
case 12:
#line 1 "NONE"
{te = p+1;}
-#line 88 "hb-ot-shape-complex-indic-machine.rl"
+#line 89 "hb-ot-shape-complex-indic-machine.rl"
{act = 6;}
break;
-#line 1087 "hb-ot-shape-complex-indic-machine.hh"
+#line 1167 "hb-ot-shape-complex-indic-machine.hh"
}
_again:
@@ -1092,7 +1172,7 @@ _again:
#line 1 "NONE"
{ts = 0;}
break;
-#line 1096 "hb-ot-shape-complex-indic-machine.hh"
+#line 1176 "hb-ot-shape-complex-indic-machine.hh"
}
if ( ++p != pe )
@@ -1108,7 +1188,7 @@ _again:
}
-#line 120 "hb-ot-shape-complex-indic-machine.rl"
+#line 121 "hb-ot-shape-complex-indic-machine.rl"
}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-machine.rl
index c5d945d4ecd..f7e022b989a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-machine.rl
@@ -52,6 +52,7 @@ DOTTEDCIRCLE = 12;
RS = 13;
Repha = 15;
Ra = 16;
+CM = 17;
Symbol= 18;
CS = 19;
@@ -67,10 +68,10 @@ matra_group = z{0,3}.M.N?.(H | forced_rakar)?;
syllable_tail = (z?.SM.SM?.ZWNJ?)? A{0,3}?;
halant_group = (z?.H.(ZWJ.N?)?);
final_halant_group = halant_group | H.ZWNJ;
+medial_group = CM?;
halant_or_matra_group = (final_halant_group | matra_group{0,4});
-complex_syllable_tail = (halant_group.cn){0,4} halant_or_matra_group syllable_tail;
-
+complex_syllable_tail = (halant_group.cn){0,4} medial_group halant_or_matra_group syllable_tail;
consonant_syllable = (Repha|CS)? cn complex_syllable_tail;
vowel_syllable = reph? V.n? (ZWJ | complex_syllable_tail);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-table.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-table.cc
index 43b5ef8b7b8..d26bbb8f3fd 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-table.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic-table.cc
@@ -6,12 +6,12 @@
*
* on files with these headers:
*
- * # IndicSyllabicCategory-11.0.0.txt
- * # Date: 2018-05-21, 18:33:00 GMT [KW, RP]
- * # IndicPositionalCategory-11.0.0.txt
- * # Date: 2018-02-05, 16:21:00 GMT [KW, RP]
- * # Blocks-11.0.0.txt
- * # Date: 2017-10-16, 24:39:00 GMT [KW]
+ * # IndicSyllabicCategory-12.0.0.txt
+ * # Date: 2019-01-31, 02:26:00 GMT [KW, RP]
+ * # IndicPositionalCategory-12.0.0.txt
+ * # Date: 2019-01-31, 02:26:00 GMT [KW, RP]
+ * # Blocks-12.0.0.txt
+ * # Date: 2018-07-30, 19:40:00 GMT [KW]
*/
#include "hb-ot-shape-complex-indic.hh"
@@ -19,21 +19,21 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-macros"
-#define ISC_A INDIC_SYLLABIC_CATEGORY_AVAGRAHA /* 16 chars; Avagraha */
-#define ISC_Bi INDIC_SYLLABIC_CATEGORY_BINDU /* 83 chars; Bindu */
+#define ISC_A INDIC_SYLLABIC_CATEGORY_AVAGRAHA /* 17 chars; Avagraha */
+#define ISC_Bi INDIC_SYLLABIC_CATEGORY_BINDU /* 86 chars; Bindu */
#define ISC_BJN INDIC_SYLLABIC_CATEGORY_BRAHMI_JOINING_NUMBER /* 20 chars; Brahmi_Joining_Number */
-#define ISC_Ca INDIC_SYLLABIC_CATEGORY_CANTILLATION_MARK /* 58 chars; Cantillation_Mark */
-#define ISC_C INDIC_SYLLABIC_CATEGORY_CONSONANT /* 2110 chars; Consonant */
-#define ISC_CD INDIC_SYLLABIC_CATEGORY_CONSONANT_DEAD /* 10 chars; Consonant_Dead */
+#define ISC_Ca INDIC_SYLLABIC_CATEGORY_CANTILLATION_MARK /* 59 chars; Cantillation_Mark */
+#define ISC_C INDIC_SYLLABIC_CATEGORY_CONSONANT /* 2160 chars; Consonant */
+#define ISC_CD INDIC_SYLLABIC_CATEGORY_CONSONANT_DEAD /* 12 chars; Consonant_Dead */
#define ISC_CF INDIC_SYLLABIC_CATEGORY_CONSONANT_FINAL /* 67 chars; Consonant_Final */
#define ISC_CHL INDIC_SYLLABIC_CATEGORY_CONSONANT_HEAD_LETTER /* 5 chars; Consonant_Head_Letter */
#define ISC_CIP INDIC_SYLLABIC_CATEGORY_CONSONANT_INITIAL_POSTFIXED /* 1 chars; Consonant_Initial_Postfixed */
#define ISC_CK INDIC_SYLLABIC_CATEGORY_CONSONANT_KILLER /* 2 chars; Consonant_Killer */
-#define ISC_CM INDIC_SYLLABIC_CATEGORY_CONSONANT_MEDIAL /* 28 chars; Consonant_Medial */
-#define ISC_CP INDIC_SYLLABIC_CATEGORY_CONSONANT_PLACEHOLDER /* 21 chars; Consonant_Placeholder */
+#define ISC_CM INDIC_SYLLABIC_CATEGORY_CONSONANT_MEDIAL /* 29 chars; Consonant_Medial */
+#define ISC_CP INDIC_SYLLABIC_CATEGORY_CONSONANT_PLACEHOLDER /* 22 chars; Consonant_Placeholder */
#define ISC_CPR INDIC_SYLLABIC_CATEGORY_CONSONANT_PRECEDING_REPHA /* 2 chars; Consonant_Preceding_Repha */
-#define ISC_CPrf INDIC_SYLLABIC_CATEGORY_CONSONANT_PREFIXED /* 7 chars; Consonant_Prefixed */
-#define ISC_CS INDIC_SYLLABIC_CATEGORY_CONSONANT_SUBJOINED /* 95 chars; Consonant_Subjoined */
+#define ISC_CPrf INDIC_SYLLABIC_CATEGORY_CONSONANT_PREFIXED /* 9 chars; Consonant_Prefixed */
+#define ISC_CS INDIC_SYLLABIC_CATEGORY_CONSONANT_SUBJOINED /* 94 chars; Consonant_Subjoined */
#define ISC_CSR INDIC_SYLLABIC_CATEGORY_CONSONANT_SUCCEEDING_REPHA /* 4 chars; Consonant_Succeeding_Repha */
#define ISC_CWS INDIC_SYLLABIC_CATEGORY_CONSONANT_WITH_STACKER /* 6 chars; Consonant_With_Stacker */
#define ISC_GM INDIC_SYLLABIC_CATEGORY_GEMINATION_MARK /* 3 chars; Gemination_Mark */
@@ -42,7 +42,7 @@
#define ISC_ML INDIC_SYLLABIC_CATEGORY_MODIFYING_LETTER /* 1 chars; Modifying_Letter */
#define ISC_ZWNJ INDIC_SYLLABIC_CATEGORY_NON_JOINER /* 1 chars; Non_Joiner */
#define ISC_N INDIC_SYLLABIC_CATEGORY_NUKTA /* 30 chars; Nukta */
-#define ISC_Nd INDIC_SYLLABIC_CATEGORY_NUMBER /* 480 chars; Number */
+#define ISC_Nd INDIC_SYLLABIC_CATEGORY_NUMBER /* 481 chars; Number */
#define ISC_NJ INDIC_SYLLABIC_CATEGORY_NUMBER_JOINER /* 1 chars; Number_Joiner */
#define ISC_x INDIC_SYLLABIC_CATEGORY_OTHER /* 1 chars; Other */
#define ISC_PK INDIC_SYLLABIC_CATEGORY_PURE_KILLER /* 21 chars; Pure_Killer */
@@ -50,21 +50,21 @@
#define ISC_SM INDIC_SYLLABIC_CATEGORY_SYLLABLE_MODIFIER /* 25 chars; Syllable_Modifier */
#define ISC_TL INDIC_SYLLABIC_CATEGORY_TONE_LETTER /* 7 chars; Tone_Letter */
#define ISC_TM INDIC_SYLLABIC_CATEGORY_TONE_MARK /* 42 chars; Tone_Mark */
-#define ISC_V INDIC_SYLLABIC_CATEGORY_VIRAMA /* 25 chars; Virama */
-#define ISC_Vs INDIC_SYLLABIC_CATEGORY_VISARGA /* 36 chars; Visarga */
+#define ISC_V INDIC_SYLLABIC_CATEGORY_VIRAMA /* 27 chars; Virama */
+#define ISC_Vs INDIC_SYLLABIC_CATEGORY_VISARGA /* 35 chars; Visarga */
#define ISC_Vo INDIC_SYLLABIC_CATEGORY_VOWEL /* 30 chars; Vowel */
-#define ISC_M INDIC_SYLLABIC_CATEGORY_VOWEL_DEPENDENT /* 660 chars; Vowel_Dependent */
-#define ISC_VI INDIC_SYLLABIC_CATEGORY_VOWEL_INDEPENDENT /* 464 chars; Vowel_Independent */
+#define ISC_M INDIC_SYLLABIC_CATEGORY_VOWEL_DEPENDENT /* 673 chars; Vowel_Dependent */
+#define ISC_VI INDIC_SYLLABIC_CATEGORY_VOWEL_INDEPENDENT /* 476 chars; Vowel_Independent */
-#define IMC_B INDIC_MATRA_CATEGORY_BOTTOM /* 340 chars; Bottom */
+#define IMC_B INDIC_MATRA_CATEGORY_BOTTOM /* 349 chars; Bottom */
#define IMC_BL INDIC_MATRA_CATEGORY_BOTTOM_AND_LEFT /* 1 chars; Bottom_And_Left */
#define IMC_BR INDIC_MATRA_CATEGORY_BOTTOM_AND_RIGHT /* 2 chars; Bottom_And_Right */
-#define IMC_L INDIC_MATRA_CATEGORY_LEFT /* 59 chars; Left */
+#define IMC_L INDIC_MATRA_CATEGORY_LEFT /* 61 chars; Left */
#define IMC_LR INDIC_MATRA_CATEGORY_LEFT_AND_RIGHT /* 21 chars; Left_And_Right */
#define IMC_x INDIC_MATRA_CATEGORY_NOT_APPLICABLE /* 1 chars; Not_Applicable */
#define IMC_O INDIC_MATRA_CATEGORY_OVERSTRUCK /* 10 chars; Overstruck */
-#define IMC_R INDIC_MATRA_CATEGORY_RIGHT /* 276 chars; Right */
-#define IMC_T INDIC_MATRA_CATEGORY_TOP /* 393 chars; Top */
+#define IMC_R INDIC_MATRA_CATEGORY_RIGHT /* 281 chars; Right */
+#define IMC_T INDIC_MATRA_CATEGORY_TOP /* 398 chars; Top */
#define IMC_TB INDIC_MATRA_CATEGORY_TOP_AND_BOTTOM /* 10 chars; Top_And_Bottom */
#define IMC_TBR INDIC_MATRA_CATEGORY_TOP_AND_BOTTOM_AND_RIGHT /* 1 chars; Top_And_Bottom_And_Right */
#define IMC_TL INDIC_MATRA_CATEGORY_TOP_AND_LEFT /* 6 chars; Top_And_Left */
@@ -152,7 +152,7 @@ static const INDIC_TABLE_ELEMENT_TYPE indic_table[] = {
/* 0A38 */ _(C,x), _(C,x), _(x,x), _(x,x), _(N,B), _(x,x), _(M,R), _(M,L),
/* 0A40 */ _(M,R), _(M,B), _(M,B), _(x,x), _(x,x), _(x,x), _(x,x), _(M,T),
/* 0A48 */ _(M,T), _(x,x), _(x,x), _(M,T), _(M,T), _(V,B), _(x,x), _(x,x),
- /* 0A50 */ _(x,x), _(Ca,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
+ /* 0A50 */ _(x,x), _(Ca,B), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
/* 0A58 */ _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(C,x), _(x,x),
/* 0A60 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(Nd,x), _(Nd,x),
/* 0A68 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
@@ -237,7 +237,7 @@ static const INDIC_TABLE_ELEMENT_TYPE indic_table[] = {
/* Kannada */
- /* 0C80 */ _(x,x), _(Bi,T), _(Bi,R), _(Vs,R), _(x,x), _(VI,x), _(VI,x), _(VI,x),
+ /* 0C80 */ _(Bi,x), _(Bi,T), _(Bi,R), _(Vs,R), _(x,x), _(VI,x), _(VI,x), _(VI,x),
/* 0C88 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(x,x), _(VI,x), _(VI,x),
/* 0C90 */ _(VI,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x),
/* 0C98 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
@@ -346,8 +346,8 @@ static const INDIC_TABLE_ELEMENT_TYPE indic_table[] = {
/* 1CD8 */ _(Ca,B), _(Ca,B), _(Ca,T), _(Ca,T), _(Ca,B), _(Ca,B), _(Ca,B), _(Ca,B),
/* 1CE0 */ _(Ca,T), _(Ca,R), _(x,O), _(x,O), _(x,O), _(x,O), _(x,O), _(x,O),
/* 1CE8 */ _(x,O), _(x,x), _(x,x), _(x,x), _(x,x), _(x,B), _(x,x), _(x,x),
- /* 1CF0 */ _(x,x), _(x,x), _(Vs,x), _(Vs,x), _(Ca,T),_(CWS,x),_(CWS,x), _(Ca,R),
- /* 1CF8 */ _(Ca,x), _(Ca,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
+ /* 1CF0 */ _(x,x), _(x,x), _(CD,x), _(CD,x), _(Ca,T),_(CWS,x),_(CWS,x), _(Ca,R),
+ /* 1CF8 */ _(Ca,x), _(Ca,x), _(CP,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
#define indic_offset_0x2008u 1656
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic.cc
index d2d0a5a34a6..1fd8fc670b1 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic.cc
@@ -239,7 +239,7 @@ struct would_substitute_feature_t
hb_face_t *face) const
{
for (unsigned int i = 0; i < count; i++)
- if (hb_ot_layout_lookup_would_substitute_fast (face, lookups[i].index, glyphs, glyphs_count, zero_context))
+ if (hb_ot_layout_lookup_would_substitute (face, lookups[i].index, glyphs, glyphs_count, zero_context))
return true;
return false;
}
@@ -720,7 +720,7 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
indic_position_t last_pos = POS_START;
for (unsigned int i = start; i < end; i++)
{
- if ((FLAG_UNSAFE (info[i].indic_category()) & (JOINER_FLAGS | FLAG (OT_N) | FLAG (OT_RS) | FLAG (OT_H))))
+ if ((FLAG_UNSAFE (info[i].indic_category()) & (JOINER_FLAGS | FLAG (OT_N) | FLAG (OT_RS) | MEDIAL_FLAGS | FLAG (OT_H))))
{
info[i].indic_position() = last_pos;
if (unlikely (info[i].indic_category() == OT_H &&
@@ -965,6 +965,9 @@ insert_dotted_circles (const hb_ot_shape_plan_t *plan HB_UNUSED,
hb_font_t *font,
hb_buffer_t *buffer)
{
+ if (unlikely (buffer->flags & HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE))
+ return;
+
/* Note: This loop is extra overhead, but should not be measurable.
* TODO Use a buffer scratch flag to remove the loop. */
bool has_broken_syllables = false;
@@ -1199,9 +1202,14 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan,
goto search;
}
}
- /* -> If ZWNJ follows this halant, position is moved after it. */
- if (info[new_pos + 1].indic_category() == OT_ZWNJ)
- new_pos++;
+ /* -> If ZWNJ follows this halant, position is moved after it.
+ *
+ * IMPLEMENTATION NOTES:
+ *
+ * This is taken care of by the state-machine. A Halant,ZWNJ is a terminating
+ * sequence for a consonant syllable; any pre-base matras occurring after it
+ * will belong to the subsequent syllable.
+ */
}
}
else
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic.hh
index dcc2a7a6c5f..13ab51679a6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic.hh
@@ -62,17 +62,19 @@ enum indic_category_t {
OT_Coeng = 14, /* Khmer-style Virama. */
OT_Repha = 15, /* Atomically-encoded logical or visual repha. */
OT_Ra = 16,
- OT_CM = 17, /* Consonant-Medial; Unused by Indic shaper. */
+ OT_CM = 17, /* Consonant-Medial. */
OT_Symbol = 18, /* Avagraha, etc that take marks (SM,A,VD). */
OT_CS = 19
};
+#define MEDIAL_FLAGS (FLAG (OT_CM))
+
/* Note:
*
* We treat Vowels and placeholders as if they were consonants. This is safe because Vowels
* cannot happen in a consonant syllable. The plus side however is, we can call the
* consonant syllable logic from the vowel syllable function and get it all right! */
-#define CONSONANT_FLAGS (FLAG (OT_C) | FLAG (OT_CS) | FLAG (OT_Ra) | FLAG (OT_V) | FLAG (OT_PLACEHOLDER) | FLAG (OT_DOTTEDCIRCLE))
+#define CONSONANT_FLAGS (FLAG (OT_C) | FLAG (OT_CS) | FLAG (OT_Ra) | MEDIAL_FLAGS | FLAG (OT_V) | FLAG (OT_PLACEHOLDER) | FLAG (OT_DOTTEDCIRCLE))
#define JOINER_FLAGS (FLAG (OT_ZWJ) | FLAG (OT_ZWNJ))
@@ -362,6 +364,7 @@ set_indic_properties (hb_glyph_info_t &info)
else if (unlikely (u == 0x0AFBu)) cat = OT_N; /* https://github.com/harfbuzz/harfbuzz/issues/552 */
else if (unlikely (u == 0x0980u)) cat = OT_PLACEHOLDER; /* https://github.com/harfbuzz/harfbuzz/issues/538 */
+ else if (unlikely (u == 0x09FCu)) cat = OT_PLACEHOLDER; /* https://github.com/harfbuzz/harfbuzz/pull/1613 */
else if (unlikely (u == 0x0C80u)) cat = OT_PLACEHOLDER; /* https://github.com/harfbuzz/harfbuzz/pull/623 */
else if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x2010u, 0x2011u)))
cat = OT_PLACEHOLDER;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer-machine.hh
index 2bc8ca650a4..65e0ffc851f 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer-machine.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer-machine.hh
@@ -35,29 +35,27 @@
#line 36 "hb-ot-shape-complex-khmer-machine.hh"
static const unsigned char _khmer_syllable_machine_trans_keys[] = {
5u, 26u, 5u, 21u, 5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u, 5u, 26u, 5u, 21u,
- 5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u, 5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u,
- 5u, 26u, 5u, 21u, 5u, 26u, 5u, 21u, 5u, 26u, 1u, 16u, 1u, 29u, 5u, 29u,
- 5u, 29u, 5u, 29u, 22u, 22u, 5u, 22u, 5u, 29u, 5u, 29u, 5u, 29u, 5u, 26u,
- 5u, 29u, 5u, 29u, 22u, 22u, 5u, 22u, 5u, 29u, 5u, 29u, 1u, 16u, 5u, 29u,
- 5u, 29u, 0
+ 5u, 26u, 5u, 21u, 5u, 21u, 5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u, 5u, 26u,
+ 5u, 21u, 5u, 26u, 5u, 21u, 5u, 26u, 1u, 29u, 5u, 29u, 5u, 29u, 5u, 29u,
+ 22u, 22u, 5u, 22u, 5u, 29u, 5u, 29u, 5u, 29u, 1u, 16u, 5u, 26u, 5u, 29u,
+ 5u, 29u, 22u, 22u, 5u, 22u, 5u, 29u, 5u, 29u, 1u, 16u, 5u, 29u, 5u, 29u,
+ 0
};
static const char _khmer_syllable_machine_key_spans[] = {
22, 17, 22, 17, 16, 17, 22, 17,
- 22, 17, 16, 17, 22, 17, 16, 17,
- 22, 17, 22, 17, 22, 16, 29, 25,
- 25, 25, 1, 18, 25, 25, 25, 22,
- 25, 25, 1, 18, 25, 25, 16, 25,
- 25
+ 22, 17, 17, 22, 17, 16, 17, 22,
+ 17, 22, 17, 22, 29, 25, 25, 25,
+ 1, 18, 25, 25, 25, 16, 22, 25,
+ 25, 1, 18, 25, 25, 16, 25, 25
};
static const short _khmer_syllable_machine_index_offsets[] = {
0, 23, 41, 64, 82, 99, 117, 140,
- 158, 181, 199, 216, 234, 257, 275, 292,
- 310, 333, 351, 374, 392, 415, 432, 462,
- 488, 514, 540, 542, 561, 587, 613, 639,
- 662, 688, 714, 716, 735, 761, 787, 804,
- 830
+ 158, 181, 199, 217, 240, 258, 275, 293,
+ 316, 334, 357, 375, 398, 428, 454, 480,
+ 506, 508, 527, 553, 579, 605, 622, 645,
+ 671, 697, 699, 718, 744, 770, 787, 813
};
static const char _khmer_syllable_machine_indicies[] = {
@@ -85,142 +83,136 @@ static const char _khmer_syllable_machine_indicies[] = {
0, 0, 0, 0, 0, 0, 12, 0,
0, 0, 0, 4, 0, 11, 11, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 12, 0, 13,
- 13, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 13, 0,
- 15, 15, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 14,
- 16, 14, 15, 15, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 16, 17, 17, 17, 17, 18,
- 17, 19, 19, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 18, 17, 20, 20, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 20, 17, 21, 21, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 22, 17, 23, 23,
- 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 24, 17,
- 17, 17, 17, 18, 17, 23, 23, 17,
- 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 24, 17, 25,
- 25, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 26,
- 17, 17, 17, 17, 18, 17, 25, 25,
- 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 26, 17,
- 15, 15, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 27,
- 16, 17, 17, 17, 17, 18, 17, 28,
- 28, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 28, 17,
- 13, 13, 29, 29, 30, 30, 29, 29,
- 29, 29, 2, 2, 29, 31, 29, 13,
- 29, 29, 29, 29, 16, 20, 29, 29,
- 29, 18, 24, 26, 22, 29, 33, 33,
- 32, 32, 32, 32, 32, 32, 32, 34,
- 32, 32, 32, 32, 32, 2, 3, 6,
- 32, 32, 32, 4, 10, 12, 8, 32,
- 35, 35, 32, 32, 32, 32, 32, 32,
- 32, 36, 32, 32, 32, 32, 32, 32,
- 3, 6, 32, 32, 32, 4, 10, 12,
- 8, 32, 5, 5, 32, 32, 32, 32,
- 32, 32, 32, 36, 32, 32, 32, 32,
- 32, 32, 4, 6, 32, 32, 32, 32,
- 32, 32, 8, 32, 6, 32, 7, 7,
- 32, 32, 32, 32, 32, 32, 32, 36,
- 32, 32, 32, 32, 32, 32, 8, 6,
- 32, 37, 37, 32, 32, 32, 32, 32,
- 32, 32, 36, 32, 32, 32, 32, 32,
- 32, 10, 6, 32, 32, 32, 4, 32,
- 32, 8, 32, 38, 38, 32, 32, 32,
- 32, 32, 32, 32, 36, 32, 32, 32,
- 32, 32, 32, 12, 6, 32, 32, 32,
- 4, 10, 32, 8, 32, 35, 35, 32,
- 32, 32, 32, 32, 32, 32, 34, 32,
- 32, 32, 32, 32, 32, 3, 6, 32,
- 32, 32, 4, 10, 12, 8, 32, 15,
- 15, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 39, 39, 39, 39, 39, 16,
- 39, 39, 39, 39, 18, 39, 41, 41,
- 40, 40, 40, 40, 40, 40, 40, 42,
- 40, 40, 40, 40, 40, 40, 16, 20,
- 40, 40, 40, 18, 24, 26, 22, 40,
- 19, 19, 40, 40, 40, 40, 40, 40,
- 40, 42, 40, 40, 40, 40, 40, 40,
- 18, 20, 40, 40, 40, 40, 40, 40,
- 22, 40, 20, 40, 21, 21, 40, 40,
- 40, 40, 40, 40, 40, 42, 40, 40,
- 40, 40, 40, 40, 22, 20, 40, 43,
- 43, 40, 40, 40, 40, 40, 40, 40,
- 42, 40, 40, 40, 40, 40, 40, 24,
- 20, 40, 40, 40, 18, 40, 40, 22,
- 40, 44, 44, 40, 40, 40, 40, 40,
- 40, 40, 42, 40, 40, 40, 40, 40,
- 40, 26, 20, 40, 40, 40, 18, 24,
- 40, 22, 40, 28, 28, 39, 39, 39,
+ 0, 0, 0, 0, 0, 12, 0, 14,
+ 14, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 15,
+ 13, 14, 14, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 15, 16, 16, 16, 16, 17, 16,
+ 18, 18, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 17, 16, 19, 19, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 19, 16, 20, 20, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 21, 16, 22, 22, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 23, 16, 16,
+ 16, 16, 17, 16, 22, 22, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 23, 16, 24, 24,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 25, 16,
+ 16, 16, 16, 17, 16, 24, 24, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 25, 16, 14,
+ 14, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 26, 15,
+ 16, 16, 16, 16, 17, 16, 28, 28,
+ 27, 27, 29, 29, 27, 27, 27, 27,
+ 2, 2, 27, 30, 27, 28, 27, 27,
+ 27, 27, 15, 19, 27, 27, 27, 17,
+ 23, 25, 21, 27, 32, 32, 31, 31,
+ 31, 31, 31, 31, 31, 33, 31, 31,
+ 31, 31, 31, 2, 3, 6, 31, 31,
+ 31, 4, 10, 12, 8, 31, 34, 34,
+ 31, 31, 31, 31, 31, 31, 31, 35,
+ 31, 31, 31, 31, 31, 31, 3, 6,
+ 31, 31, 31, 4, 10, 12, 8, 31,
+ 5, 5, 31, 31, 31, 31, 31, 31,
+ 31, 35, 31, 31, 31, 31, 31, 31,
+ 4, 6, 31, 31, 31, 31, 31, 31,
+ 8, 31, 6, 31, 7, 7, 31, 31,
+ 31, 31, 31, 31, 31, 35, 31, 31,
+ 31, 31, 31, 31, 8, 6, 31, 36,
+ 36, 31, 31, 31, 31, 31, 31, 31,
+ 35, 31, 31, 31, 31, 31, 31, 10,
+ 6, 31, 31, 31, 4, 31, 31, 8,
+ 31, 37, 37, 31, 31, 31, 31, 31,
+ 31, 31, 35, 31, 31, 31, 31, 31,
+ 31, 12, 6, 31, 31, 31, 4, 10,
+ 31, 8, 31, 34, 34, 31, 31, 31,
+ 31, 31, 31, 31, 33, 31, 31, 31,
+ 31, 31, 31, 3, 6, 31, 31, 31,
+ 4, 10, 12, 8, 31, 28, 28, 31,
+ 31, 31, 31, 31, 31, 31, 31, 31,
+ 31, 31, 31, 31, 28, 31, 14, 14,
+ 38, 38, 38, 38, 38, 38, 38, 38,
+ 38, 38, 38, 38, 38, 38, 15, 38,
+ 38, 38, 38, 17, 38, 40, 40, 39,
+ 39, 39, 39, 39, 39, 39, 41, 39,
+ 39, 39, 39, 39, 39, 15, 19, 39,
+ 39, 39, 17, 23, 25, 21, 39, 18,
+ 18, 39, 39, 39, 39, 39, 39, 39,
+ 41, 39, 39, 39, 39, 39, 39, 17,
+ 19, 39, 39, 39, 39, 39, 39, 21,
+ 39, 19, 39, 20, 20, 39, 39, 39,
+ 39, 39, 39, 39, 41, 39, 39, 39,
+ 39, 39, 39, 21, 19, 39, 42, 42,
+ 39, 39, 39, 39, 39, 39, 39, 41,
+ 39, 39, 39, 39, 39, 39, 23, 19,
+ 39, 39, 39, 17, 39, 39, 21, 39,
+ 43, 43, 39, 39, 39, 39, 39, 39,
+ 39, 41, 39, 39, 39, 39, 39, 39,
+ 25, 19, 39, 39, 39, 17, 23, 39,
+ 21, 39, 44, 44, 39, 39, 39, 39,
39, 39, 39, 39, 39, 39, 39, 39,
- 39, 39, 28, 39, 45, 45, 40, 40,
- 40, 40, 40, 40, 40, 46, 40, 40,
- 40, 40, 40, 27, 16, 20, 40, 40,
- 40, 18, 24, 26, 22, 40, 41, 41,
- 40, 40, 40, 40, 40, 40, 40, 46,
- 40, 40, 40, 40, 40, 40, 16, 20,
- 40, 40, 40, 18, 24, 26, 22, 40,
- 0
+ 39, 44, 39, 45, 45, 39, 39, 39,
+ 39, 39, 39, 39, 30, 39, 39, 39,
+ 39, 39, 26, 15, 19, 39, 39, 39,
+ 17, 23, 25, 21, 39, 40, 40, 39,
+ 39, 39, 39, 39, 39, 39, 30, 39,
+ 39, 39, 39, 39, 39, 15, 19, 39,
+ 39, 39, 17, 23, 25, 21, 39, 0
};
static const char _khmer_syllable_machine_trans_targs[] = {
- 22, 1, 30, 24, 25, 3, 26, 5,
- 27, 7, 28, 9, 29, 23, 22, 11,
- 32, 22, 33, 13, 34, 15, 35, 17,
- 36, 19, 37, 40, 39, 22, 31, 38,
- 22, 0, 10, 2, 4, 6, 8, 22,
- 22, 12, 14, 16, 18, 20, 21
+ 20, 1, 28, 22, 23, 3, 24, 5,
+ 25, 7, 26, 9, 27, 20, 10, 31,
+ 20, 32, 12, 33, 14, 34, 16, 35,
+ 18, 36, 39, 20, 21, 30, 37, 20,
+ 0, 29, 2, 4, 6, 8, 20, 20,
+ 11, 13, 15, 17, 38, 19
};
static const char _khmer_syllable_machine_trans_actions[] = {
1, 0, 2, 2, 2, 0, 0, 0,
- 2, 0, 2, 0, 2, 2, 3, 0,
- 4, 5, 2, 0, 0, 0, 2, 0,
- 2, 0, 2, 4, 4, 8, 9, 0,
- 10, 0, 0, 0, 0, 0, 0, 11,
- 12, 0, 0, 0, 0, 0, 0
+ 2, 0, 2, 0, 2, 3, 0, 4,
+ 5, 2, 0, 0, 0, 2, 0, 2,
+ 0, 2, 4, 8, 2, 9, 0, 10,
+ 0, 0, 0, 0, 0, 0, 11, 12,
+ 0, 0, 0, 0, 4, 0
};
static const char _khmer_syllable_machine_to_state_actions[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 6, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 6, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0
+ 0, 0, 0, 0, 0, 0, 0, 0
};
static const char _khmer_syllable_machine_from_state_actions[] = {
0, 0, 0, 0, 0, 0, 0, 0,
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, 7, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0
+ 0, 0, 0, 0, 0, 0, 0, 0
};
static const unsigned char _khmer_syllable_machine_eof_trans[] = {
1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 15, 18, 18, 18, 18,
- 18, 18, 18, 18, 18, 18, 0, 33,
- 33, 33, 33, 33, 33, 33, 33, 40,
- 41, 41, 41, 41, 41, 41, 40, 41,
- 41
+ 1, 1, 14, 17, 17, 17, 17, 17,
+ 17, 17, 17, 17, 0, 32, 32, 32,
+ 32, 32, 32, 32, 32, 32, 39, 40,
+ 40, 40, 40, 40, 40, 40, 40, 40
};
-static const int khmer_syllable_machine_start = 22;
-static const int khmer_syllable_machine_first_final = 22;
+static const int khmer_syllable_machine_start = 20;
+static const int khmer_syllable_machine_first_final = 20;
static const int khmer_syllable_machine_error = -1;
-static const int khmer_syllable_machine_en_main = 22;
+static const int khmer_syllable_machine_en_main = 20;
#line 36 "hb-ot-shape-complex-khmer-machine.rl"
@@ -246,7 +238,7 @@ find_syllables (hb_buffer_t *buffer)
int cs;
hb_glyph_info_t *info = buffer->info;
-#line 250 "hb-ot-shape-complex-khmer-machine.hh"
+#line 242 "hb-ot-shape-complex-khmer-machine.hh"
{
cs = khmer_syllable_machine_start;
ts = 0;
@@ -262,7 +254,7 @@ find_syllables (hb_buffer_t *buffer)
unsigned int syllable_serial = 1;
-#line 266 "hb-ot-shape-complex-khmer-machine.hh"
+#line 258 "hb-ot-shape-complex-khmer-machine.hh"
{
int _slen;
int _trans;
@@ -276,7 +268,7 @@ _resume:
#line 1 "NONE"
{ts = p;}
break;
-#line 280 "hb-ot-shape-complex-khmer-machine.hh"
+#line 272 "hb-ot-shape-complex-khmer-machine.hh"
}
_keys = _khmer_syllable_machine_trans_keys + (cs<<1);
@@ -346,7 +338,7 @@ _eof_trans:
#line 76 "hb-ot-shape-complex-khmer-machine.rl"
{act = 3;}
break;
-#line 350 "hb-ot-shape-complex-khmer-machine.hh"
+#line 342 "hb-ot-shape-complex-khmer-machine.hh"
}
_again:
@@ -355,7 +347,7 @@ _again:
#line 1 "NONE"
{ts = 0;}
break;
-#line 359 "hb-ot-shape-complex-khmer-machine.hh"
+#line 351 "hb-ot-shape-complex-khmer-machine.hh"
}
if ( ++p != pe )
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer-machine.rl
index 4c596ab6425..1076a08e8b5 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer-machine.rl
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer-machine.rl
@@ -66,7 +66,7 @@ matra_group = VPre? xgroup VBlw? xgroup (joiner?.VAbv)? xgroup VPst?;
syllable_tail = xgroup matra_group xgroup (Coeng.c)? ygroup;
-broken_cluster = (Coeng.cn)* syllable_tail;
+broken_cluster = (Coeng.cn)* (Coeng | syllable_tail);
consonant_syllable = (cn|PLACEHOLDER|DOTTEDCIRCLE) broken_cluster;
other = any;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer.cc
index 4475ceb7c91..5746651d661 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-khmer.cc
@@ -164,7 +164,7 @@ struct would_substitute_feature_t
hb_face_t *face) const
{
for (unsigned int i = 0; i < count; i++)
- if (hb_ot_layout_lookup_would_substitute_fast (face, lookups[i].index, glyphs, glyphs_count, zero_context))
+ if (hb_ot_layout_lookup_would_substitute (face, lookups[i].index, glyphs, glyphs_count, zero_context))
return true;
return false;
}
@@ -365,6 +365,9 @@ insert_dotted_circles (const hb_ot_shape_plan_t *plan HB_UNUSED,
hb_font_t *font,
hb_buffer_t *buffer)
{
+ if (unlikely (buffer->flags & HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE))
+ return;
+
/* Note: This loop is extra overhead, but should not be measurable. */
bool has_broken_syllables = false;
unsigned int count = buffer->len;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-myanmar.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-myanmar.cc
index 8fdf2f4bcfd..70ab972c6d2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-myanmar.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-myanmar.cc
@@ -298,6 +298,9 @@ insert_dotted_circles (const hb_ot_shape_plan_t *plan HB_UNUSED,
hb_font_t *font,
hb_buffer_t *buffer)
{
+ if (unlikely (buffer->flags & HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE))
+ return;
+
/* Note: This loop is extra overhead, but should not be measurable. */
bool has_broken_syllables = false;
unsigned int count = buffer->len;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use-table.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use-table.cc
index 835b95bbfc9..cb5c358cd56 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use-table.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use-table.cc
@@ -6,12 +6,12 @@
*
* on files with these headers:
*
- * # IndicSyllabicCategory-11.0.0.txt
- * # Date: 2018-05-21, 18:33:00 GMT [KW, RP]
- * # IndicPositionalCategory-11.0.0.txt
- * # Date: 2018-02-05, 16:21:00 GMT [KW, RP]
- * # Blocks-11.0.0.txt
- * # Date: 2017-10-16, 24:39:00 GMT [KW]
+ * # IndicSyllabicCategory-12.0.0.txt
+ * # Date: 2019-01-31, 02:26:00 GMT [KW, RP]
+ * # IndicPositionalCategory-12.0.0.txt
+ * # Date: 2019-01-31, 02:26:00 GMT [KW, RP]
+ * # Blocks-12.0.0.txt
+ * # Date: 2018-07-30, 19:40:00 GMT [KW]
* UnicodeData.txt does not have a header.
*/
@@ -167,7 +167,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* Kannada */
- /* 0C80 */ O, VMAbv, VMPst, VMPst, O, B, B, B, B, B, B, B, B, O, B, B,
+ /* 0C80 */ B, VMAbv, VMPst, VMPst, O, B, B, B, B, B, B, B, B, O, B, B,
/* 0C90 */ B, O, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 0CA0 */ B, B, B, B, B, B, B, B, B, O, B, B, B, B, B, B,
/* 0CB0 */ B, B, B, B, O, B, B, B, B, B, O, O, CMBlw, B, VPst, VAbv,
@@ -261,7 +261,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* 17A0 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 17B0 */ B, B, B, B, O, O, VPst, VAbv, VAbv, VAbv, VAbv, VBlw, VBlw, VBlw, VPst, VPst,
/* 17C0 */ VPst, VPre, VPre, VPre, VPst, VPst, VMAbv, VMPst, VPst, VMAbv, VMAbv, FM, FAbv, CMAbv, FM, FM,
- /* 17D0 */ FM, VAbv, H, FM, O, O, O, O, O, O, O, O, B, VAbv, O, O,
+ /* 17D0 */ FM, VAbv, H, FM, O, O, O, O, O, O, O, O, B, FM, O, O,
/* 17E0 */ B, B, B, B, B, B, B, B, B, B, O, O, O, O, O, O,
#define use_offset_0x1900u 1936
@@ -288,7 +288,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* 19A0 */ B, B, B, B, B, B, B, B, B, B, B, B, O, O, O, O,
/* 19B0 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 19C0 */ B, B, B, B, B, B, B, B, VMPst, VMPst, O, O, O, O, O, O,
- /* 19D0 */ B, B, B, B, B, B, B, B, B, B, O, O, O, O, O, O,
+ /* 19D0 */ B, B, B, B, B, B, B, B, B, B, B, O, O, O, O, O,
/* 19E0 */ O, O, O, O, O, O, O, O, O, O, O, O, O, O, O, O,
/* 19F0 */ O, O, O, O, O, O, O, O, O, O, O, O, O, O, O, O,
@@ -351,7 +351,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* 1CD0 */ VMAbv, VMAbv, VMAbv, O, VMBlw, VMBlw, VMBlw, VMBlw, VMBlw, VMBlw, VMAbv, VMAbv, VMBlw, VMBlw, VMBlw, VMBlw,
/* 1CE0 */ VMAbv, VMPst, VMBlw, VMBlw, VMBlw, VMBlw, VMBlw, VMBlw, VMBlw, O, O, O, O, VMBlw, O, O,
- /* 1CF0 */ O, O, VMPst, VMPst, VMAbv, CS, CS, VMPst, VMAbv, VMAbv, O, O, O, O, O, O,
+ /* 1CF0 */ O, O, IND, IND, VMAbv, CS, CS, VMPst, VMAbv, VMAbv, GB, O, O, O, O, O,
#define use_offset_0x1df8u 2736
@@ -393,7 +393,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* Syloti Nagri */
- /* A800 */ B, B, O, B, B, B, VAbv, B, B, B, B, VMAbv, B, B, B, B,
+ /* A800 */ B, B, VAbv, B, B, B, H, B, B, B, B, VMAbv, B, B, B, B,
/* A810 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* A820 */ B, B, B, VPst, VPst, VBlw, VAbv, VPst, O, O, O, O, O, O, O, O,
/* A830 */ O, O, O, O, O, O, O, O, O, O, O, O, O, O, O, O,
@@ -438,7 +438,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* A980 */ VMAbv, VMAbv, FAbv, VMPst, B, B, B, B, B, B, B, B, B, B, B, B,
/* A990 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* A9A0 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
- /* A9B0 */ B, B, B, CMAbv, VPst, VPst, VAbv, VAbv, VBlw, VBlw, VPre, VPre, VAbv, SUB, MPst, MBlw,
+ /* A9B0 */ B, B, B, CMAbv, VPst, VPst, VAbv, VAbv, VBlw, VBlw, VPre, VPre, VAbv, MBlw, MPst, MBlw,
/* A9C0 */ H, O, O, O, O, O, O, O, O, O, O, O, O, O, O, O,
/* A9D0 */ B, B, B, B, B, B, B, B, B, B, O, O, O, O, O, O,
@@ -581,7 +581,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* Grantha */
- /* 11300 */ VMAbv, VMAbv, VMAbv, VMPst, O, B, B, B, B, B, B, B, B, O, O, B,
+ /* 11300 */ VMAbv, VMAbv, VMAbv, VMAbv, O, B, B, B, B, B, B, B, B, O, O, B,
/* 11310 */ B, O, O, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11320 */ B, B, B, B, B, B, B, B, B, O, B, B, B, B, B, B,
/* 11330 */ B, O, B, B, O, B, B, B, B, B, O, CMBlw, CMBlw, B, VPst, VPst,
@@ -600,7 +600,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* 11420 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11430 */ B, B, B, B, B, VPst, VPre, VPst, VBlw, VBlw, VBlw, VBlw, VBlw, VBlw, VAbv, VAbv,
/* 11440 */ VPst, VPst, H, VMAbv, VMAbv, VMPst, CMBlw, B, O, O, O, O, O, O, O, O,
- /* 11450 */ B, B, B, B, B, B, B, B, B, B, O, O, O, O, FM, O,
+ /* 11450 */ B, B, B, B, B, B, B, B, B, B, O, O, O, O, FM, B,
/* 11460 */ O, O, O, O, O, O, O, O, O, O, O, O, O, O, O, O,
/* 11470 */ O, O, O, O, O, O, O, O, O, O, O, O, O, O, O, O,
@@ -610,7 +610,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* 11490 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 114A0 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 114B0 */ VPst, VPre, VPst, VBlw, VBlw, VBlw, VBlw, VBlw, VBlw, VPre, VAbv, VPst, VPst, VPst, VPst, VMAbv,
- /* 114C0 */ VMAbv, VMPst, H, CMBlw, B, O, O, O, O, O, O, O, O, O, O, O,
+ /* 114C0 */ VMAbv, VMAbv, H, CMBlw, B, O, O, O, O, O, O, O, O, O, O, O,
/* 114D0 */ B, B, B, B, B, B, B, B, B, B, O, O, O, O, O, O,
#define use_offset_0x11580u 4720
@@ -643,7 +643,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* 11680 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11690 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 116A0 */ B, B, B, B, B, B, B, B, B, B, B, VMAbv, VMPst, VAbv, VPre, VPst,
- /* 116B0 */ VBlw, VBlw, VAbv, VAbv, VAbv, VAbv, H, CMBlw, O, O, O, O, O, O, O, O,
+ /* 116B0 */ VBlw, VBlw, VAbv, VAbv, VAbv, VAbv, H, CMBlw, B, O, O, O, O, O, O, O,
/* 116C0 */ B, B, B, B, B, B, B, B, B, B, O, O, O, O, O, O,
/* 116D0 */ O, O, O, O, O, O, O, O, O, O, O, O, O, O, O, O,
/* 116E0 */ O, O, O, O, O, O, O, O, O, O, O, O, O, O, O, O,
@@ -666,9 +666,18 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* 11820 */ B, B, B, B, B, B, B, B, B, B, B, B, VPst, VPre, VPst, VBlw,
/* 11830 */ VBlw, VBlw, VBlw, VAbv, VAbv, VAbv, VAbv, VMAbv, VMPst, H, CMBlw, O, O, O, O, O,
-#define use_offset_0x11a00u 5232
+#define use_offset_0x119a0u 5232
+ /* Nandinagari */
+
+ /* 119A0 */ B, B, B, B, B, B, B, B, O, O, B, B, B, B, B, B,
+ /* 119B0 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
+ /* 119C0 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
+ /* 119D0 */ B, VPst, VPre, VPst, VBlw, VBlw, VBlw, VBlw, O, O, VAbv, VAbv, VPst, VPst, VMPst, VMPst,
+ /* 119E0 */ H, B, O, O, VPre, O, O, O, O, O, O, O, O, O, O, O,
+ /* 119F0 */ O, O, O, O, O, O, O, O, O, O, O, O, O, O, O, O,
+
/* Zanabazar Square */
/* 11A00 */ B, VAbv, VBlw, VBlw, VAbv, VAbv, VAbv, VAbv, VAbv, VAbv, VBlw, B, B, B, B, B,
@@ -682,10 +691,10 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* 11A50 */ B, VAbv, VBlw, VBlw, VAbv, VAbv, VAbv, VPst, VPst, VBlw, VBlw, VBlw, B, B, B, B,
/* 11A60 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11A70 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
- /* 11A80 */ B, B, B, B, O, O, R, R, R, R, FBlw, FBlw, FBlw, FBlw, FBlw, FBlw,
+ /* 11A80 */ B, B, B, B, R, R, R, R, R, R, FBlw, FBlw, FBlw, FBlw, FBlw, FBlw,
/* 11A90 */ FBlw, FBlw, FBlw, FBlw, FBlw, FBlw, VMAbv, VMPst, CMAbv, H, O, O, O, B, O, O,
-#define use_offset_0x11c00u 5392
+#define use_offset_0x11c00u 5488
/* Bhaiksuki */
@@ -706,7 +715,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* 11CA0 */ SUB, SUB, SUB, SUB, SUB, SUB, SUB, SUB, O, SUB, SUB, SUB, SUB, SUB, SUB, SUB,
/* 11CB0 */ VBlw, VPre, VBlw, VAbv, VPst, VMAbv, VMAbv, O,
-#define use_offset_0x11d00u 5576
+#define use_offset_0x11d00u 5672
/* Masaram Gondi */
@@ -726,7 +735,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* 11D90 */ VAbv, VAbv, O, VPst, VPst, VMAbv, VMPst, H, O, O, O, O, O, O, O, O,
/* 11DA0 */ B, B, B, B, B, B, B, B, B, B, O, O, O, O, O, O,
-#define use_offset_0x11ee0u 5752
+#define use_offset_0x11ee0u 5848
/* Makasar */
@@ -734,7 +743,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
/* 11EE0 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11EF0 */ B, B, GB, VAbv, VBlw, VPre, VPst, O,
-}; /* Table items: 5776; occupancy: 74% */
+}; /* Table items: 5872; occupancy: 74% */
USE_TABLE_ELEMENT_TYPE
hb_use_get_category (hb_codepoint_t u)
@@ -785,7 +794,7 @@ hb_use_get_category (hb_codepoint_t u)
if (hb_in_range<hb_codepoint_t> (u, 0x11400u, 0x114DFu)) return use_table[u - 0x11400u + use_offset_0x11400u];
if (hb_in_range<hb_codepoint_t> (u, 0x11580u, 0x1173Fu)) return use_table[u - 0x11580u + use_offset_0x11580u];
if (hb_in_range<hb_codepoint_t> (u, 0x11800u, 0x1183Fu)) return use_table[u - 0x11800u + use_offset_0x11800u];
- if (hb_in_range<hb_codepoint_t> (u, 0x11A00u, 0x11A9Fu)) return use_table[u - 0x11A00u + use_offset_0x11a00u];
+ if (hb_in_range<hb_codepoint_t> (u, 0x119A0u, 0x11A9Fu)) return use_table[u - 0x119A0u + use_offset_0x119a0u];
if (hb_in_range<hb_codepoint_t> (u, 0x11C00u, 0x11CB7u)) return use_table[u - 0x11C00u + use_offset_0x11c00u];
if (hb_in_range<hb_codepoint_t> (u, 0x11D00u, 0x11DAFu)) return use_table[u - 0x11D00u + use_offset_0x11d00u];
if (hb_in_range<hb_codepoint_t> (u, 0x11EE0u, 0x11EF7u)) return use_table[u - 0x11EE0u + use_offset_0x11ee0u];
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use.cc
index 2e3f202f59d..eecde6e8503 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use.cc
@@ -523,6 +523,9 @@ insert_dotted_circles (const hb_ot_shape_plan_t *plan HB_UNUSED,
hb_font_t *font,
hb_buffer_t *buffer)
{
+ if (unlikely (buffer->flags & HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE))
+ return;
+
/* Note: This loop is extra overhead, but should not be measurable. */
bool has_broken_syllables = false;
unsigned int count = buffer->len;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-vowel-constraints.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-vowel-constraints.cc
index 0e532581d94..e4cf64561bf 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-vowel-constraints.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-vowel-constraints.cc
@@ -9,8 +9,8 @@
* # Copied from https://docs.microsoft.com/en-us/typography/script-development/use
* # On October 23, 2018; with documentd dated 02/07/2018.
*
- * # Scripts-11.0.0.txt
- * # Date: 2018-02-21, 05:34:31 GMT
+ * # Scripts-12.0.0.txt
+ * # Date: 2019-01-28, 22:16:47 GMT
*/
#include "hb-ot-shape-complex-vowel-constraints.hh"
@@ -34,6 +34,9 @@ _hb_preprocess_text_vowel_constraints (const hb_ot_shape_plan_t *plan HB_UNUSED,
hb_buffer_t *buffer,
hb_font_t *font HB_UNUSED)
{
+ if (buffer->flags & HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE)
+ return;
+
/* UGLY UGLY UGLY business of adding dotted-circle in the middle of
* vowel-sequences that look like another vowel. Data for each script
* collected from the USE script development spec.
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex.hh
index a2499de9c92..2691622135a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex.hh
@@ -377,6 +377,9 @@ hb_ot_shape_complex_categorize (const hb_ot_shape_planner_t *planner)
case HB_SCRIPT_MAKASAR:
//case HB_SCRIPT_SOGDIAN:
+ /* Unicode-12.0 additions */
+ case HB_SCRIPT_NANDINAGARI:
+
/* If the designer designed the font for the 'DFLT' script,
* (or we ended up arbitrarily pick 'latn'), use the default shaper.
* Otherwise, use the specific shaper.
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape.cc
index e9d97c9b062..7fff3059e6c 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape.cc
@@ -448,6 +448,9 @@ hb_set_unicode_props (hb_buffer_t *buffer)
static void
hb_insert_dotted_circle (hb_buffer_t *buffer, hb_font_t *font)
{
+ if (unlikely (buffer->flags & HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE))
+ return;
+
if (!(buffer->flags & HB_BUFFER_FLAG_BOT) ||
buffer->context_len[0] ||
!_hb_glyph_info_is_unicode_mark (&buffer->info[0]))
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-tag-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-tag-table.hh
index b7090a0a787..09e16271807 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-tag-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-tag-table.hh
@@ -6,8 +6,8 @@
*
* on files with these headers:
*
- * <meta name="updated_at" content="2018-09-07 07:45 PM" />
- * File-Date: 2018-08-08
+ * <meta name="updated_at" content="2018-11-18 05:25 AM" />
+ * File-Date: 2019-02-20
*/
#ifndef HB_OT_TAG_TABLE_HH
@@ -131,7 +131,7 @@ static const LangTag ot_languages[] = {
{"bjt", {HB_TAG('B','L','N',' ')}}, /* Balanta-Ganja -> Balante */
{"bla", {HB_TAG('B','K','F',' ')}}, /* Siksika -> Blackfoot */
{"ble", {HB_TAG('B','L','N',' ')}}, /* Balanta-Kentohe -> Balante */
- {"blk", {HB_TAG('B','L','K',' ')}}, /* Pa'o Karen */
+ {"blk", {HB_TAG('B','L','K',' ')}}, /* Pa’o Karen */
{"bln", {HB_TAG('B','I','K',' ')}}, /* Southern Catanduanes Bikol -> Bikol */
{"bm", {HB_TAG('B','M','B',' ')}}, /* Bambara (Bamanankan) */
{"bmm", {HB_TAG('M','L','G',' ')}}, /* Northern Betsimisaraka Malagasy -> Malagasy */
@@ -318,7 +318,7 @@ static const LangTag ot_languages[] = {
{"fj", {HB_TAG('F','J','I',' ')}}, /* Fijian */
{"flm", {HB_TAG('H','A','L',' '), /* Halam (Falam Chin) (retired code) */
HB_TAG('Q','I','N',' ')}}, /* Falam Chin (retired code) -> Chin */
- {"fmp", {HB_TAG('F','M','P',' ')}}, /* Fe'fe' */
+ {"fmp", {HB_TAG('F','M','P',' ')}}, /* Fe’fe’ */
{"fo", {HB_TAG('F','O','S',' ')}}, /* Faroese */
{"fon", {HB_TAG('F','O','N',' ')}}, /* Fon */
{"fr", {HB_TAG('F','R','A',' ')}}, /* French */
@@ -653,7 +653,7 @@ static const LangTag ot_languages[] = {
{"mwr", {HB_TAG('M','A','W',' ')}}, /* Marwari [macrolanguage] */
{"mww", {HB_TAG('M','W','W',' ')}}, /* Hmong Daw */
{"my", {HB_TAG('B','R','M',' ')}}, /* Burmese */
- {"mym", {HB_TAG('M','E','N',' ')}}, /* Me'en */
+ {"mym", {HB_TAG('M','E','N',' ')}}, /* Me’en */
{"myn", {HB_TAG('M','Y','N',' ')}}, /* Mayan [family] */
{"myq", {HB_TAG('M','N','K',' ')}}, /* Forest Maninka (retired code) -> Maninka */
{"myv", {HB_TAG('E','R','Z',' ')}}, /* Erzya */
@@ -687,7 +687,7 @@ static const LangTag ot_languages[] = {
{"nog", {HB_TAG('N','O','G',' ')}}, /* Nogai */
{"nov", {HB_TAG('N','O','V',' ')}}, /* Novial */
{"npi", {HB_TAG('N','E','P',' ')}}, /* Nepali */
- {"nqo", {HB_TAG('N','K','O',' ')}}, /* N'Ko */
+ {"nqo", {HB_TAG('N','K','O',' ')}}, /* N’Ko */
{"nr", {HB_TAG('N','D','B',' ')}}, /* South Ndebele -> Ndebele */
{"nsk", {HB_TAG('N','A','S',' ')}}, /* Naskapi */
{"nso", {HB_TAG('N','S','O',' ')}}, /* Pedi -> Sotho, Northern */
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-tag.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-tag.cc
index d04e5329a04..751ccab0b8d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-tag.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-tag.cc
@@ -171,24 +171,6 @@ hb_ot_tag_to_script (hb_tag_t tag)
/* hb_language_t */
-static int
-lang_compare_first_component (const void *pa,
- const void *pb)
-{
- const char *a = (const char *) pa;
- const char *b = (const char *) pb;
- unsigned int da, db;
- const char *p;
-
- p = strchr (a, '-');
- da = p ? (unsigned int) (p - a) : strlen (a);
-
- p = strchr (b, '-');
- db = p ? (unsigned int) (p - b) : strlen (b);
-
- return strncmp (a, b, MAX (da, db));
-}
-
static bool
subtag_matches (const char *lang_str,
const char *limit,
@@ -213,10 +195,28 @@ lang_matches (const char *lang_str, const char *spec)
(lang_str[len] == '\0' || lang_str[len] == '-');
}
-typedef struct {
+struct LangTag
+{
char language[4];
hb_tag_t tags[HB_OT_MAX_TAGS_PER_LANGUAGE];
-} LangTag;
+
+ int cmp (const char *a) const
+ {
+ const char *b = this->language;
+ unsigned int da, db;
+ const char *p;
+
+ p = strchr (a, '-');
+ da = p ? (unsigned int) (p - a) : strlen (a);
+
+ p = strchr (b, '-');
+ db = p ? (unsigned int) (p - b) : strlen (b);
+
+ return strncmp (a, b, MAX (da, db));
+ }
+ int cmp (const LangTag *that) const
+ { return cmp (that->language); }
+};
#include "hb-ot-tag-table.hh"
@@ -263,9 +263,7 @@ hb_ot_tags_from_language (const char *lang_str,
ISALPHA (s[1]))
lang_str = s + 1;
}
- lang_tag = (LangTag *) bsearch (lang_str, ot_languages,
- ARRAY_LENGTH (ot_languages), sizeof (LangTag),
- lang_compare_first_component);
+ lang_tag = hb_sorted_array (ot_languages).bsearch (lang_str);
if (lang_tag)
{
unsigned int i;
@@ -507,7 +505,7 @@ test_langs_sorted ()
{
for (unsigned int i = 1; i < ARRAY_LENGTH (ot_languages); i++)
{
- int c = lang_compare_first_component (ot_languages[i-1].language, ot_languages[i].language);
+ int c = ot_languages[i].cmp (&ot_languages[i - 1]);
if (c >= 0)
{
fprintf (stderr, "ot_languages not sorted at index %d: %s %d %s\n",
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-vorg-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-vorg-table.hh
index 0202fcc5658..39073db8f32 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-vorg-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-vorg-table.hh
@@ -110,21 +110,29 @@ struct VORG
/* count the number of glyphs to be included in the subset table */
hb_vector_t<VertOriginMetric> subset_metrics;
subset_metrics.init ();
- unsigned int glyph = 0;
+
+
+ hb_codepoint_t old_glyph = HB_SET_VALUE_INVALID;
unsigned int i = 0;
- while ((glyph < plan->glyphs.length) && (i < vertYOrigins.len))
+ while (i < vertYOrigins.len
+ && plan->glyphset ()->next (&old_glyph))
{
- if (plan->glyphs[glyph] > vertYOrigins[i].glyph)
- i++;
- else if (plan->glyphs[glyph] < vertYOrigins[i].glyph)
- glyph++;
- else
+ while (old_glyph > vertYOrigins[i].glyph)
{
- VertOriginMetric *metrics = subset_metrics.push ();
- metrics->glyph.set (glyph);
- metrics->vertOriginY.set (vertYOrigins[i].vertOriginY);
- glyph++;
i++;
+ if (i >= vertYOrigins.len)
+ break;
+ }
+
+ if (old_glyph == vertYOrigins[i].glyph)
+ {
+ hb_codepoint_t new_glyph;
+ if (plan->new_gid_for_old_gid (old_glyph, &new_glyph))
+ {
+ VertOriginMetric *metrics = subset_metrics.push ();
+ metrics->glyph.set (new_glyph);
+ metrics->vertOriginY.set (vertYOrigins[i].vertOriginY);
+ }
}
}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff-common.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff-common.cc
index 3e617d58bca..f29937a2276 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff-common.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff-common.cc
@@ -43,7 +43,7 @@ using namespace CFF;
**/
bool
-hb_plan_subset_cff_fdselect (const hb_vector_t<hb_codepoint_t> &glyphs,
+hb_plan_subset_cff_fdselect (const hb_subset_plan_t *plan,
unsigned int fdCount,
const FDSelect &src, /* IN */
unsigned int &subset_fd_count /* OUT */,
@@ -57,7 +57,7 @@ hb_plan_subset_cff_fdselect (const hb_vector_t<hb_codepoint_t> &glyphs,
subset_fdselect_format = 0;
unsigned int num_ranges = 0;
- unsigned int subset_num_glyphs = glyphs.length;
+ unsigned int subset_num_glyphs = plan->num_output_glyphs ();
if (subset_num_glyphs == 0)
return true;
@@ -69,7 +69,14 @@ hb_plan_subset_cff_fdselect (const hb_vector_t<hb_codepoint_t> &glyphs,
hb_codepoint_t prev_fd = CFF_UNDEF_CODE;
for (hb_codepoint_t i = 0; i < subset_num_glyphs; i++)
{
- hb_codepoint_t fd = src.get_fd (glyphs[i]);
+ hb_codepoint_t glyph;
+ hb_codepoint_t fd;
+ if (!plan->old_gid_for_new_gid (i, &glyph))
+ {
+ /* fonttools retains FDSelect & font dicts for missing glyphs. do the same */
+ glyph = i;
+ }
+ fd = src.get_fd (glyph);
set->add (fd);
if (fd != prev_fd)
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff-common.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff-common.hh
index 915b4c45287..81368ee4c54 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff-common.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff-common.hh
@@ -282,30 +282,35 @@ struct flatten_param_t
bool drop_hints;
};
-template <typename ACC, typename ENV, typename OPSET>
+template <typename ACC, typename ENV, typename OPSET, op_code_t endchar_op=OpCode_Invalid>
struct subr_flattener_t
{
subr_flattener_t (const ACC &acc_,
- const hb_vector_t<hb_codepoint_t> &glyphs_,
- bool drop_hints_) : acc (acc_), glyphs (glyphs_),
- drop_hints (drop_hints_) {}
+ const hb_subset_plan_t *plan_)
+ : acc (acc_), plan (plan_) {}
bool flatten (str_buff_vec_t &flat_charstrings)
{
- if (!flat_charstrings.resize (glyphs.length))
+ if (!flat_charstrings.resize (plan->num_output_glyphs ()))
return false;
- for (unsigned int i = 0; i < glyphs.length; i++)
+ for (unsigned int i = 0; i < plan->num_output_glyphs (); i++)
flat_charstrings[i].init ();
- for (unsigned int i = 0; i < glyphs.length; i++)
+ for (unsigned int i = 0; i < plan->num_output_glyphs (); i++)
{
- hb_codepoint_t glyph = glyphs[i];
+ hb_codepoint_t glyph;
+ if (!plan->old_gid_for_new_gid (i, &glyph))
+ {
+ /* add an endchar only charstring for a missing glyph if CFF1 */
+ if (endchar_op != OpCode_Invalid) flat_charstrings[i].push (endchar_op);
+ continue;
+ }
const byte_str_t str = (*acc.charStrings)[glyph];
unsigned int fd = acc.fdSelect->get_fd (glyph);
if (unlikely (fd >= acc.fdCount))
return false;
cs_interpreter_t<ENV, OPSET, flatten_param_t> interp;
interp.env.init (str, acc, fd);
- flatten_param_t param = { flat_charstrings[i], drop_hints };
+ flatten_param_t param = { flat_charstrings[i], plan->drop_hints };
if (unlikely (!interp.interpret (param)))
return false;
}
@@ -313,8 +318,7 @@ struct subr_flattener_t
}
const ACC &acc;
- const hb_vector_t<hb_codepoint_t> &glyphs;
- bool drop_hints;
+ const hb_subset_plan_t *plan;
};
struct subr_closures_t
@@ -611,10 +615,11 @@ struct subr_remap_ts
hb_vector_t<subr_remap_t> local_remaps;
};
-template <typename SUBSETTER, typename SUBRS, typename ACC, typename ENV, typename OPSET>
+template <typename SUBSETTER, typename SUBRS, typename ACC, typename ENV, typename OPSET, op_code_t endchar_op=OpCode_Invalid>
struct subr_subsetter_t
{
- subr_subsetter_t ()
+ subr_subsetter_t (ACC &acc_, const hb_subset_plan_t *plan_)
+ : acc (acc_), plan (plan_)
{
parsed_charstrings.init ();
parsed_global_subrs.init ();
@@ -644,12 +649,12 @@ struct subr_subsetter_t
* Assumption: a callsubr/callgsubr operator must immediately follow a (biased) subroutine number
* within the same charstring/subroutine, e.g., not split across a charstring and a subroutine.
*/
- bool subset (ACC &acc, const hb_vector_t<hb_codepoint_t> &glyphs, bool drop_hints)
+ bool subset (void)
{
closures.init (acc.fdCount);
remaps.init (acc.fdCount);
- parsed_charstrings.init (glyphs.length);
+ parsed_charstrings.init (plan->num_output_glyphs ());
parsed_global_subrs.init (acc.globalSubrs->count);
parsed_local_subrs.resize (acc.fdCount);
for (unsigned int i = 0; i < acc.fdCount; i++)
@@ -660,9 +665,11 @@ struct subr_subsetter_t
return false;
/* phase 1 & 2 */
- for (unsigned int i = 0; i < glyphs.length; i++)
+ for (unsigned int i = 0; i < plan->num_output_glyphs (); i++)
{
- hb_codepoint_t glyph = glyphs[i];
+ hb_codepoint_t glyph;
+ if (!plan->old_gid_for_new_gid (i, &glyph))
+ continue;
const byte_str_t str = (*acc.charStrings)[glyph];
unsigned int fd = acc.fdSelect->get_fd (glyph);
if (unlikely (fd >= acc.fdCount))
@@ -675,7 +682,7 @@ struct subr_subsetter_t
param.init (&parsed_charstrings[i],
&parsed_global_subrs, &parsed_local_subrs[fd],
closures.global_closure, closures.local_closures[fd],
- drop_hints);
+ plan->drop_hints);
if (unlikely (!interp.interpret (param)))
return false;
@@ -684,19 +691,22 @@ struct subr_subsetter_t
SUBSETTER::finalize_parsed_str (interp.env, param, parsed_charstrings[i]);
}
- if (drop_hints)
+ if (plan->drop_hints)
{
/* mark hint ops and arguments for drop */
- for (unsigned int i = 0; i < glyphs.length; i++)
+ for (unsigned int i = 0; i < plan->num_output_glyphs (); i++)
{
- unsigned int fd = acc.fdSelect->get_fd (glyphs[i]);
+ hb_codepoint_t glyph;
+ if (!plan->old_gid_for_new_gid (i, &glyph))
+ continue;
+ unsigned int fd = acc.fdSelect->get_fd (glyph);
if (unlikely (fd >= acc.fdCount))
return false;
subr_subset_param_t param;
param.init (&parsed_charstrings[i],
&parsed_global_subrs, &parsed_local_subrs[fd],
closures.global_closure, closures.local_closures[fd],
- drop_hints);
+ plan->drop_hints);
drop_hints_param_t drop;
if (drop_hints_in_str (parsed_charstrings[i], param, drop))
@@ -709,16 +719,19 @@ struct subr_subsetter_t
/* after dropping hints recreate closures of actually used subrs */
closures.reset ();
- for (unsigned int i = 0; i < glyphs.length; i++)
+ for (unsigned int i = 0; i < plan->num_output_glyphs (); i++)
{
- unsigned int fd = acc.fdSelect->get_fd (glyphs[i]);
+ hb_codepoint_t glyph;
+ if (!plan->old_gid_for_new_gid (i, &glyph))
+ continue;
+ unsigned int fd = acc.fdSelect->get_fd (glyph);
if (unlikely (fd >= acc.fdCount))
return false;
subr_subset_param_t param;
param.init (&parsed_charstrings[i],
&parsed_global_subrs, &parsed_local_subrs[fd],
closures.global_closure, closures.local_closures[fd],
- drop_hints);
+ plan->drop_hints);
collect_subr_refs_in_str (parsed_charstrings[i], param);
}
}
@@ -728,13 +741,20 @@ struct subr_subsetter_t
return true;
}
- bool encode_charstrings (ACC &acc, const hb_vector_t<hb_codepoint_t> &glyphs, str_buff_vec_t &buffArray) const
+ bool encode_charstrings (str_buff_vec_t &buffArray) const
{
- if (unlikely (!buffArray.resize (glyphs.length)))
+ if (unlikely (!buffArray.resize (plan->num_output_glyphs ())))
return false;
- for (unsigned int i = 0; i < glyphs.length; i++)
+ for (unsigned int i = 0; i < plan->num_output_glyphs (); i++)
{
- unsigned int fd = acc.fdSelect->get_fd (glyphs[i]);
+ hb_codepoint_t glyph;
+ if (!plan->old_gid_for_new_gid (i, &glyph))
+ {
+ /* add an endchar only charstring for a missing glyph if CFF1 */
+ if (endchar_op != OpCode_Invalid) buffArray[i].push (endchar_op);
+ continue;
+ }
+ unsigned int fd = acc.fdSelect->get_fd (glyph);
if (unlikely (fd >= acc.fdCount))
return false;
if (unlikely (!encode_str (parsed_charstrings[i], fd, buffArray[i])))
@@ -777,10 +797,12 @@ struct subr_subsetter_t
drop_hints_param_t ()
: seen_moveto (false),
ends_in_hint (false),
+ all_dropped (false),
vsindex_dropped (false) {}
bool seen_moveto;
bool ends_in_hint;
+ bool all_dropped;
bool vsindex_dropped;
};
@@ -791,7 +813,7 @@ struct subr_subsetter_t
drop.ends_in_hint = false;
bool has_hint = drop_hints_in_str (subrs[subr_num], param, drop);
- /* if this subr ends with a stem hint (i.e., not a number a potential argument for moveto),
+ /* if this subr ends with a stem hint (i.e., not a number; potential argument for moveto),
* then this entire subroutine must be a hint. drop its call. */
if (drop.ends_in_hint)
{
@@ -801,6 +823,10 @@ struct subr_subsetter_t
if (!str.at_end (pos))
drop.ends_in_hint = false;
}
+ else if (drop.all_dropped)
+ {
+ str.values[pos].set_drop ();
+ }
return has_hint;
}
@@ -819,7 +845,6 @@ struct subr_subsetter_t
has_hint = drop_hints_in_subr (str, pos,
*param.parsed_local_subrs, str.values[pos].subr_num,
param, drop);
-
break;
case OpCode_callgsubr:
@@ -876,6 +901,23 @@ struct subr_subsetter_t
}
}
+ /* Raise all_dropped flag if all operators except return are dropped from a subr.
+ * It may happen even after seeing the first moveto if a subr contains
+ * only (usually one) hintmask operator, then calls to this subr can be dropped.
+ */
+ drop.all_dropped = true;
+ for (unsigned int pos = 0; pos < str.values.length; pos++)
+ {
+ parsed_cs_op_t &csop = str.values[pos];
+ if (csop.op == OpCode_return)
+ break;
+ if (!csop.for_drop ())
+ {
+ drop.all_dropped = false;
+ break;
+ }
+ }
+
return seen_hint;
}
@@ -954,13 +996,16 @@ struct subr_subsetter_t
}
protected:
- subr_closures_t closures;
+ const ACC &acc;
+ const hb_subset_plan_t *plan;
+
+ subr_closures_t closures;
- parsed_cs_str_vec_t parsed_charstrings;
- parsed_cs_str_vec_t parsed_global_subrs;
+ parsed_cs_str_vec_t parsed_charstrings;
+ parsed_cs_str_vec_t parsed_global_subrs;
hb_vector_t<parsed_cs_str_vec_t> parsed_local_subrs;
- subr_remap_ts remaps;
+ subr_remap_ts remaps;
private:
typedef typename SUBRS::count_type subr_count_type;
@@ -969,7 +1014,7 @@ struct subr_subsetter_t
} /* namespace CFF */
HB_INTERNAL bool
-hb_plan_subset_cff_fdselect (const hb_vector_t<hb_codepoint_t> &glyphs,
+hb_plan_subset_cff_fdselect (const hb_subset_plan_t *plan,
unsigned int fdCount,
const CFF::FDSelect &src, /* IN */
unsigned int &subset_fd_count /* OUT */,
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff1.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff1.cc
index 5133a4de65c..49ac0bf4299 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff1.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff1.cc
@@ -392,8 +392,11 @@ struct cff1_cs_opset_subr_subset_t : cff1_cs_opset_t<cff1_cs_opset_subr_subset_t
typedef cff1_cs_opset_t<cff1_cs_opset_subr_subset_t, subr_subset_param_t> SUPER;
};
-struct cff1_subr_subsetter_t : subr_subsetter_t<cff1_subr_subsetter_t, CFF1Subrs, const OT::cff1::accelerator_subset_t, cff1_cs_interp_env_t, cff1_cs_opset_subr_subset_t>
+struct cff1_subr_subsetter_t : subr_subsetter_t<cff1_subr_subsetter_t, CFF1Subrs, const OT::cff1::accelerator_subset_t, cff1_cs_interp_env_t, cff1_cs_opset_subr_subset_t, OpCode_endchar>
{
+ cff1_subr_subsetter_t (const OT::cff1::accelerator_subset_t &acc, const hb_subset_plan_t *plan)
+ : subr_subsetter_t (acc, plan) {}
+
static void finalize_parsed_str (cff1_cs_interp_env_t &env, subr_subset_param_t& param, parsed_cs_str_t &charstring)
{
/* insert width at the beginning of the charstring as necessary */
@@ -469,19 +472,24 @@ struct cff_subset_plan {
supp_size = 0;
supp_codes.init ();
- subset_enc_num_codes = plan->glyphs.length - 1;
+ subset_enc_num_codes = plan->num_output_glyphs () - 1;
unsigned int glyph;
- for (glyph = 1; glyph < plan->glyphs.length; glyph++)
+ for (glyph = 1; glyph < plan->num_output_glyphs (); glyph++)
{
- hb_codepoint_t orig_glyph = plan->glyphs[glyph];
- code = acc.glyph_to_code (orig_glyph);
+ hb_codepoint_t old_glyph;
+ if (!plan->old_gid_for_new_gid (glyph, &old_glyph))
+ {
+ /* Retain the code for the old missing glyph ID */
+ old_glyph = glyph;
+ }
+ code = acc.glyph_to_code (old_glyph);
if (code == CFF_UNDEF_CODE)
{
subset_enc_num_codes = glyph - 1;
break;
}
- if (code != last_code + 1)
+ if ((last_code == CFF_UNDEF_CODE) || (code != last_code + 1))
{
code_pair_t pair = { code, glyph };
subset_enc_code_ranges.push (pair);
@@ -490,7 +498,7 @@ struct cff_subset_plan {
if (encoding != &Null(Encoding))
{
- hb_codepoint_t sid = acc.glyph_to_sid (orig_glyph);
+ hb_codepoint_t sid = acc.glyph_to_sid (old_glyph);
encoding->get_supplement_codes (sid, supp_codes);
for (unsigned int i = 0; i < supp_codes.length; i++)
{
@@ -526,15 +534,20 @@ struct cff_subset_plan {
subset_charset_ranges.resize (0);
unsigned int glyph;
- for (glyph = 1; glyph < plan->glyphs.length; glyph++)
+ for (glyph = 1; glyph < plan->num_output_glyphs (); glyph++)
{
- hb_codepoint_t orig_glyph = plan->glyphs[glyph];
- sid = acc.glyph_to_sid (orig_glyph);
+ hb_codepoint_t old_glyph;
+ if (!plan->old_gid_for_new_gid (glyph, &old_glyph))
+ {
+ /* Retain the SID for the old missing glyph ID */
+ old_glyph = glyph;
+ }
+ sid = acc.glyph_to_sid (old_glyph);
if (!acc.is_CID ())
sid = sidmap.add (sid);
- if (sid != last_sid + 1)
+ if ((last_sid == CFF_UNDEF_CODE) || (sid != last_sid + 1))
{
code_pair_t pair = { sid, glyph };
subset_charset_ranges.push (pair);
@@ -544,7 +557,7 @@ struct cff_subset_plan {
bool two_byte = subset_charset_ranges.finalize (glyph);
- size0 = Charset0::min_size + HBUINT16::static_size * (plan->glyphs.length - 1);
+ size0 = Charset0::min_size + HBUINT16::static_size * (plan->num_output_glyphs () - 1);
if (!two_byte)
size_ranges = Charset1::min_size + Charset1_Range::static_size * subset_charset_ranges.length;
else
@@ -559,7 +572,7 @@ struct cff_subset_plan {
return Charset::calculate_serialized_size (
subset_charset_format,
- subset_charset_format? subset_charset_ranges.length: plan->glyphs.length);
+ subset_charset_format? subset_charset_ranges.length: plan->num_output_glyphs ());
}
bool collect_sids_in_dicts (const OT::cff1::accelerator_subset_t &acc)
@@ -586,22 +599,25 @@ struct cff_subset_plan {
}
bool create (const OT::cff1::accelerator_subset_t &acc,
- hb_subset_plan_t *plan)
+ hb_subset_plan_t *plan)
{
- /* make sure notdef is first */
- if ((plan->glyphs.length == 0) || (plan->glyphs[0] != 0)) return false;
+ /* make sure notdef is first */
+ hb_codepoint_t old_glyph;
+ if (!plan->old_gid_for_new_gid (0, &old_glyph) || (old_glyph != 0)) return false;
final_size = 0;
- num_glyphs = plan->glyphs.length;
+ num_glyphs = plan->num_output_glyphs ();
orig_fdcount = acc.fdCount;
drop_hints = plan->drop_hints;
desubroutinize = plan->desubroutinize;
/* check whether the subset renumbers any glyph IDs */
gid_renum = false;
- for (unsigned int glyph = 0; glyph < plan->glyphs.length; glyph++)
+ for (hb_codepoint_t new_glyph = 0; new_glyph < plan->num_output_glyphs (); new_glyph++)
{
- if (plan->glyphs[glyph] != glyph) {
+ if (!plan->old_gid_for_new_gid(new_glyph, &old_glyph))
+ continue;
+ if (new_glyph != old_glyph) {
gid_renum = true;
break;
}
@@ -644,7 +660,7 @@ struct cff_subset_plan {
/* Determine re-mapping of font index as fdmap among other info */
if (acc.fdSelect != &Null(CFF1FDSelect))
{
- if (unlikely (!hb_plan_subset_cff_fdselect (plan->glyphs,
+ if (unlikely (!hb_plan_subset_cff_fdselect (plan,
orig_fdcount,
*acc.fdSelect,
subset_fdcount,
@@ -680,8 +696,8 @@ struct cff_subset_plan {
if (desubroutinize)
{
/* Flatten global & local subrs */
- subr_flattener_t<const OT::cff1::accelerator_subset_t, cff1_cs_interp_env_t, cff1_cs_opset_flatten_t>
- flattener(acc, plan->glyphs, plan->drop_hints);
+ subr_flattener_t<const OT::cff1::accelerator_subset_t, cff1_cs_interp_env_t, cff1_cs_opset_flatten_t, OpCode_endchar>
+ flattener(acc, plan);
if (!flattener.flatten (subset_charstrings))
return false;
@@ -690,12 +706,14 @@ struct cff_subset_plan {
}
else
{
+ cff1_subr_subsetter_t subr_subsetter (acc, plan);
+
/* Subset subrs: collect used subroutines, leaving all unused ones behind */
- if (!subr_subsetter.subset (acc, plan->glyphs, plan->drop_hints))
+ if (!subr_subsetter.subset ())
return false;
/* encode charstrings, global subrs, local subrs with new subroutine numbers */
- if (!subr_subsetter.encode_charstrings (acc, plan->glyphs, subset_charstrings))
+ if (!subr_subsetter.encode_charstrings (subset_charstrings))
return false;
if (!subr_subsetter.encode_globalsubrs (subset_globalsubrs))
@@ -784,7 +802,7 @@ struct cff_subset_plan {
offsets.charStringsInfo.offSize = calcOffSize (dataSize);
if (unlikely (offsets.charStringsInfo.offSize > 4))
return false;
- final_size += CFF1CharStrings::calculate_serialized_size (offsets.charStringsInfo.offSize, plan->glyphs.length, dataSize);
+ final_size += CFF1CharStrings::calculate_serialized_size (offsets.charStringsInfo.offSize, plan->num_output_glyphs (), dataSize);
}
/* private dicts & local subrs */
@@ -816,7 +834,7 @@ struct cff_subset_plan {
if (!acc.is_CID ())
offsets.privateDictInfo = fontdicts_mod[0].privateDictInfo;
- return ((subset_charstrings.length == plan->glyphs.length)
+ return ((subset_charstrings.length == plan->num_output_glyphs ())
&& (fontdicts_mod.length == subset_fdcount));
}
@@ -859,12 +877,11 @@ struct cff_subset_plan {
unsigned int topDictModSIDs[name_dict_values_t::ValCount];
bool desubroutinize;
- cff1_subr_subsetter_t subr_subsetter;
};
static inline bool _write_cff1 (const cff_subset_plan &plan,
const OT::cff1::accelerator_subset_t &acc,
- const hb_vector_t<hb_codepoint_t>& glyphs,
+ unsigned int num_glyphs,
unsigned int dest_sz,
void *dest)
{
@@ -972,7 +989,7 @@ static inline bool _write_cff1 (const cff_subset_plan &plan,
{
assert (plan.offsets.FDSelectInfo.offset == (unsigned) (c.head - c.start));
- if (unlikely (!hb_serialize_cff_fdselect (&c, glyphs.length, *acc.fdSelect, acc.fdCount,
+ if (unlikely (!hb_serialize_cff_fdselect (&c, num_glyphs, *acc.fdSelect, acc.fdCount,
plan.subset_fdselect_format, plan.offsets.FDSelectInfo.size,
plan.subset_fdselect_ranges)))
{
@@ -1064,7 +1081,7 @@ _hb_subset_cff1 (const OT::cff1::accelerator_subset_t &acc,
unsigned int cff_prime_size = cff_plan.get_final_size ();
char *cff_prime_data = (char *) calloc (1, cff_prime_size);
- if (unlikely (!_write_cff1 (cff_plan, acc, plan->glyphs,
+ if (unlikely (!_write_cff1 (cff_plan, acc, plan->num_output_glyphs (),
cff_prime_size, cff_prime_data))) {
DEBUG_MSG(SUBSET, nullptr, "Failed to write a subset cff.");
free (cff_prime_data);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff2.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff2.cc
index 73a292d0655..bf76a3edec4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff2.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-cff2.cc
@@ -225,6 +225,9 @@ struct cff2_cs_opset_subr_subset_t : cff2_cs_opset_t<cff2_cs_opset_subr_subset_t
struct cff2_subr_subsetter_t : subr_subsetter_t<cff2_subr_subsetter_t, CFF2Subrs, const OT::cff2::accelerator_subset_t, cff2_cs_interp_env_t, cff2_cs_opset_subr_subset_t>
{
+ cff2_subr_subsetter_t (const OT::cff2::accelerator_subset_t &acc, const hb_subset_plan_t *plan)
+ : subr_subsetter_t (acc, plan) {}
+
static void finalize_parsed_str (cff2_cs_interp_env_t &env, subr_subset_param_t& param, parsed_cs_str_t &charstring)
{
/* vsindex is inserted at the beginning of the charstring as necessary */
@@ -287,7 +290,7 @@ struct cff2_subset_plan {
{
/* Flatten global & local subrs */
subr_flattener_t<const OT::cff2::accelerator_subset_t, cff2_cs_interp_env_t, cff2_cs_opset_flatten_t>
- flattener(acc, plan->glyphs, plan->drop_hints);
+ flattener(acc, plan);
if (!flattener.flatten (subset_charstrings))
return false;
@@ -296,12 +299,14 @@ struct cff2_subset_plan {
}
else
{
+ cff2_subr_subsetter_t subr_subsetter (acc, plan);
+
/* Subset subrs: collect used subroutines, leaving all unused ones behind */
- if (!subr_subsetter.subset (acc, plan->glyphs, plan->drop_hints))
+ if (!subr_subsetter.subset ())
return false;
/* encode charstrings, global subrs, local subrs with new subroutine numbers */
- if (!subr_subsetter.encode_charstrings (acc, plan->glyphs, subset_charstrings))
+ if (!subr_subsetter.encode_charstrings (subset_charstrings))
return false;
if (!subr_subsetter.encode_globalsubrs (subset_globalsubrs))
@@ -352,7 +357,7 @@ struct cff2_subset_plan {
if (acc.fdSelect != &Null(CFF2FDSelect))
{
offsets.FDSelectInfo.offset = final_size;
- if (unlikely (!hb_plan_subset_cff_fdselect (plan->glyphs,
+ if (unlikely (!hb_plan_subset_cff_fdselect (plan,
orig_fdcount,
*(const FDSelect *)acc.fdSelect,
subset_fdcount,
@@ -385,7 +390,7 @@ struct cff2_subset_plan {
offsets.charStringsInfo.offset = final_size;
unsigned int dataSize = subset_charstrings.total_size ();
offsets.charStringsInfo.offSize = calcOffSize (dataSize);
- final_size += CFF2CharStrings::calculate_serialized_size (offsets.charStringsInfo.offSize, plan->glyphs.length, dataSize);
+ final_size += CFF2CharStrings::calculate_serialized_size (offsets.charStringsInfo.offSize, plan->num_output_glyphs (), dataSize);
}
/* private dicts & local subrs */
@@ -431,12 +436,11 @@ struct cff2_subset_plan {
bool drop_hints;
bool desubroutinize;
- cff2_subr_subsetter_t subr_subsetter;
};
static inline bool _write_cff2 (const cff2_subset_plan &plan,
const OT::cff2::accelerator_subset_t &acc,
- const hb_vector_t<hb_codepoint_t>& glyphs,
+ unsigned int num_glyphs,
unsigned int dest_sz,
void *dest)
{
@@ -493,7 +497,7 @@ static inline bool _write_cff2 (const cff2_subset_plan &plan,
{
assert (plan.offsets.FDSelectInfo.offset == (unsigned) (c.head - c.start));
- if (unlikely (!hb_serialize_cff_fdselect (&c, glyphs.length, *(const FDSelect *)acc.fdSelect, acc.fdArray->count,
+ if (unlikely (!hb_serialize_cff_fdselect (&c, num_glyphs, *(const FDSelect *)acc.fdSelect, acc.fdArray->count,
plan.subset_fdselect_format, plan.offsets.FDSelectInfo.size,
plan.subset_fdselect_ranges)))
{
@@ -584,7 +588,7 @@ _hb_subset_cff2 (const OT::cff2::accelerator_subset_t &acc,
unsigned int cff2_prime_size = cff2_plan.get_final_size ();
char *cff2_prime_data = (char *) calloc (1, cff2_prime_size);
- if (unlikely (!_write_cff2 (cff2_plan, acc, plan->glyphs,
+ if (unlikely (!_write_cff2 (cff2_plan, acc, plan->num_output_glyphs (),
cff2_prime_size, cff2_prime_data))) {
DEBUG_MSG(SUBSET, nullptr, "Failed to write a subset cff2.");
free (cff2_prime_data);
@@ -592,10 +596,10 @@ _hb_subset_cff2 (const OT::cff2::accelerator_subset_t &acc,
}
*prime = hb_blob_create (cff2_prime_data,
- cff2_prime_size,
- HB_MEMORY_MODE_READONLY,
- cff2_prime_data,
- free);
+ cff2_prime_size,
+ HB_MEMORY_MODE_READONLY,
+ cff2_prime_data,
+ free);
return true;
}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-glyf.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-glyf.cc
index cca364d1de0..ee004eeb34e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-glyf.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-glyf.cc
@@ -29,97 +29,128 @@
#include "hb-set.h"
#include "hb-subset-glyf.hh"
+struct loca_data_t
+{
+ bool is_short;
+ void *data;
+ unsigned int size;
+
+ inline bool
+ _write_loca_entry (unsigned int id,
+ unsigned int offset)
+ {
+ unsigned int entry_size = is_short ? sizeof (OT::HBUINT16) : sizeof (OT::HBUINT32);
+ if ((id + 1) * entry_size <= size)
+ {
+ if (is_short) {
+ ((OT::HBUINT16*) data) [id].set (offset / 2);
+ } else {
+ ((OT::HBUINT32*) data) [id].set (offset);
+ }
+ return true;
+ }
+
+ // Offset was not written because the write is out of bounds.
+ DEBUG_MSG(SUBSET,
+ nullptr,
+ "WARNING: Attempted to write an out of bounds loca entry at index %d. Loca size is %d.",
+ id,
+ size);
+ return false;
+ }
+};
+
+/**
+ * If hints are being dropped find the range which in glyf at which
+ * the hinting instructions are located. Add them to the instruction_ranges
+ * vector.
+ */
static bool
-_calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,
- hb_vector_t<hb_codepoint_t> &glyph_ids,
- hb_bool_t drop_hints,
- bool *use_short_loca /* OUT */,
- unsigned int *glyf_size /* OUT */,
- unsigned int *loca_size /* OUT */,
- hb_vector_t<unsigned int> *instruction_ranges /* OUT */)
+_add_instructions_range (const OT::glyf::accelerator_t &glyf,
+ hb_codepoint_t glyph_id,
+ unsigned int glyph_start_offset,
+ unsigned int glyph_end_offset,
+ bool drop_hints,
+ hb_vector_t<unsigned int> *instruction_ranges /* OUT */)
{
- unsigned int total = 0;
- for (unsigned int i = 0; i < glyph_ids.length; i++)
+ if (!instruction_ranges->resize (instruction_ranges->length + 2))
{
- hb_codepoint_t next_glyph = glyph_ids[i];
- if (!instruction_ranges->resize (instruction_ranges->length + 2))
+ DEBUG_MSG(SUBSET, nullptr, "Failed to resize instruction_ranges.");
+ return false;
+ }
+ unsigned int *instruction_start = &(*instruction_ranges)[instruction_ranges->length - 2];
+ *instruction_start = 0;
+ unsigned int *instruction_end = &(*instruction_ranges)[instruction_ranges->length - 1];
+ *instruction_end = 0;
+
+ if (drop_hints)
+ {
+ if (unlikely (!glyf.get_instruction_offsets (glyph_start_offset, glyph_end_offset,
+ instruction_start, instruction_end)))
{
- DEBUG_MSG(SUBSET, nullptr, "Failed to resize instruction_ranges.");
+ DEBUG_MSG(SUBSET, nullptr, "Unable to get instruction offsets for %d", glyph_id);
return false;
}
- unsigned int *instruction_start = &(*instruction_ranges)[instruction_ranges->length - 2];
- *instruction_start = 0;
- unsigned int *instruction_end = &(*instruction_ranges)[instruction_ranges->length - 1];
- *instruction_end = 0;
+ }
+
+ return true;
+}
+static bool
+_calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,
+ const hb_subset_plan_t *plan,
+ loca_data_t *loca_data, /* OUT */
+ unsigned int *glyf_size /* OUT */,
+ hb_vector_t<unsigned int> *instruction_ranges /* OUT */)
+{
+ unsigned int total = 0;
+
+ hb_codepoint_t next_glyph = HB_SET_VALUE_INVALID;
+ while (plan->glyphset ()->next (&next_glyph))
+ {
unsigned int start_offset, end_offset;
if (unlikely (!(glyf.get_offsets (next_glyph, &start_offset, &end_offset) &&
glyf.remove_padding (start_offset, &end_offset))))
{
DEBUG_MSG(SUBSET, nullptr, "Invalid gid %d", next_glyph);
- continue;
+ start_offset = end_offset = 0;
}
- if (end_offset - start_offset < OT::glyf::GlyphHeader::static_size)
- continue; /* 0-length glyph */
- if (drop_hints)
- {
- if (unlikely (!glyf.get_instruction_offsets (start_offset, end_offset,
- instruction_start, instruction_end)))
- {
- DEBUG_MSG(SUBSET, nullptr, "Unable to get instruction offsets for %d", next_glyph);
- return false;
- }
- }
+ bool is_zero_length = end_offset - start_offset < OT::glyf::GlyphHeader::static_size;
+ if (!_add_instructions_range (glyf,
+ next_glyph,
+ start_offset,
+ end_offset,
+ plan->drop_hints && !is_zero_length,
+ instruction_ranges))
+ return false;
- total += end_offset - start_offset - (*instruction_end - *instruction_start);
+ if (is_zero_length)
+ continue; /* 0-length glyph */
+
+ total += end_offset - start_offset
+ - ((*instruction_ranges)[instruction_ranges->length - 1]
+ - (*instruction_ranges)[instruction_ranges->length - 2]);
/* round2 so short loca will work */
total += total % 2;
}
*glyf_size = total;
- *use_short_loca = (total <= 131070);
- *loca_size = (glyph_ids.length + 1)
- * (*use_short_loca ? sizeof (OT::HBUINT16) : sizeof (OT::HBUINT32));
+ loca_data->is_short = (total <= 131070);
+ loca_data->size = (plan->num_output_glyphs () + 1)
+ * (loca_data->is_short ? sizeof (OT::HBUINT16) : sizeof (OT::HBUINT32));
DEBUG_MSG(SUBSET, nullptr, "preparing to subset glyf: final size %d, loca size %d, using %s loca",
total,
- *loca_size,
- *use_short_loca ? "short" : "long");
+ loca_data->size,
+ loca_data->is_short ? "short" : "long");
return true;
}
-static bool
-_write_loca_entry (unsigned int id,
- unsigned int offset,
- bool is_short,
- void *loca_prime,
- unsigned int loca_size)
-{
- unsigned int entry_size = is_short ? sizeof (OT::HBUINT16) : sizeof (OT::HBUINT32);
- if ((id + 1) * entry_size <= loca_size)
- {
- if (is_short) {
- ((OT::HBUINT16*) loca_prime) [id].set (offset / 2);
- } else {
- ((OT::HBUINT32*) loca_prime) [id].set (offset);
- }
- return true;
- }
-
- // Offset was not written because the write is out of bounds.
- DEBUG_MSG(SUBSET,
- nullptr,
- "WARNING: Attempted to write an out of bounds loca entry at index %d. Loca size is %d.",
- id,
- loca_size);
- return false;
-}
-
static void
-_update_components (hb_subset_plan_t * plan,
- char * glyph_start,
- unsigned int length)
+_update_components (const hb_subset_plan_t *plan,
+ char *glyph_start,
+ unsigned int length)
{
OT::glyf::CompositeGlyphHeader::Iterator iterator;
if (OT::glyf::CompositeGlyphHeader::get_iterator (glyph_start,
@@ -153,24 +184,35 @@ static bool _remove_composite_instruction_flag (char *glyf_prime, unsigned int l
}
static bool
-_write_glyf_and_loca_prime (hb_subset_plan_t *plan,
+_write_glyf_and_loca_prime (const hb_subset_plan_t *plan,
const OT::glyf::accelerator_t &glyf,
const char *glyf_data,
- bool use_short_loca,
- hb_vector_t<unsigned int> &instruction_ranges,
+ hb_vector_t<unsigned int> &instruction_ranges,
unsigned int glyf_prime_size,
char *glyf_prime_data /* OUT */,
- unsigned int loca_prime_size,
- char *loca_prime_data /* OUT */)
+ loca_data_t *loca_prime /* OUT */)
{
- hb_vector_t<hb_codepoint_t> &glyph_ids = plan->glyphs;
char *glyf_prime_data_next = glyf_prime_data;
bool success = true;
- for (unsigned int i = 0; i < glyph_ids.length; i++)
+
+
+ unsigned int i = 0;
+ hb_codepoint_t new_gid;
+ for (new_gid = 0; new_gid < plan->num_output_glyphs (); new_gid++)
{
+ hb_codepoint_t old_gid;
+ if (!plan->old_gid_for_new_gid (new_gid, &old_gid))
+ {
+ // Empty glyph, add a loca entry and carry on.
+ loca_prime->_write_loca_entry (new_gid,
+ glyf_prime_data_next - glyf_prime_data);
+ continue;
+ }
+
+
unsigned int start_offset, end_offset;
- if (unlikely (!(glyf.get_offsets (glyph_ids[i], &start_offset, &end_offset) &&
+ if (unlikely (!(glyf.get_offsets (old_gid, &start_offset, &end_offset) &&
glyf.remove_padding (start_offset, &end_offset))))
end_offset = start_offset = 0;
@@ -182,9 +224,9 @@ _write_glyf_and_loca_prime (hb_subset_plan_t *plan,
if (glyf_prime_data_next + length > glyf_prime_data + glyf_prime_size)
{
DEBUG_MSG(SUBSET,
- nullptr,
- "WARNING: Attempted to write an out of bounds glyph entry for gid %d (length %d)",
- i, length);
+ nullptr,
+ "WARNING: Attempted to write an out of bounds glyph entry for gid %d (length %d)",
+ i, length);
return false;
}
@@ -204,22 +246,20 @@ _write_glyf_and_loca_prime (hb_subset_plan_t *plan,
memset (glyf_prime_data_next + instruction_start - start_offset - 2, 0, 2);
}
- success = success && _write_loca_entry (i,
- glyf_prime_data_next - glyf_prime_data,
- use_short_loca,
- loca_prime_data,
- loca_prime_size);
+ success = success && loca_prime->_write_loca_entry (new_gid,
+ glyf_prime_data_next - glyf_prime_data);
_update_components (plan, glyf_prime_data_next, length);
// TODO: don't align to two bytes if using long loca.
glyf_prime_data_next += length + (length % 2); // Align to 2 bytes for short loca.
+
+ i++;
}
- success = success && _write_loca_entry (glyph_ids.length,
- glyf_prime_data_next - glyf_prime_data,
- use_short_loca,
- loca_prime_data,
- loca_prime_size);
+ // loca table has n+1 entries where the last entry signifies the end location of the last
+ // glyph.
+ success = success && loca_prime->_write_loca_entry (new_gid,
+ glyf_prime_data_next - glyf_prime_data);
return success;
}
@@ -228,52 +268,48 @@ _hb_subset_glyf_and_loca (const OT::glyf::accelerator_t &glyf,
const char *glyf_data,
hb_subset_plan_t *plan,
bool *use_short_loca,
- hb_blob_t **glyf_prime /* OUT */,
- hb_blob_t **loca_prime /* OUT */)
+ hb_blob_t **glyf_prime_blob /* OUT */,
+ hb_blob_t **loca_prime_blob /* OUT */)
{
// TODO(grieger): Sanity check allocation size for the new table.
- hb_vector_t<hb_codepoint_t> &glyphs_to_retain = plan->glyphs;
-
+ loca_data_t loca_prime;
unsigned int glyf_prime_size;
- unsigned int loca_prime_size;
hb_vector_t<unsigned int> instruction_ranges;
instruction_ranges.init ();
if (unlikely (!_calculate_glyf_and_loca_prime_size (glyf,
- glyphs_to_retain,
- plan->drop_hints,
- use_short_loca,
+ plan,
+ &loca_prime,
&glyf_prime_size,
- &loca_prime_size,
&instruction_ranges))) {
instruction_ranges.fini ();
return false;
}
+ *use_short_loca = loca_prime.is_short;
char *glyf_prime_data = (char *) calloc (1, glyf_prime_size);
- char *loca_prime_data = (char *) calloc (1, loca_prime_size);
+ loca_prime.data = (void *) calloc (1, loca_prime.size);
if (unlikely (!_write_glyf_and_loca_prime (plan, glyf, glyf_data,
- *use_short_loca,
instruction_ranges,
glyf_prime_size, glyf_prime_data,
- loca_prime_size, loca_prime_data))) {
+ &loca_prime))) {
free (glyf_prime_data);
- free (loca_prime_data);
+ free (loca_prime.data);
instruction_ranges.fini ();
return false;
}
instruction_ranges.fini ();
- *glyf_prime = hb_blob_create (glyf_prime_data,
- glyf_prime_size,
- HB_MEMORY_MODE_READONLY,
- glyf_prime_data,
- free);
- *loca_prime = hb_blob_create (loca_prime_data,
- loca_prime_size,
- HB_MEMORY_MODE_READONLY,
- loca_prime_data,
- free);
+ *glyf_prime_blob = hb_blob_create (glyf_prime_data,
+ glyf_prime_size,
+ HB_MEMORY_MODE_READONLY,
+ glyf_prime_data,
+ free);
+ *loca_prime_blob = hb_blob_create ((char *) loca_prime.data,
+ loca_prime.size,
+ HB_MEMORY_MODE_READONLY,
+ loca_prime.data,
+ free);
return true;
}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-input.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-input.cc
index f718a566b19..693c9c21ee9 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-input.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-input.cc
@@ -44,7 +44,10 @@ hb_subset_input_create_or_fail ()
input->unicodes = hb_set_create ();
input->glyphs = hb_set_create ();
+ input->drop_hints = false;
input->drop_layout = true;
+ input->desubroutinize = false;
+ input->retain_gids = false;
return input;
}
@@ -144,3 +147,27 @@ hb_subset_input_get_desubroutinize (hb_subset_input_t *subset_input)
{
return subset_input->desubroutinize;
}
+
+/**
+ * hb_subset_input_set_retain_gids:
+ * @subset_input: a subset_input.
+ * @retain_gids: If true the subsetter will not renumber glyph ids.
+ * Since: REPLACEME
+ **/
+HB_EXTERN void
+hb_subset_input_set_retain_gids (hb_subset_input_t *subset_input,
+ hb_bool_t retain_gids)
+{
+ subset_input->retain_gids = retain_gids;
+}
+
+/**
+ * hb_subset_input_get_retain_gids:
+ * Returns: value of retain_gids.
+ * Since: REPLACEME
+ **/
+HB_EXTERN hb_bool_t
+hb_subset_input_get_retain_gids (hb_subset_input_t *subset_input)
+{
+ return subset_input->retain_gids;
+}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-input.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-input.hh
index 8dad94f584e..04d6e121b77 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-input.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-input.hh
@@ -44,6 +44,7 @@ struct hb_subset_input_t
bool drop_hints : 1;
bool drop_layout : 1;
bool desubroutinize : 1;
+ bool retain_gids : 1;
/* TODO
*
* features
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-plan.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-plan.cc
index cff3426707a..8b72314940e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-plan.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-plan.cc
@@ -96,10 +96,10 @@ _remove_invalid_gids (hb_set_t *glyphs,
static hb_set_t *
_populate_gids_to_retain (hb_face_t *face,
const hb_set_t *unicodes,
+ const hb_set_t *input_glyphs_to_retain,
bool close_over_gsub,
hb_set_t *unicodes_to_retain,
- hb_map_t *codepoint_to_glyph,
- hb_vector_t<hb_codepoint_t> *glyphs)
+ hb_map_t *codepoint_to_glyph)
{
OT::cmap::accelerator_t cmap;
OT::glyf::accelerator_t glyf;
@@ -110,6 +110,7 @@ _populate_gids_to_retain (hb_face_t *face,
hb_set_t *initial_gids_to_retain = hb_set_create ();
initial_gids_to_retain->add (0); // Not-def
+ hb_set_union (initial_gids_to_retain, input_glyphs_to_retain);
hb_codepoint_t cp = HB_SET_VALUE_INVALID;
while (unicodes->next (&cp))
@@ -143,10 +144,6 @@ _populate_gids_to_retain (hb_face_t *face,
_remove_invalid_gids (all_gids_to_retain, face->get_num_glyphs ());
- glyphs->alloc (all_gids_to_retain->get_population ());
- gid = HB_SET_VALUE_INVALID;
- while (all_gids_to_retain->next (&gid))
- glyphs->push (gid);
cff.fini ();
glyf.fini ();
@@ -156,11 +153,35 @@ _populate_gids_to_retain (hb_face_t *face,
}
static void
-_create_old_gid_to_new_gid_map (const hb_vector_t<hb_codepoint_t> &glyphs,
- hb_map_t *glyph_map)
+_create_old_gid_to_new_gid_map (const hb_face_t *face,
+ bool retain_gids,
+ hb_set_t *all_gids_to_retain,
+ hb_map_t *glyph_map, /* OUT */
+ hb_map_t *reverse_glyph_map, /* OUT */
+ unsigned int *num_glyphs /* OUT */)
{
- for (unsigned int i = 0; i < glyphs.length; i++) {
- glyph_map->set (glyphs[i], i);
+ hb_codepoint_t gid = HB_SET_VALUE_INVALID;
+ unsigned int length = 0;
+ for (unsigned int i = 0; all_gids_to_retain->next (&gid); i++) {
+ if (!retain_gids)
+ {
+ glyph_map->set (gid, i);
+ reverse_glyph_map->set (i, gid);
+ }
+ else
+ {
+ glyph_map->set (gid, gid);
+ reverse_glyph_map->set (gid, gid);
+ }
+ ++length;
+ }
+ if (!retain_gids || length == 0)
+ {
+ *num_glyphs = length;
+ }
+ else
+ {
+ *num_glyphs = face->get_num_glyphs ();
}
}
@@ -184,19 +205,24 @@ hb_subset_plan_create (hb_face_t *face,
plan->drop_layout = input->drop_layout;
plan->desubroutinize = input->desubroutinize;
plan->unicodes = hb_set_create();
- plan->glyphs.init();
plan->source = hb_face_reference (face);
plan->dest = hb_face_builder_create ();
plan->codepoint_to_glyph = hb_map_create();
plan->glyph_map = hb_map_create();
- plan->glyphset = _populate_gids_to_retain (face,
- input->unicodes,
- !plan->drop_layout,
- plan->unicodes,
- plan->codepoint_to_glyph,
- &plan->glyphs);
- _create_old_gid_to_new_gid_map (plan->glyphs,
- plan->glyph_map);
+ plan->reverse_glyph_map = hb_map_create();
+ plan->_glyphset = _populate_gids_to_retain (face,
+ input->unicodes,
+ input->glyphs,
+ !plan->drop_layout,
+ plan->unicodes,
+ plan->codepoint_to_glyph);
+
+ _create_old_gid_to_new_gid_map (face,
+ input->retain_gids,
+ plan->_glyphset,
+ plan->glyph_map,
+ plan->reverse_glyph_map,
+ &plan->_num_output_glyphs);
return plan;
}
@@ -212,12 +238,12 @@ hb_subset_plan_destroy (hb_subset_plan_t *plan)
if (!hb_object_destroy (plan)) return;
hb_set_destroy (plan->unicodes);
- plan->glyphs.fini ();
hb_face_destroy (plan->source);
hb_face_destroy (plan->dest);
hb_map_destroy (plan->codepoint_to_glyph);
hb_map_destroy (plan->glyph_map);
- hb_set_destroy (plan->glyphset);
+ hb_map_destroy (plan->reverse_glyph_map);
+ hb_set_destroy (plan->_glyphset);
free (plan);
}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-plan.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-plan.hh
index a710a4dc040..56726d4d043 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-plan.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset-plan.hh
@@ -33,6 +33,7 @@
#include "hb-subset-input.hh"
#include "hb-map.hh"
+#include "hb-set.hh"
struct hb_subset_plan_t
{
@@ -45,18 +46,51 @@ struct hb_subset_plan_t
// For each cp that we'd like to retain maps to the corresponding gid.
hb_set_t *unicodes;
- hb_vector_t<hb_codepoint_t> glyphs;
- hb_set_t *glyphset;
-
+ // The glyph subset
hb_map_t *codepoint_to_glyph;
+
+ // Old -> New glyph id mapping
hb_map_t *glyph_map;
+ hb_map_t *reverse_glyph_map;
// Plan is only good for a specific source/dest so keep them with it
hb_face_t *source;
hb_face_t *dest;
- bool new_gid_for_codepoint (hb_codepoint_t codepoint,
- hb_codepoint_t *new_gid) const
+ unsigned int _num_output_glyphs;
+ hb_set_t *_glyphset;
+
+ public:
+
+ /*
+ * The set of input glyph ids which will be retained in the subset.
+ */
+ inline const hb_set_t *
+ glyphset () const
+ {
+ return _glyphset;
+ }
+
+ /*
+ * The total number of output glyphs in the final subset.
+ */
+ inline unsigned int
+ num_output_glyphs () const
+ {
+ return _num_output_glyphs;
+ }
+
+ /*
+ * Given an output gid , returns true if that glyph id is an empty
+ * glyph (ie. it's a gid that we are dropping all data for).
+ */
+ inline bool is_empty_glyph (hb_codepoint_t gid) const
+ {
+ return !_glyphset->has (gid);
+ }
+
+ inline bool new_gid_for_codepoint (hb_codepoint_t codepoint,
+ hb_codepoint_t *new_gid) const
{
hb_codepoint_t old_gid = codepoint_to_glyph->get (codepoint);
if (old_gid == HB_MAP_VALUE_INVALID)
@@ -65,8 +99,8 @@ struct hb_subset_plan_t
return new_gid_for_old_gid (old_gid, new_gid);
}
- bool new_gid_for_old_gid (hb_codepoint_t old_gid,
- hb_codepoint_t *new_gid) const
+ inline bool new_gid_for_old_gid (hb_codepoint_t old_gid,
+ hb_codepoint_t *new_gid) const
{
hb_codepoint_t gid = glyph_map->get (old_gid);
if (gid == HB_MAP_VALUE_INVALID)
@@ -76,7 +110,18 @@ struct hb_subset_plan_t
return true;
}
- bool
+ inline bool old_gid_for_new_gid (hb_codepoint_t new_gid,
+ hb_codepoint_t *old_gid) const
+ {
+ hb_codepoint_t gid = reverse_glyph_map->get (new_gid);
+ if (gid == HB_MAP_VALUE_INVALID)
+ return false;
+
+ *old_gid = gid;
+ return true;
+ }
+
+ inline bool
add_table (hb_tag_t tag,
hb_blob_t *contents)
{
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset.cc
index 37e7cec2e3b..135265fc166 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset.cc
@@ -52,7 +52,7 @@ _plan_estimate_subset_table_size (hb_subset_plan_t *plan,
unsigned int table_len)
{
unsigned int src_glyphs = plan->source->get_num_glyphs ();
- unsigned int dst_glyphs = plan->glyphset->get_population ();
+ unsigned int dst_glyphs = plan->glyphset ()->get_population ();
if (unlikely (!src_glyphs))
return 512 + table_len;
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset.h b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset.h
index f582e46df71..657709ec815 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset.h
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-subset.h
@@ -72,6 +72,12 @@ hb_subset_input_set_desubroutinize (hb_subset_input_t *subset_input,
HB_EXTERN hb_bool_t
hb_subset_input_get_desubroutinize (hb_subset_input_t *subset_input);
+HB_EXTERN void
+hb_subset_input_set_retain_gids (hb_subset_input_t *subset_input,
+ hb_bool_t retain_gids);
+HB_EXTERN hb_bool_t
+hb_subset_input_get_retain_gids (hb_subset_input_t *subset_input);
+
/* hb_subset () */
HB_EXTERN hb_face_t *
hb_subset (hb_face_t *source, hb_subset_input_t *input);
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ucdn.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ucdn.cc
index 534935f13d2..8230bf1e8e4 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ucdn.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ucdn.cc
@@ -171,6 +171,10 @@ static const hb_script_t ucdn_script_translate[] =
HB_SCRIPT_MEDEFAIDRIN,
HB_SCRIPT_OLD_SOGDIAN,
HB_SCRIPT_SOGDIAN,
+ HB_SCRIPT_ELYMAIC,
+ HB_SCRIPT_NANDINAGARI,
+ HB_SCRIPT_NYIAKENG_PUACHUE_HMONG,
+ HB_SCRIPT_WANCHO,
};
static hb_unicode_combining_class_t
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode-emoji-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode-emoji-table.hh
index 1dd0b3211e8..aa297fcf94d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode-emoji-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode-emoji-table.hh
@@ -7,13 +7,13 @@
* on file with this header:
*
* # emoji-data.txt
- * # Date: 2018-02-07, 07:55:18 GMT
- * # © 2018 Unicode®, Inc.
+ * # Date: 2019-01-15, 12:10:05 GMT
+ * # © 2019 Unicode®, Inc.
* # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
* # For terms of use, see http://www.unicode.org/terms_of_use.html
* #
* # Emoji Data for UTS #51
- * # Version: 11.0
+ * # Version: 12.0
* #
* # For documentation and usage, see http://www.unicode.org/reports/tr51
*/
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb.hh
index 5b66ba85d19..ec24c1ae0f3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb.hh
@@ -214,7 +214,8 @@ extern "C" int hb_memalign_impl(void **memptr, size_t alignment, size_t size);
* Compiler attributes
*/
-#if __cplusplus < 201103L
+/* https://github.com/harfbuzz/harfbuzz/issues/1634 */
+#if __cplusplus < 201103L && !defined(_MSC_VER)
#ifndef nullptr
#define nullptr NULL