From: handa <handa>
Date: Mon, 30 Nov 2009 11:46:49 +0000 (+0000)
Subject: (MAKE_COMBINING_CODE_BY_CLASS)
X-Git-Tag: merge-to-XML~36
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d6eb4930314132cd2028e880b9ea616dad9a2df;p=m17n%2Fm17n-lib.git

(MAKE_COMBINING_CODE_BY_CLASS)
(COMBINING_BY_CLASS_P, COMBINING_CODE_CLASS)
(MAKE_PRECOMPUTED_COMBINDING_CODE, COMBINING_PRECOMPUTED_P):
Delete externs..
(PACK_OTF_TAG): Extern it.
---

diff --git a/src/internal-flt.h b/src/internal-flt.h
index e47dbb1..a4e39a0 100644
--- a/src/internal-flt.h
+++ b/src/internal-flt.h
@@ -38,15 +38,11 @@
 #define COMBINING_CODE_ADD_X(code) (((code) >> 2) & 0x3)
 #define COMBINING_CODE_ADD_Y(code) ((code) & 0x3)
 
-#define MAKE_COMBINING_CODE_BY_CLASS(class) (0x1000000 | class)
-
-#define COMBINING_BY_CLASS_P(code) ((code) & 0x1000000)
-
-#define COMBINING_CODE_CLASS(code) ((code) & 0xFFFFFF)
-
-#define MAKE_PRECOMPUTED_COMBINDING_CODE() (0x2000000)
-
-#define COMBINING_PRECOMPUTED_P(code) ((code) & 0x2000000)
+#define PACK_OTF_TAG(TAG)		\
+  ((((TAG) & 0x7F000000) >> 3)	\
+   | (((TAG) & 0x7F0000) >> 2)	\
+   | (((TAG) & 0x7F00) >> 1)	\
+   | ((TAG) & 0x7F))
 
 extern MSymbol Mcombining;