(U+6215): Apply new conventions for glyph granularity.

[chise/xemacs-chise.git.1] / src / mule-ccl.c

diff --git a/src/mule-ccl.c b/src/mule-ccl.c
index 866f279..1907762 100644 (file)
--- a/src/mule-ccl.c
+++ b/src/mule-ccl.c
@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "lisp.h"
 #include "buffer.h"
-#include "mule-charset.h"
+#include "character.h"
 #include "mule-ccl.h"
 #include "file-coding.h"
 
@@ -1282,6 +1282,7 @@ ccl_driver (struct ccl_program *ccl,
        case CCL_Extension:
          switch (EXCMD)
            {
+#ifndef UTF2000
            case CCL_ReadMultibyteChar2:
              if (!src)
                CCL_INVALID_CMD;
@@ -1367,7 +1368,9 @@ ccl_driver (struct ccl_program *ccl,
                CCL_SUSPEND (CCL_STAT_SUSPEND_BY_SRC);
 
              break;
+#endif
 
+#ifndef UTF2000
            case CCL_WriteMultibyteChar2:
              i = reg[RRR]; /* charset */
              if (i == LEADING_BYTE_ASCII) 
@@ -1380,7 +1383,7 @@ ccl_driver (struct ccl_program *ccl,
                  if (XCHARSET_DIMENSION (CHARSET_BY_LEADING_BYTE (i)) == 1)
                    i = (((i - FIELD2_TO_OFFICIAL_LEADING_BYTE) << 7)
                         | (reg[rrr] & 0x7F));
-                 else if (i < MAX_LEADING_BYTE_OFFICIAL_2)
+                 else if (i <= MAX_LEADING_BYTE_OFFICIAL_2)
                    i = ((i - FIELD1_TO_OFFICIAL_LEADING_BYTE) << 14) 
                      | reg[rrr];
                  else
@@ -1397,6 +1400,7 @@ ccl_driver (struct ccl_program *ccl,
              CCL_WRITE_CHAR (i);
 
              break;
+#endif
 
            case CCL_TranslateCharacter:
 #if 0