[HarfBuzz] harfbuzz-ng: Branch 'master' - 5 commits

Behdad Esfahbod behdad at kemper.freedesktop.org
Wed Mar 7 09:56:51 PST 2012


 src/hb-common.cc                   |    6 +
 src/hb-common.h                    |  203 +++++++++++++++++++------------------
 src/hb-glib.cc                     |   11 +-
 src/hb-ot-shape-complex-private.hh |    9 +
 4 files changed, 129 insertions(+), 100 deletions(-)

New commits:
commit f91136cb528e298651c4a8a8a1d6dc54136e09ce
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Mar 7 12:56:22 2012 -0500

    Route three Unicode 6.1 scripts through Indic shaper

diff --git a/src/hb-ot-shape-complex-private.hh b/src/hb-ot-shape-complex-private.hh
index 652d90a..52d0523 100644
--- a/src/hb-ot-shape-complex-private.hh
+++ b/src/hb-ot-shape-complex-private.hh
@@ -79,7 +79,9 @@ hb_ot_shape_complex_categorize (const hb_segment_properties_t *props)
     /* Note:
      *
      * These disabled scripts are listed in ucd/IndicSyllabicCategory.txt, but according
-     * to Martin Hosken do not require complex shaping.
+     * to Martin Hosken and Jonathan Kew do not require complex shaping.
+     *
+     * TODO We should automate figuring out which scripts do not need complex shaping
      *
      * TODO We currently keep data for these scripts in our indic table.  Need to fix the
      * generator to not do that.
@@ -113,6 +115,7 @@ hb_ot_shape_complex_categorize (const hb_segment_properties_t *props)
     case HB_SCRIPT_BALINESE:
     case HB_SCRIPT_BENGALI:
     case HB_SCRIPT_BUGINESE:
+    case HB_SCRIPT_CHAKMA:
     case HB_SCRIPT_CHAM:
     case HB_SCRIPT_DEVANAGARI:
     case HB_SCRIPT_GUJARATI:
@@ -127,9 +130,11 @@ hb_ot_shape_complex_categorize (const hb_segment_properties_t *props)
     case HB_SCRIPT_NEW_TAI_LUE:
     case HB_SCRIPT_ORIYA:
     case HB_SCRIPT_REJANG:
+    case HB_SCRIPT_SHARADA:
     case HB_SCRIPT_SINHALA:
     case HB_SCRIPT_SUNDANESE:
     case HB_SCRIPT_TAI_THAM:
+    case HB_SCRIPT_TAKRI:
     case HB_SCRIPT_TAMIL:
     case HB_SCRIPT_TELUGU:
       return hb_ot_complex_shaper_indic;
commit f32c0012ad794cd2df669dfc7b0438fafbe38b2d
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Mar 7 12:53:34 2012 -0500

    Add Unicode 6.1.0 scripts

diff --git a/src/hb-common.h b/src/hb-common.h
index 75ae899..ca51c1f 100644
--- a/src/hb-common.h
+++ b/src/hb-common.h
@@ -285,6 +285,15 @@ typedef enum
   HB_SCRIPT_BRAHMI			= HB_TAG ('B','r','a','h'),
   HB_SCRIPT_MANDAIC			= HB_TAG ('M','a','n','d'),
 
+  /* Unicode-6.1 additions */
+  HB_SCRIPT_CHAKMA			= HB_TAG ('C','a','k','m'),
+  HB_SCRIPT_MEROITIC_CURSIVE		= HB_TAG ('M','e','r','c'),
+  HB_SCRIPT_MEROITIC_HIEROGLYPHS	= HB_TAG ('M','e','r','o'),
+  HB_SCRIPT_MIAO			= HB_TAG ('P','l','r','d'),
+  HB_SCRIPT_SHARADA			= HB_TAG ('S','h','r','d'),
+  HB_SCRIPT_SORA_SOMPENG		= HB_TAG ('S','o','r','a'),
+  HB_SCRIPT_TAKRI			= HB_TAG ('T','a','k','r'),
+
   /* No script set */
   HB_SCRIPT_INVALID			= HB_TAG_NONE
 } hb_script_t;
