X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Ffile-coding.c;h=3068c896823dac45e334b378d4adf0bf92d709c6;hb=c055fb9d54088bf2dff25f6be1a033ff0cea5f92;hp=bc1a87430bd058cb3c6fc51638e7d47fc9b63e29;hpb=b623fb6516df4ba24a9a16f8199b4341eb9aff52;p=chise%2Fxemacs-chise.git-

diff --git a/src/file-coding.c b/src/file-coding.c
index bc1a874..3068c89 100644
--- a/src/file-coding.c
+++ b/src/file-coding.c
@@ -858,10 +858,6 @@ if TYPE is 'ccl:
     CHECK_STRING (doc_string);
   CODING_SYSTEM_DOC_STRING (codesys) = doc_string;
 
-#ifdef UTF2000
-  if (ty == CODESYS_NO_CONVERSION)
-    codesys->fixed.size = 1;
-#endif
   EXTERNAL_PROPERTY_LIST_LOOP (rest, key, value, props)
     {
       if (EQ (key, Qmnemonic))
@@ -2834,10 +2830,16 @@ decode_coding_sjis (Lstream *decoding, CONST unsigned char *src,
 	    {
 	      unsigned char e1, e2;
 
-	      Dynarr_add (dst, LEADING_BYTE_JAPANESE_JISX0208);
 	      DECODE_SJIS (ch, c, e1, e2);
+#ifdef UTF2000
+	      DECODE_ADD_UCS_CHAR(MAKE_CHAR(Vcharset_japanese_jisx0208,
+					    e1 & 0x7F,
+					    e2 & 0x7F), dst);
+#else
+	      Dynarr_add (dst, LEADING_BYTE_JAPANESE_JISX0208);
 	      Dynarr_add (dst, e1);
 	      Dynarr_add (dst, e2);
+#endif
 	    }
 	  else
 	    {
@@ -2853,8 +2855,13 @@ decode_coding_sjis (Lstream *decoding, CONST unsigned char *src,
 	    ch = c;
 	  else if (BYTE_SJIS_KATAKANA_P (c))
 	    {
+#ifdef UTF2000
+	      DECODE_ADD_UCS_CHAR(MAKE_CHAR(Vcharset_katakana_jisx0201,
+					    c & 0x7F, 0), dst);
+#else
 	      Dynarr_add (dst, LEADING_BYTE_KATAKANA_JISX0201);
 	      Dynarr_add (dst, c);
+#endif
 	    }
 	  else
 	    DECODE_ADD_BINARY_CHAR (c, dst);
@@ -2879,10 +2886,82 @@ encode_coding_sjis (Lstream *encoding, CONST unsigned char *src,
   unsigned int flags  = str->flags;
   unsigned int ch     = str->ch;
   eol_type_t eol_type = CODING_SYSTEM_EOL_TYPE (str->codesys);
+#ifdef UTF2000
+  unsigned char char_boundary = str->iso2022.current_char_boundary;
+#endif
 
   while (n--)
     {
       c = *src++;
+#ifdef UTF2000
+      switch (char_boundary)
+	{
+	case 0:
+	  if ( c >= 0xfc )
+	    {
+	      ch = c & 0x01;
+	      char_boundary = 5;
+	    }
+	  else if ( c >= 0xf8 )
+	    {
+	      ch = c & 0x03;
+	      char_boundary = 4;
+	    }
+	  else if ( c >= 0xf0 )
+	    {
+	      ch = c & 0x07;
+	      char_boundary = 3;
+	    }
+	  else if ( c >= 0xe0 )
+	    {
+	      ch = c & 0x0f;
+	      char_boundary = 2;
+	    }
+	  else if ( c >= 0xc0 )
+	    {
+	      ch = c & 0x1f;
+	      char_boundary = 1;
+	    }
+	  else
+	    {
+	      ch = 0;
+	      if (c == '\n')
+		{
+		  if (eol_type != EOL_LF && eol_type != EOL_AUTODETECT)
+		    Dynarr_add (dst, '\r');
+		  if (eol_type != EOL_CR)
+		    Dynarr_add (dst, c);
+		}
+	      else
+		Dynarr_add (dst, c);
+	      char_boundary = 0;
+	    }
+	  break;
+	case 1:
+	  ch = ( ch << 6 ) | ( c & 0x3f );
+	  {
+	    Lisp_Object charset;
+	    unsigned int c1, c2, s1, s2;
+	    
+	    BREAKUP_CHAR (ch, charset, c1, c2);
+	    if (EQ(charset, Vcharset_katakana_jisx0201))
+	      {
+		Dynarr_add (dst, c1 | 0x80);
+	      }
+	    else if (EQ(charset, Vcharset_japanese_jisx0208))
+	      {
+		ENCODE_SJIS (c1 | 0x80, c2 | 0x80, s1, s2);
+		Dynarr_add (dst, s1);
+		Dynarr_add (dst, s2);
+	      }
+	  }
+	  char_boundary = 0;
+	  break;
+	default:
+	  ch = ( ch << 6 ) | ( c & 0x3f );
+	  char_boundary--;
+	}
+#else
       if (c == '\n')
 	{
 	  if (eol_type != EOL_LF && eol_type != EOL_AUTODETECT)
@@ -2919,10 +2998,14 @@ encode_coding_sjis (Lstream *encoding, CONST unsigned char *src,
 	      ch = 0;
 	    }
 	}
+#endif
     }
 
   str->flags = flags;
   str->ch    = ch;
+#ifdef UTF2000
+  str->iso2022.current_char_boundary = char_boundary;
+#endif
 }
 
 DEFUN ("decode-shift-jis-char", Fdecode_shift_jis_char, 1, 1, 0, /*
@@ -3154,6 +3237,7 @@ static void
 encode_coding_big5 (Lstream *encoding, CONST unsigned char *src,
 		    unsigned_char_dynarr *dst, unsigned int n)
 {
+#ifndef UTF2000
   unsigned char c;
   struct encoding_stream *str = ENCODING_STREAM_DATA (encoding);
   unsigned int flags  = str->flags;
@@ -3208,6 +3292,7 @@ encode_coding_big5 (Lstream *encoding, CONST unsigned char *src,
 
   str->flags = flags;
   str->ch    = ch;
+#endif
 }
 
 
@@ -3228,7 +3313,7 @@ Return the corresponding character.
   if (BYTE_BIG5_TWO_BYTE_1_P (b1) &&
       BYTE_BIG5_TWO_BYTE_2_P (b2))
     {
-      int leading_byte;
+      Charset_ID leading_byte;
       Lisp_Object charset;
       DECODE_BIG5 (b1, b2, leading_byte, c1, c2);
       charset = CHARSET_BY_LEADING_BYTE (leading_byte);
@@ -3488,6 +3573,7 @@ static void
 encode_coding_ucs4 (Lstream *encoding, CONST unsigned char *src,
 		    unsigned_char_dynarr *dst, unsigned int n)
 {
+#ifndef UTF2000
   struct encoding_stream *str = ENCODING_STREAM_DATA (encoding);
   unsigned int flags = str->flags;
   unsigned int ch = str->ch;
@@ -3616,6 +3702,7 @@ encode_coding_ucs4 (Lstream *encoding, CONST unsigned char *src,
   str->iso2022.current_charset = charset;
 
   /* Verbum caro factum est! */
+#endif
 }
 
 
@@ -4870,7 +4957,7 @@ decode_coding_iso2022 (Lstream *decoding, CONST unsigned char *src,
 	{			/* Graphic characters */
 	  Lisp_Object charset;
 #ifndef UTF2000
-	  int lb;
+	  Charset_ID lb;
 #endif
 	  int reg;
 
@@ -4914,9 +5001,23 @@ decode_coding_iso2022 (Lstream *decoding, CONST unsigned char *src,
 		    charset = new_charset;
 		}
 
-#ifndef UTF2000
+#ifdef UTF2000
+	      if (XCHARSET_DIMENSION (charset) == 1)
+		{
+		  DECODE_OUTPUT_PARTIAL_CHAR (ch);
+		  DECODE_ADD_UCS_CHAR
+		    (MAKE_CHAR (charset, c & 0x7F, 0), dst);
+		}
+	      else if (ch)
+		{
+		  DECODE_ADD_UCS_CHAR
+		    (MAKE_CHAR (charset, ch & 0x7F, c & 0x7F), dst);
+		  ch = 0;
+		}
+	      else
+		ch = c;
+#else
 	      lb = XCHARSET_LEADING_BYTE (charset);
-#endif
 	      switch (XCHARSET_REP_BYTES (charset))
 		{
 		case 1:	/* ASCII */
@@ -4926,40 +5027,25 @@ decode_coding_iso2022 (Lstream *decoding, CONST unsigned char *src,
 
 		case 2:	/* one-byte official */
 		  DECODE_OUTPUT_PARTIAL_CHAR (ch);
-#ifdef UTF2000
-		  DECODE_ADD_UCS_CHAR(MAKE_CHAR(charset, c & 0x7F, 0), dst);
-#else
 		  Dynarr_add (dst, lb);
 		  Dynarr_add (dst, c | 0x80);
-#endif
 		  break;
 
 		case 3:	/* one-byte private or two-byte official */
 		  if (XCHARSET_PRIVATE_P (charset))
 		    {
 		      DECODE_OUTPUT_PARTIAL_CHAR (ch);
-#ifdef UTF2000
-		      DECODE_ADD_UCS_CHAR(MAKE_CHAR(charset, c & 0x7F, 0),
-					  dst);
-#else
 		      Dynarr_add (dst, PRE_LEADING_BYTE_PRIVATE_1);
 		      Dynarr_add (dst, lb);
 		      Dynarr_add (dst, c | 0x80);
-#endif
 		    }
 		  else
 		    {
 		      if (ch)
 			{
-#ifdef UTF2000
-			  DECODE_ADD_UCS_CHAR(MAKE_CHAR(charset,
-							ch & 0x7F,
-							c & 0x7F), dst);
-#else
 			  Dynarr_add (dst, lb);
 			  Dynarr_add (dst, ch | 0x80);
 			  Dynarr_add (dst, c | 0x80);
-#endif
 			  ch = 0;
 			}
 		      else
@@ -4970,21 +5056,16 @@ decode_coding_iso2022 (Lstream *decoding, CONST unsigned char *src,
 		default:	/* two-byte private */
 		  if (ch)
 		    {
-#ifdef UTF2000
-		      DECODE_ADD_UCS_CHAR(MAKE_CHAR(charset,
-						    ch & 0x7F,
-						    c & 0x7F), dst);
-#else
 		      Dynarr_add (dst, PRE_LEADING_BYTE_PRIVATE_2);
 		      Dynarr_add (dst, lb);
 		      Dynarr_add (dst, ch | 0x80);
 		      Dynarr_add (dst, c | 0x80);
-#endif
 		      ch = 0;
 		    }
 		  else
 		    ch = c;
 		}
+#endif
 	    }
 
 	  if (!ch)
@@ -5709,31 +5790,7 @@ encode_coding_no_conversion (Lstream *encoding, CONST unsigned char *src,
 	  break;
 	case 1:
 	  ch = ( ch << 6 ) | ( c & 0x3f );
-	  switch ( str->codesys->fixed.size )
-	    {
-	    case 1:
-	      Dynarr_add (dst, ch & 0xff);
-	      break;
-	    case 2:
-	      Dynarr_add (dst, (ch >> 8) & 0xff);
-	      Dynarr_add (dst,  ch       & 0xff);
-	      break;
-	    case 3:
-	      Dynarr_add (dst, (ch >> 16) & 0xff);
-	      Dynarr_add (dst, (ch >>  8) & 0xff);
-	      Dynarr_add (dst,  ch        & 0xff);
-	      break;
-	    case 4:
-	      Dynarr_add (dst, (ch >> 24) & 0xff);
-	      Dynarr_add (dst, (ch >> 16) & 0xff);
-	      Dynarr_add (dst, (ch >>  8) & 0xff);
-	      Dynarr_add (dst,  ch        & 0xff);
-	      break;
-	    default:
-	      fprintf(stderr, "It seems %d bytes stream.\n",
-		      str->codesys->fixed.size);
-	      abort ();
-	    }
+	  Dynarr_add (dst, ch & 0xff);
 	  char_boundary = 0;
 	  break;
 	default: