From: handa <handa>
Date: Wed, 15 Aug 2007 11:39:19 +0000 (+0000)
Subject: (MAKE_COMBINING_CODE, COMBINING_CODE_OFF_Y)
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81ea43eab3f71291fb6130b80c04805850276cf0;p=m17n%2Fm17n-lib.git

(MAKE_COMBINING_CODE, COMBINING_CODE_OFF_Y)
(COMBINING_CODE_OFF_X, COMBINING_CODE_BASE_X)
(COMBINING_CODE_BASE_Y, COMBINING_CODE_ADD_X)
(COMBINING_CODE_ADD_Y, MAKE_COMBINING_CODE_BY_CLASS)
(COMBINING_BY_CLASS_P, COMBINING_CODE_CLASS)
(MAKE_PRECOMPUTED_COMBINDING_CODE, COMBINING_PRECOMPUTED_P): Move
these macros to internal-flt.h.
---

diff --git a/src/internal-gui.h b/src/internal-gui.h
index 398e5f3..6d42c97 100644
--- a/src/internal-gui.h
+++ b/src/internal-gui.h
@@ -201,31 +201,6 @@ struct MGlyphString
     (gstring)->used -= newlen;						  \
   } while (0)
 
-#define MAKE_COMBINING_CODE(base_y, base_x, add_y, add_x, off_y, off_x)	\
-  (((off_y) << 16)							\
-   | ((off_x) << 8)							\
-   | ((base_x) << 6)							\
-   | ((base_y) << 4)							\
-   | ((add_x) << 2)							\
-   | (add_y))
-
-#define COMBINING_CODE_OFF_Y(code) (((code) >> 16) & 0xFF)
-#define COMBINING_CODE_OFF_X(code) (((code) >> 8) & 0xFF)
-#define COMBINING_CODE_BASE_X(code) (((code) >> 6) & 0x3)
-#define COMBINING_CODE_BASE_Y(code) (((code) >> 4) & 0x3)
-#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)
-
 typedef struct MGlyphString MGlyphString;
 
 typedef struct