diff --git a/src/hb-glib.cc b/src/hb-glib.cc
index f990988..26d40a3 100644
--- a/src/hb-glib.cc
+++ b/src/hb-glib.cc
@@ -144,7 +144,16 @@ glib_script_to_script[] =
   /* Unicode-6.0 additions */
   HB_SCRIPT_BATAK,
   HB_SCRIPT_BRAHMI,
-  HB_SCRIPT_MANDAIC
+  HB_SCRIPT_MANDAIC,
+
+  /* Unicode-6.1 additions */
+  HB_SCRIPT_CHAKMA,
+  HB_SCRIPT_MEROITIC_CURSIVE,
+  HB_SCRIPT_MEROITIC_HIEROGLYPHS,
+  HB_SCRIPT_MIAO,
+  HB_SCRIPT_SHARADA,
+  HB_SCRIPT_SORA_SOMPENG,
+  HB_SCRIPT_TAKRI
 };
 #endif
 
commit 50e810cd0e55c25fddb0a2fd0861c51fbf65700e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Mar 7 12:49:08 2012 -0500

    Lydian and Kharoshthi are right-to-left

diff --git a/src/hb-common.cc b/src/hb-common.cc
index 6093289..170b75f 100644
--- a/src/hb-common.cc
+++ b/src/hb-common.cc
@@ -274,10 +274,16 @@ hb_script_get_horizontal_direction (hb_script_t script)
     /* Unicode-4.0 additions */
     case HB_SCRIPT_CYPRIOT:
 
+    /* Unicode-4.1 additions */
+    case HB_SCRIPT_KHAROSHTHI:
+
     /* Unicode-5.0 additions */
     case HB_SCRIPT_PHOENICIAN:
     case HB_SCRIPT_NKO:
 
+    /* Unicode-5.1 additions */
+    case HB_SCRIPT_LYDIAN:
+
     /* Unicode-5.2 additions */
     case HB_SCRIPT_AVESTAN:
     case HB_SCRIPT_IMPERIAL_ARAMAIC:
commit a52835635e4a2a12715aff2febb561515a10cd5a
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Mar 7 12:38:39 2012 -0500

    Whitespace

