From: tomo <tomo>
Date: Mon, 11 Oct 1999 18:23:41 +0000 (+0000)
Subject: (Fmake_charset): Allocate final-byte based charset-id for 94-set,
X-Git-Tag: r21-2-19-utf-2000-0_9-0~12
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1aa4ac87e7f7b0f54f52cb3b1de437970fd9c0d8;p=chise%2Fxemacs-chise.git

(Fmake_charset): Allocate final-byte based charset-id for 94-set,
96-set and 94x94-set.
---

diff --git a/src/mule-charset.c b/src/mule-charset.c
index ee0ce80..1adb018 100644
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -1214,6 +1214,7 @@ character set.  Recognized properties are:
   Lisp_Object ccl_program = Qnil;
   Lisp_Object short_name = Qnil, long_name = Qnil;
 #ifdef UTF2000
+  Emchar code_offset = 0;
   unsigned char byte_offset = 0;
 #endif
 
@@ -1331,12 +1332,17 @@ character set.  Recognized properties are:
     {
       if (chars == 94)
 	{
-	  /* id = CHARSET_ID_OFFSET_94 + final; */
-	  id = get_unallocated_leading_byte (dimension);
+	  if (code_offset == 0)
+	    id = CHARSET_ID_OFFSET_94 + final;
+	  else
+	    id = get_unallocated_leading_byte (dimension);
 	}
       else if (chars == 96)
 	{
-	  id = get_unallocated_leading_byte (dimension);
+	  if (code_offset == 0)
+	    id = CHARSET_ID_OFFSET_96 + final;
+	  else
+	    id = get_unallocated_leading_byte (dimension);
 	}
       else
 	{
@@ -1347,7 +1353,10 @@ character set.  Recognized properties are:
     {
       if (chars == 94)
 	{
-	  id = get_unallocated_leading_byte (dimension);
+	  if (code_offset == 0)
+	    id = CHARSET_ID_OFFSET_94x94 + final;
+	  else
+	    id = get_unallocated_leading_byte (dimension);
 	}
       else if (chars == 96)
 	{