X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmule-ccl.c;h=356c7de2097ad5f1c0b939062bba7b49e9a66f4d;hb=c0072bfb9d2952b1ee39f2b03fa2e69e6727971f;hp=f45e036bd2e78ace9d26cab5ad540e93ac9b79fa;hpb=856292c0ca19f0092e79e4f7b2964e18f9d7038f;p=chise%2Fxemacs-chise.git

diff --git a/src/mule-ccl.c b/src/mule-ccl.c
index f45e036..356c7de 100644
--- a/src/mule-ccl.c
+++ b/src/mule-ccl.c
@@ -1239,12 +1239,13 @@ ccl_driver (struct ccl_program *ccl, CONST unsigned char *source,
 	      else if (i == CHARSET_COMPOSITION)
 		i = MAKE_COMPOSITE_CHAR (reg[rrr]);
 #endif
-	      else if (REP_BYTES_BY_FIRST_BYTE (i) == 1)
-		i = ((i - 0x70) << 7) | (reg[rrr] & 0x7F);
+	      else if (XCHARSET_DIMENSION (CHARSET_BY_LEADING_BYTE (i)) == 1)
+		i = ((i - FIELD2_TO_OFFICIAL_LEADING_BYTE) << 7)
+		  | (reg[rrr] & 0x7F);
 	      else if (i < MIN_LEADING_BYTE_OFFICIAL_2)
-		i = ((i - 0x8F) << 14) | reg[rrr];
+		i = ((i - FIELD1_TO_OFFICIAL_LEADING_BYTE) << 14) | reg[rrr];
 	      else
-		i = ((i - 0xE0) << 14) | reg[rrr];
+		i = ((i - FIELD1_TO_PRIVATE_LEADING_BYTE) << 14) | reg[rrr];
 
 	      CCL_WRITE_CHAR (i);