diff --git a/src/hb-common.h b/src/hb-common.h
index b7fef32..75ae899 100644
--- a/src/hb-common.h
+++ b/src/hb-common.h
@@ -176,117 +176,117 @@ typedef enum
 /* http://unicode.org/iso15924/ */
 typedef enum
 {
-  HB_SCRIPT_COMMON                  = HB_TAG ('Z','y','y','y'),
-  HB_SCRIPT_INHERITED               = HB_TAG ('Z','i','n','h'),
-  HB_SCRIPT_ARABIC                  = HB_TAG ('A','r','a','b'),
-  HB_SCRIPT_ARMENIAN                = HB_TAG ('A','r','m','n'),
-  HB_SCRIPT_BENGALI                 = HB_TAG ('B','e','n','g'),
-  HB_SCRIPT_BOPOMOFO                = HB_TAG ('B','o','p','o'),
-  HB_SCRIPT_CHEROKEE                = HB_TAG ('C','h','e','r'),
-  HB_SCRIPT_COPTIC                  = HB_TAG ('C','o','p','t'),
-  HB_SCRIPT_CYRILLIC                = HB_TAG ('C','y','r','l'),
-  HB_SCRIPT_DESERET                 = HB_TAG ('D','s','r','t'),
-  HB_SCRIPT_DEVANAGARI              = HB_TAG ('D','e','v','a'),
-  HB_SCRIPT_ETHIOPIC                = HB_TAG ('E','t','h','i'),
-  HB_SCRIPT_GEORGIAN                = HB_TAG ('G','e','o','r'),
-  HB_SCRIPT_GOTHIC                  = HB_TAG ('G','o','t','h'),
-  HB_SCRIPT_GREEK                   = HB_TAG ('G','r','e','k'),
-  HB_SCRIPT_GUJARATI                = HB_TAG ('G','u','j','r'),
-  HB_SCRIPT_GURMUKHI                = HB_TAG ('G','u','r','u'),
-  HB_SCRIPT_HAN                     = HB_TAG ('H','a','n','i'),
-  HB_SCRIPT_HANGUL                  = HB_TAG ('H','a','n','g'),
-  HB_SCRIPT_HEBREW                  = HB_TAG ('H','e','b','r'),
-  HB_SCRIPT_HIRAGANA                = HB_TAG ('H','i','r','a'),
-  HB_SCRIPT_KANNADA                 = HB_TAG ('K','n','d','a'),
-  HB_SCRIPT_KATAKANA                = HB_TAG ('K','a','n','a'),
-  HB_SCRIPT_KHMER                   = HB_TAG ('K','h','m','r'),
-  HB_SCRIPT_LAO                     = HB_TAG ('L','a','o','o'),
-  HB_SCRIPT_LATIN                   = HB_TAG ('L','a','t','n'),
-  HB_SCRIPT_MALAYALAM               = HB_TAG ('M','l','y','m'),
-  HB_SCRIPT_MONGOLIAN               = HB_TAG ('M','o','n','g'),
-  HB_SCRIPT_MYANMAR                 = HB_TAG ('M','y','m','r'),
-  HB_SCRIPT_OGHAM                   = HB_TAG ('O','g','a','m'),
-  HB_SCRIPT_OLD_ITALIC              = HB_TAG ('I','t','a','l'),
-  HB_SCRIPT_ORIYA                   = HB_TAG ('O','r','y','a'),
-  HB_SCRIPT_RUNIC                   = HB_TAG ('R','u','n','r'),
-  HB_SCRIPT_SINHALA                 = HB_TAG ('S','i','n','h'),
-  HB_SCRIPT_SYRIAC                  = HB_TAG ('S','y','r','c'),
-  HB_SCRIPT_TAMIL                   = HB_TAG ('T','a','m','l'),
-  HB_SCRIPT_TELUGU                  = HB_TAG ('T','e','l','u'),
-  HB_SCRIPT_THAANA                  = HB_TAG ('T','h','a','a'),
-  HB_SCRIPT_THAI                    = HB_TAG ('T','h','a','i'),
-  HB_SCRIPT_TIBETAN                 = HB_TAG ('T','i','b','t'),
-  HB_SCRIPT_CANADIAN_ABORIGINAL     = HB_TAG ('C','a','n','s'),
-  HB_SCRIPT_YI                      = HB_TAG ('Y','i','i','i'),
-  HB_SCRIPT_TAGALOG                 = HB_TAG ('T','g','l','g'),
-  HB_SCRIPT_HANUNOO                 = HB_TAG ('H','a','n','o'),
-  HB_SCRIPT_BUHID                   = HB_TAG ('B','u','h','d'),
-  HB_SCRIPT_TAGBANWA                = HB_TAG ('T','a','g','b'),
+  HB_SCRIPT_COMMON			= HB_TAG ('Z','y','y','y'),
+  HB_SCRIPT_INHERITED			= HB_TAG ('Z','i','n','h'),
+  HB_SCRIPT_ARABIC			= HB_TAG ('A','r','a','b'),
+  HB_SCRIPT_ARMENIAN			= HB_TAG ('A','r','m','n'),
+  HB_SCRIPT_BENGALI			= HB_TAG ('B','e','n','g'),
+  HB_SCRIPT_BOPOMOFO			= HB_TAG ('B','o','p','o'),
+  HB_SCRIPT_CHEROKEE			= HB_TAG ('C','h','e','r'),
+  HB_SCRIPT_COPTIC			= HB_TAG ('C','o','p','t'),
+  HB_SCRIPT_CYRILLIC			= HB_TAG ('C','y','r','l'),
+  HB_SCRIPT_DESERET			= HB_TAG ('D','s','r','t'),
+  HB_SCRIPT_DEVANAGARI			= HB_TAG ('D','e','v','a'),
+  HB_SCRIPT_ETHIOPIC			= HB_TAG ('E','t','h','i'),
+  HB_SCRIPT_GEORGIAN			= HB_TAG ('G','e','o','r'),
+  HB_SCRIPT_GOTHIC			= HB_TAG ('G','o','t','h'),
+  HB_SCRIPT_GREEK			= HB_TAG ('G','r','e','k'),
+  HB_SCRIPT_GUJARATI			= HB_TAG ('G','u','j','r'),
+  HB_SCRIPT_GURMUKHI			= HB_TAG ('G','u','r','u'),
+  HB_SCRIPT_HAN				= HB_TAG ('H','a','n','i'),
+  HB_SCRIPT_HANGUL			= HB_TAG ('H','a','n','g'),
+  HB_SCRIPT_HEBREW			= HB_TAG ('H','e','b','r'),
+  HB_SCRIPT_HIRAGANA			= HB_TAG ('H','i','r','a'),
+  HB_SCRIPT_KANNADA			= HB_TAG ('K','n','d','a'),
+  HB_SCRIPT_KATAKANA			= HB_TAG ('K','a','n','a'),
+  HB_SCRIPT_KHMER			= HB_TAG ('K','h','m','r'),
+  HB_SCRIPT_LAO				= HB_TAG ('L','a','o','o'),
+  HB_SCRIPT_LATIN			= HB_TAG ('L','a','t','n'),
+  HB_SCRIPT_MALAYALAM			= HB_TAG ('M','l','y','m'),
+  HB_SCRIPT_MONGOLIAN			= HB_TAG ('M','o','n','g'),
+  HB_SCRIPT_MYANMAR			= HB_TAG ('M','y','m','r'),
+  HB_SCRIPT_OGHAM			= HB_TAG ('O','g','a','m'),
+  HB_SCRIPT_OLD_ITALIC			= HB_TAG ('I','t','a','l'),
+  HB_SCRIPT_ORIYA			= HB_TAG ('O','r','y','a'),
+  HB_SCRIPT_RUNIC			= HB_TAG ('R','u','n','r'),
+  HB_SCRIPT_SINHALA			= HB_TAG ('S','i','n','h'),
+  HB_SCRIPT_SYRIAC			= HB_TAG ('S','y','r','c'),
+  HB_SCRIPT_TAMIL			= HB_TAG ('T','a','m','l'),
+  HB_SCRIPT_TELUGU			= HB_TAG ('T','e','l','u'),
+  HB_SCRIPT_THAANA			= HB_TAG ('T','h','a','a'),
+  HB_SCRIPT_THAI			= HB_TAG ('T','h','a','i'),
+  HB_SCRIPT_TIBETAN			= HB_TAG ('T','i','b','t'),
+  HB_SCRIPT_CANADIAN_ABORIGINAL		= HB_TAG ('C','a','n','s'),
+  HB_SCRIPT_YI				= HB_TAG ('Y','i','i','i'),
+  HB_SCRIPT_TAGALOG			= HB_TAG ('T','g','l','g'),
+  HB_SCRIPT_HANUNOO			= HB_TAG ('H','a','n','o'),
+  HB_SCRIPT_BUHID			= HB_TAG ('B','u','h','d'),
+  HB_SCRIPT_TAGBANWA			= HB_TAG ('T','a','g','b'),
 
   /* Unicode-4.0 additions */
-  HB_SCRIPT_BRAILLE                 = HB_TAG ('B','r','a','i'),
-  HB_SCRIPT_CYPRIOT                 = HB_TAG ('C','p','r','t'),
-  HB_SCRIPT_LIMBU                   = HB_TAG ('L','i','m','b'),
-  HB_SCRIPT_OSMANYA                 = HB_TAG ('O','s','m','a'),
-  HB_SCRIPT_SHAVIAN                 = HB_TAG ('S','h','a','w'),
-  HB_SCRIPT_LINEAR_B                = HB_TAG ('L','i','n','b'),
-  HB_SCRIPT_TAI_LE                  = HB_TAG ('T','a','l','e'),
-  HB_SCRIPT_UGARITIC                = HB_TAG ('U','g','a','r'),
+  HB_SCRIPT_BRAILLE			= HB_TAG ('B','r','a','i'),
+  HB_SCRIPT_CYPRIOT			= HB_TAG ('C','p','r','t'),
+  HB_SCRIPT_LIMBU			= HB_TAG ('L','i','m','b'),
+  HB_SCRIPT_OSMANYA			= HB_TAG ('O','s','m','a'),
+  HB_SCRIPT_SHAVIAN			= HB_TAG ('S','h','a','w'),
+  HB_SCRIPT_LINEAR_B			= HB_TAG ('L','i','n','b'),
+  HB_SCRIPT_TAI_LE			= HB_TAG ('T','a','l','e'),
+  HB_SCRIPT_UGARITIC			= HB_TAG ('U','g','a','r'),
 
   /* Unicode-4.1 additions */
-  HB_SCRIPT_NEW_TAI_LUE             = HB_TAG ('T','a','l','u'),
-  HB_SCRIPT_BUGINESE                = HB_TAG ('B','u','g','i'),
-  HB_SCRIPT_GLAGOLITIC              = HB_TAG ('G','l','a','g'),
-  HB_SCRIPT_TIFINAGH                = HB_TAG ('T','f','n','g'),
-  HB_SCRIPT_SYLOTI_NAGRI            = HB_TAG ('S','y','l','o'),
-  HB_SCRIPT_OLD_PERSIAN             = HB_TAG ('X','p','e','o'),
-  HB_SCRIPT_KHAROSHTHI              = HB_TAG ('K','h','a','r'),
+  HB_SCRIPT_NEW_TAI_LUE			= HB_TAG ('T','a','l','u'),
+  HB_SCRIPT_BUGINESE			= HB_TAG ('B','u','g','i'),
+  HB_SCRIPT_GLAGOLITIC			= HB_TAG ('G','l','a','g'),
+  HB_SCRIPT_TIFINAGH			= HB_TAG ('T','f','n','g'),
+  HB_SCRIPT_SYLOTI_NAGRI		= HB_TAG ('S','y','l','o'),
+  HB_SCRIPT_OLD_PERSIAN			= HB_TAG ('X','p','e','o'),
+  HB_SCRIPT_KHAROSHTHI			= HB_TAG ('K','h','a','r'),
 
   /* Unicode-5.0 additions */
-  HB_SCRIPT_UNKNOWN                 = HB_TAG ('Z','z','z','z'),
-  HB_SCRIPT_BALINESE                = HB_TAG ('B','a','l','i'),
-  HB_SCRIPT_CUNEIFORM               = HB_TAG ('X','s','u','x'),
-  HB_SCRIPT_PHOENICIAN              = HB_TAG ('P','h','n','x'),
-  HB_SCRIPT_PHAGS_PA                = HB_TAG ('P','h','a','g'),
-  HB_SCRIPT_NKO                     = HB_TAG ('N','k','o','o'),
+  HB_SCRIPT_UNKNOWN			= HB_TAG ('Z','z','z','z'),
+  HB_SCRIPT_BALINESE			= HB_TAG ('B','a','l','i'),
+  HB_SCRIPT_CUNEIFORM			= HB_TAG ('X','s','u','x'),
+  HB_SCRIPT_PHOENICIAN			= HB_TAG ('P','h','n','x'),
+  HB_SCRIPT_PHAGS_PA			= HB_TAG ('P','h','a','g'),
+  HB_SCRIPT_NKO				= HB_TAG ('N','k','o','o'),
 
   /* Unicode-5.1 additions */
-  HB_SCRIPT_KAYAH_LI                = HB_TAG ('K','a','l','i'),
-  HB_SCRIPT_LEPCHA                  = HB_TAG ('L','e','p','c'),
-  HB_SCRIPT_REJANG                  = HB_TAG ('R','j','n','g'),
-  HB_SCRIPT_SUNDANESE               = HB_TAG ('S','u','n','d'),
-  HB_SCRIPT_SAURASHTRA              = HB_TAG ('S','a','u','r'),
-  HB_SCRIPT_CHAM                    = HB_TAG ('C','h','a','m'),
-  HB_SCRIPT_OL_CHIKI                = HB_TAG ('O','l','c','k'),
-  HB_SCRIPT_VAI                     = HB_TAG ('V','a','i','i'),
-  HB_SCRIPT_CARIAN                  = HB_TAG ('C','a','r','i'),
-  HB_SCRIPT_LYCIAN                  = HB_TAG ('L','y','c','i'),
-  HB_SCRIPT_LYDIAN                  = HB_TAG ('L','y','d','i'),
+  HB_SCRIPT_KAYAH_LI			= HB_TAG ('K','a','l','i'),
+  HB_SCRIPT_LEPCHA			= HB_TAG ('L','e','p','c'),
+  HB_SCRIPT_REJANG			= HB_TAG ('R','j','n','g'),
+  HB_SCRIPT_SUNDANESE			= HB_TAG ('S','u','n','d'),
+  HB_SCRIPT_SAURASHTRA			= HB_TAG ('S','a','u','r'),
+  HB_SCRIPT_CHAM			= HB_TAG ('C','h','a','m'),
+  HB_SCRIPT_OL_CHIKI			= HB_TAG ('O','l','c','k'),
+  HB_SCRIPT_VAI				= HB_TAG ('V','a','i','i'),
+  HB_SCRIPT_CARIAN			= HB_TAG ('C','a','r','i'),
+  HB_SCRIPT_LYCIAN			= HB_TAG ('L','y','c','i'),
+  HB_SCRIPT_LYDIAN			= HB_TAG ('L','y','d','i'),
 
   /* Unicode-5.2 additions */
-  HB_SCRIPT_AVESTAN                 = HB_TAG ('A','v','s','t'),
-  HB_SCRIPT_BAMUM                   = HB_TAG ('B','a','m','u'),
-  HB_SCRIPT_EGYPTIAN_HIEROGLYPHS    = HB_TAG ('E','g','y','p'),
-  HB_SCRIPT_IMPERIAL_ARAMAIC        = HB_TAG ('A','r','m','i'),
-  HB_SCRIPT_INSCRIPTIONAL_PAHLAVI   = HB_TAG ('P','h','l','i'),
-  HB_SCRIPT_INSCRIPTIONAL_PARTHIAN  = HB_TAG ('P','r','t','i'),
-  HB_SCRIPT_JAVANESE                = HB_TAG ('J','a','v','a'),
-  HB_SCRIPT_KAITHI                  = HB_TAG ('K','t','h','i'),
-  HB_SCRIPT_LISU                    = HB_TAG ('L','i','s','u'),
-  HB_SCRIPT_MEETEI_MAYEK            = HB_TAG ('M','t','e','i'),
-  HB_SCRIPT_OLD_SOUTH_ARABIAN       = HB_TAG ('S','a','r','b'),
-  HB_SCRIPT_OLD_TURKIC              = HB_TAG ('O','r','k','h'),
-  HB_SCRIPT_SAMARITAN               = HB_TAG ('S','a','m','r'),
-  HB_SCRIPT_TAI_THAM                = HB_TAG ('L','a','n','a'),
-  HB_SCRIPT_TAI_VIET                = HB_TAG ('T','a','v','t'),
+  HB_SCRIPT_AVESTAN			= HB_TAG ('A','v','s','t'),
+  HB_SCRIPT_BAMUM			= HB_TAG ('B','a','m','u'),
+  HB_SCRIPT_EGYPTIAN_HIEROGLYPHS	= HB_TAG ('E','g','y','p'),
+  HB_SCRIPT_IMPERIAL_ARAMAIC		= HB_TAG ('A','r','m','i'),
+  HB_SCRIPT_INSCRIPTIONAL_PAHLAVI	= HB_TAG ('P','h','l','i'),
+  HB_SCRIPT_INSCRIPTIONAL_PARTHIAN	= HB_TAG ('P','r','t','i'),
+  HB_SCRIPT_JAVANESE			= HB_TAG ('J','a','v','a'),
+  HB_SCRIPT_KAITHI			= HB_TAG ('K','t','h','i'),
+  HB_SCRIPT_LISU			= HB_TAG ('L','i','s','u'),
+  HB_SCRIPT_MEETEI_MAYEK		= HB_TAG ('M','t','e','i'),
+  HB_SCRIPT_OLD_SOUTH_ARABIAN		= HB_TAG ('S','a','r','b'),
+  HB_SCRIPT_OLD_TURKIC			= HB_TAG ('O','r','k','h'),
+  HB_SCRIPT_SAMARITAN			= HB_TAG ('S','a','m','r'),
+  HB_SCRIPT_TAI_THAM			= HB_TAG ('L','a','n','a'),
+  HB_SCRIPT_TAI_VIET			= HB_TAG ('T','a','v','t'),
 
   /* Unicode-6.0 additions */
-  HB_SCRIPT_BATAK                   = HB_TAG ('B','a','t','k'),
-  HB_SCRIPT_BRAHMI                  = HB_TAG ('B','r','a','h'),
-  HB_SCRIPT_MANDAIC                 = HB_TAG ('M','a','n','d'),
+  HB_SCRIPT_BATAK			= HB_TAG ('B','a','t','k'),
+  HB_SCRIPT_BRAHMI			= HB_TAG ('B','r','a','h'),
+  HB_SCRIPT_MANDAIC			= HB_TAG ('M','a','n','d'),
 
   /* No script set */
-  HB_SCRIPT_INVALID                 = HB_TAG_NONE
+  HB_SCRIPT_INVALID			= HB_TAG_NONE
 } hb_script_t;
 
 
