X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmule-canna.c;h=3803c9dd293e4a47f064f2563057b1da662010cf;hb=864248d400b03a9410f40b1f79991ff9e28aa58e;hp=39ae702b431274f667b7975ca5c23aff75186454;hpb=0fc7fd9e8e70d58b8f7d96fe4849a4f791e1110a;p=chise%2Fxemacs-chise.git-

diff --git a/src/mule-canna.c b/src/mule-canna.c
index 39ae702..3803c9d 100644
--- a/src/mule-canna.c
+++ b/src/mule-canna.c
@@ -718,7 +718,8 @@ byteLen (int bun, int len)
 }
 
 DEFUN ("canna-henkan-begin", Fcanna_henkan_begin, 1, 1, 0, /*
-¤«¤Ê´Á»úÊÑ´¹¤·¤¿·ë²Ì¤òÊÖ´Ô¤¹¤ë¡£Ê¸ÀáÀڤ꤬¤·¤Æ¤¢¤ë¡£
+Return the result of kana-to-kanji conversion.
+Clause separator is set.
 */
        (yomi))
 {
@@ -773,7 +774,7 @@ kanjiYomiList (int context, int nbun)
 }
 
 DEFUN ("canna-henkan-next", Fcanna_henkan_next, 1, 1, 0, /*
-¸õÊä°ìÍ÷¤òµá¤á¤ë¡£
+Return the list of candidates.
 */
        (bunsetsu))
 {
@@ -798,7 +799,7 @@ DEFUN ("canna-henkan-next", Fcanna_henkan_next, 1, 1, 0, /*
 	}
       else
 	{
-	  endp = XCDR (endp) = Fcons (make_string (p, slen), Qnil);
+	  endp = XCDR (res) = Fcons (make_string (p, slen), Qnil);
 	}
       p += slen + 1;
     }
@@ -806,7 +807,7 @@ DEFUN ("canna-henkan-next", Fcanna_henkan_next, 1, 1, 0, /*
 }
 
 DEFUN ("canna-bunsetu-henkou", Fcanna_bunsetu_henkou, 2, 2, 0, /*
-ʸÀá¤ÎŤµ¤ò»ØÄꤹ¤ë¡£
+Specify the length of a clause.
 */
        (bunsetsu, bunlen))
 {
@@ -826,7 +827,7 @@ DEFUN ("canna-bunsetu-henkou", Fcanna_bunsetu_henkou, 2, 2, 0, /*
 }
 
 DEFUN ("canna-henkan-kakutei", Fcanna_henkan_kakutei, 2, 2, 0, /*
-¸õÊäÁªÂò¡£
+Select a candidate.
 */
        (bun, kouho))
 {
@@ -845,7 +846,7 @@ DEFUN ("canna-henkan-kakutei", Fcanna_henkan_kakutei, 2, 2, 0, /*
 }
 
 DEFUN ("canna-henkan-end", Fcanna_henkan_end, 0, 0, 0, /*
-ÊÑ´¹½ªÎ»¡£
+End conversion.
 */
        ())
 {
@@ -858,7 +859,7 @@ DEFUN ("canna-henkan-end", Fcanna_henkan_end, 0, 0, 0, /*
 }
 
 DEFUN ("canna-henkan-quit", Fcanna_henkan_quit, 0, 0, 0, /*
-ÊÑ´¹½ªÎ»¡£
+Quit conversion.
 */
        ())
 {
@@ -1776,12 +1777,12 @@ For canna
 
 /* EUC multibyte string to MULE internal string */
 
-#ifdef UTF2000
 static void
 c2mu (unsigned char *cp, int l, unsigned char *mp)
 {
-  Emchar chr;
   unsigned char	ch, *ep = cp+l;
+#ifdef UTF2000
+  Emchar chr;
 
   while ((cp < ep) && (ch = *cp++))
     {
@@ -1791,17 +1792,14 @@ c2mu (unsigned char *cp, int l, unsigned char *mp)
 	}
       else if (ch == ISO_CODE_SS3)
 	{
-	  chr = MULE_CHAR_PRIVATE_OFFSET
-	    | ( (LEADING_BYTE_JAPANESE_JISX0212
-		 - FIELD1_TO_OFFICIAL_LEADING_BYTE) << 14 )
-	    | (((*cp++) & 0x7f) << 7) | ((*cp++) & 0x7f);
+	  ch = *cp++;
+	  chr = MAKE_CHAR (Vcharset_japanese_jisx0212,
+			   ch & 0x7f, (*cp++) & 0x7f);
 	}
       else if (ch & 0x80)
 	{
-	  chr = MULE_CHAR_PRIVATE_OFFSET
-	    | ( (LEADING_BYTE_JAPANESE_JISX0208
-		 - FIELD1_TO_OFFICIAL_LEADING_BYTE) << 14 )
-	    | ((ch & 0x7f) << 7) | ((*cp++) & 0x7f);	  
+	  chr = MAKE_CHAR (Vcharset_japanese_jisx0208,
+			   ch & 0x7f, (*cp++) & 0x7f);
         }
       else
 	{
@@ -1847,14 +1845,7 @@ c2mu (unsigned char *cp, int l, unsigned char *mp)
 	  *mp++ =  (chr        & 0x3f) | 0x80;
 	}
     }
-  *mp = 0;
-}
 #else
-static void
-c2mu (char *cp, int l, char *mp)
-{
-  char	ch, *ep = cp+l;
-
   while ((cp < ep) && (ch = *cp))
     {
       if ((unsigned char) ch == ISO_CODE_SS2)
@@ -1875,9 +1866,9 @@ c2mu (char *cp, int l, char *mp)
 	}
       *mp++ = *cp++;
     }
+#endif
   *mp = 0;
 }
-#endif
 
 /* MULE internal string to EUC multibyte string */
 
@@ -1938,14 +1929,18 @@ m2c (unsigned char *mp, int l, unsigned char *cp)
 	}
       else
 	{
-	  fb = (chr >> 14) & 0x7f;
-	  switch ( fb )
+	  Lisp_Object charset;
+	  int c1, c2;
+
+	  BREAKUP_CHAR (chr, charset, c1, c2);
+	  fb = XCHARSET_FINAL (charset);
+	  switch (fb)
 	    {
 	    case 'D':
 	      *cp++ = ISO_CODE_SS3;
 	    default:
-	      *cp++ = ( (chr >> 7) & 0x7f ) | 0x80;
-	      *cp++ = ( chr & 0x7f ) | 0x80;
+	      *cp++ = c1;
+	      *cp++ = c2;
 	    }
 	}
 #else