[config] Don't disable emoji sequences in HB_TINY

It makes sense to disable this code these if editing is not needed.
However, this is also necessary to correctly display emoji sequences
in right-to-left direction.  For that reason, don't auto-disable it.

diff --git a/src/hb-config.hh b/src/hb-config.hh
index 6a95501..adf2b33 100644 (file)
--- a/src/hb-config.hh
+++ b/src/hb-config.hh
@@ -58,7 +58,6 @@
 #define HB_NO_BITMAP
 #define HB_NO_CFF
 #define HB_NO_COLOR
-#define HB_NO_EMOJI
 #define HB_NO_FACE_COLLECT_UNICODES
 #define HB_NO_GETENV
 #define HB_NO_HINTING

diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 7ae0925..c8bda2a 100644 (file)
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -479,7 +479,7 @@ hb_set_unicode_props (hb_buffer_t *buffer)
     {
        _hb_glyph_info_set_continuation (&info[i]);
     }
-#ifndef HB_NO_EMOJI
+#ifndef HB_NO_EMOJI_SEQUENCES
     else if (unlikely (_hb_glyph_info_is_zwj (&info[i])))
     {
       _hb_glyph_info_set_continuation (&info[i]);

diff --git a/src/hb-unicode.cc b/src/hb-unicode.cc
index be87759..ed4fb77 100644 (file)
--- a/src/hb-unicode.cc
+++ b/src/hb-unicode.cc
@@ -572,7 +572,7 @@ _hb_modified_combining_class[256] =
 /*
  * Emoji
  */
-#ifndef HB_NO_EMOJI
+#ifndef HB_NO_EMOJI_SEQUENCES
 
 #include "hb-unicode-emoji-table.hh"