commit 183224684a45d7dcd7d28510d4383a7a7cb3dff3
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Mar 7 12:21:28 2012 -0500

    Use generic shaper for Buhid
    
    As requested by Jonathan Kew.
    
    We need to devise a better mechanism to choose which scripts to
    pass through the Indic shaper.  Moreover, currently we are storing
    data for some scripts in the Indic shaper that are not even going
    through that shaper.  Need to find a better way...

diff --git a/src/hb-ot-shape-complex-private.hh b/src/hb-ot-shape-complex-private.hh
index 8b775fb..652d90a 100644
--- a/src/hb-ot-shape-complex-private.hh
+++ b/src/hb-ot-shape-complex-private.hh
@@ -88,6 +88,7 @@ hb_ot_shape_complex_categorize (const hb_segment_properties_t *props)
     /* Simple? */
     case HB_SCRIPT_BATAK:
     case HB_SCRIPT_BRAHMI:
+    case HB_SCRIPT_BUHID:
     case HB_SCRIPT_HANUNOO:
     case HB_SCRIPT_MEETEI_MAYEK:
     case HB_SCRIPT_SAURASHTRA:
@@ -112,7 +113,6 @@ hb_ot_shape_complex_categorize (const hb_segment_properties_t *props)
     case HB_SCRIPT_BALINESE:
     case HB_SCRIPT_BENGALI:
     case HB_SCRIPT_BUGINESE:
-    case HB_SCRIPT_BUHID:
     case HB_SCRIPT_CHAM:
     case HB_SCRIPT_DEVANAGARI:
     case HB_SCRIPT_GUJARATI:



More information about the HarfBuzz mailing list