From: handa <handa>
Date: Fri, 23 Apr 2010 03:55:22 +0000 (+0000)
Subject: (enum GlyphInfoMask): Shift upper masks 1-bit left.
X-Git-Tag: REL-1-6-1~2
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61169f2f233f7262e1c72eb09d75fa4698e40886;p=m17n%2Fm17n-lib.git

(enum GlyphInfoMask): Shift upper masks 1-bit left.
(decode_packed_otf_tag): If a glyph has combining information,
don't touch it.
(run_otf):
---

diff --git a/src/m17n-flt.c b/src/m17n-flt.c
index e9ac45f..65970d4 100644
--- a/src/m17n-flt.c
+++ b/src/m17n-flt.c
@@ -257,9 +257,9 @@ enum GlyphInfoMask
 {
   CategoryCodeMask = 0x7F,
   CombiningCodeMask = 0xFFFFFF,
-  CombinedMask = 1 << 27,
-  LeftPaddingMask = 1 << 28,
-  RightPaddingMask = 1 << 29
+  CombinedMask = 1 << 28,
+  LeftPaddingMask = 1 << 29,
+  RightPaddingMask = 1 << 30
 };
 
 #define SET_GLYPH_INFO(g, mask, ctx, info)			\
@@ -1875,6 +1875,8 @@ decode_packed_otf_tag (FontLayoutContext *ctx, MFLTGlyphString *gstring,
       unsigned int tag = g->internal & 0xFFFFFFF;
       char enc;
 
+      if (GET_COMBINED (g))
+	continue;
       if (! category)
 	{
 	  SET_CATEGORY_CODE (g, 0);