summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode.cc
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2019-08-14 22:15:47 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2019-08-14 22:15:47 +0000
commitc34a1db4898940561d930b352086459acb246918 (patch)
treee8eed46f0b1fadd8924d05712b0c5d4f28194058 /Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode.cc
parent5630d54170b9d8a8aabf2ad7e84c92840b86160d (diff)
harfbuzz 2.6.0
git-svn-id: svn://tug.org/texlive/trunk@51882 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode.cc')
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode.cc19
1 files changed, 11 insertions, 8 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode.cc
index 9ec2d85634d..9a8184063df 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode.cc
@@ -126,10 +126,12 @@ hb_unicode_decompose_compatibility_nil (hb_unicode_funcs_t *ufuncs HB_UNUSED
}
#endif
-
-extern "C" hb_unicode_funcs_t *hb_ucd_get_unicode_funcs ();
-extern "C" hb_unicode_funcs_t *hb_glib_get_unicode_funcs ();
-extern "C" hb_unicode_funcs_t *hb_icu_get_unicode_funcs ();
+#if !defined(HB_NO_UNICODE_FUNCS) && defined(HAVE_GLIB)
+#include "hb-glib.h"
+#endif
+#if !defined(HB_NO_UNICODE_FUNCS) && defined(HAVE_ICU) && defined(HAVE_ICU_BUILTIN)
+#include "hb-icu.h"
+#endif
hb_unicode_funcs_t *
hb_unicode_funcs_get_default ()
@@ -453,6 +455,7 @@ hb_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs,
#endif
+#ifndef HB_NO_OT_SHAPE
/* See hb-unicode.hh for details. */
const uint8_t
_hb_modified_combining_class[256] =
@@ -565,19 +568,19 @@ _hb_modified_combining_class[256] =
241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
255, /* HB_UNICODE_COMBINING_CLASS_INVALID */
};
+#endif
/*
* Emoji
*/
+#ifndef HB_NO_EMOJI_SEQUENCES
#include "hb-unicode-emoji-table.hh"
bool
_hb_unicode_is_emoji_Extended_Pictographic (hb_codepoint_t cp)
{
- return hb_bsearch (&cp, _hb_unicode_emoji_Extended_Pictographic_table,
- ARRAY_LENGTH (_hb_unicode_emoji_Extended_Pictographic_table),
- sizeof (hb_unicode_range_t),
- hb_unicode_range_t::cmp);
+ return _hb_emoji_is_Extended_Pictographic (cp);
}
+#endif