update.

[chise/xemacs-chise.git.1] / src / char-ucs.h

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 0bad540..078dcea 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -1,5 +1,5 @@
 /* Header for UCS-4 character representation.
-   Copyright (C) 1999,2000,2001,2002,2003 MORIOKA Tomohiko
+   Copyright (C) 1999,2000,2001,2002,2003,2004 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -48,6 +48,7 @@ extern Lisp_Object Vcharset_japanese_jisx0212;
 
 EXFUN (Fget_charset, 1);
 
+extern Lisp_Object Qsystem_char_id;
 extern Lisp_Object Qmap_ucs, Qucs;
 
 Lisp_Object put_char_ccs_code_point (Lisp_Object character,
@@ -62,49 +63,48 @@ Lisp_Object remove_char_ccs (Lisp_Object character, Lisp_Object ccs);
 typedef short Charset_ID;
 
 /* ISO/IEC 10646 */
-#define LEADING_BYTE_UCS               1
+#define LEADING_BYTE_UCS               -177
 
 /* represent normal 80-9F */
-#define LEADING_BYTE_CONTROL_1         2
+#define LEADING_BYTE_CONTROL_1         -77
 
 /* ISO/IEC 10646 BMP */
-#define LEADING_BYTE_UCS_BMP           3
+#define LEADING_BYTE_UCS_BMP           -176
 
-/* ISO/IEC 10646 SMP */
-#define LEADING_BYTE_UCS_SMP           4
-
-/* ISO/IEC 10646 SIP */
-#define LEADING_BYTE_UCS_SIP           5
+#define LEADING_BYTE_SYSTEM_CHAR_ID    0
 
 /* Japanese JIS X0208 Common   2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JIS_X0208                 11
-
-/* Japanese JIS X0208-1990     2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JAPANESE_JISX0208_1990 12
+#define LEADING_BYTE_JIS_X0208                 1
 
 /* Chinese GB 12345-1990 */
-#define LEADING_BYTE_CHINESE_GB12345   13
+#define LEADING_BYTE_CHINESE_GB12345   2
 
-#define LEADING_BYTE_CHINESE_BIG5      20
+#define LEADING_BYTE_CHINESE_BIG5      3
 
 /* Big5 Level 1                        2/4 2/{(8),9,10,11} 4/0 '0' */
-#define LEADING_BYTE_CHINESE_BIG5_1    21
+#define LEADING_BYTE_CHINESE_BIG5_1    4
 
 /* Big5 Level 2                        2/4 2/{(8),9,10,11} 4/0 '1' */
-#define LEADING_BYTE_CHINESE_BIG5_2    22
+#define LEADING_BYTE_CHINESE_BIG5_2    5
 
 /* VISCII 1.1 */
-#define LEADING_BYTE_LATIN_VISCII      24
+#define LEADING_BYTE_LATIN_VISCII      6
 
 /* MULE VISCII-LOWER                   (CHARSET_ID_OFFSET_96 + '1') */
-#define LEADING_BYTE_LATIN_VISCII_LOWER        25
+#define LEADING_BYTE_LATIN_VISCII_LOWER        7
 
 /* MULE VISCII-UPPER                   (CHARSET_ID_OFFSET_96 + '2') */
-#define LEADING_BYTE_LATIN_VISCII_UPPER        26
+#define LEADING_BYTE_LATIN_VISCII_UPPER        8
 
-#define LEADING_BYTE_ETHIOPIC_UCS      27
+#define LEADING_BYTE_ETHIOPIC_UCS      9
+
+/* ISO/IEC 10646 SMP */
+#define LEADING_BYTE_UCS_SMP           10
+
+/* ISO/IEC 10646 SIP */
+#define LEADING_BYTE_UCS_SIP           11
 
-#define MIN_LEADING_BYTE_PRIVATE       28
+#define MIN_LEADING_BYTE_PRIVATE       12
 #define MAX_LEADING_BYTE_PRIVATE       512
 
 
@@ -118,8 +118,6 @@ typedef short Charset_ID;
 #define LEADING_BYTE_LATIN_JISX0201     -14 /* (CHARSET_ID_OFFSET_94 + 'J') */
 
 
-/* #define CHARSET_ID_OFFSET_96                (CHARSET_ID_OFFSET_94 + 80) */
-
 /* Right half of ISO 8859-1 */
 #define LEADING_BYTE_LATIN_ISO8859_1   -100 /* (CHARSET_ID_OFFSET_96 + 'A') */
 
@@ -154,11 +152,6 @@ typedef short Charset_ID;
 #define LEADING_BYTE_LATIN_TCVN5712    -180 /* F = 5/10 0x5A `Z' */
 
 
-/* #define CHARSET_ID_OFFSET_94x94             (CHARSET_ID_OFFSET_96 + 80) */
-
-/* #define MIN_LEADING_BYTE_PRIVATE_2  ('0' + CHARSET_ID_OFFSET_94x94) */
-/* #define MAX_LEADING_BYTE_PRIVATE_2  ('?' + CHARSET_ID_OFFSET_94x94) */
-
 /* Japanese JIS X0208-1978     2/4 2/{(8),9,10,11} 4/0 (@) */
 #define LEADING_BYTE_JAPANESE_JISX0208_1978     -42
 
@@ -168,6 +161,9 @@ typedef short Charset_ID;
 /* Japanese JIS X0208-1983     2/4 2/{(8),9,10,11} 4/2 (B) */
 #define LEADING_BYTE_JAPANESE_JISX0208          -87
 
+/* Japanese JIS X0208-1990     2/4 2/{(8),9,10,11} 4/2 (B) */
+#define LEADING_BYTE_JAPANESE_JISX0208_1990    -168
+
 /* Hangul KS C5601-1987                2/4 2/{8,9,10,11} 4/3 (C) */
 #define LEADING_BYTE_KOREAN_KSC5601            -149
 
@@ -201,6 +197,7 @@ typedef short Charset_ID;
 /* DPRK Hangul KPS 9566-1997   2/4 2/{8,9,10,11} 4/14 (N) */
 #define LEADING_BYTE_KOREAN_KPS9566            -202
 
+
 #define MIN_LEADING_BYTE       (- 80 * 3)
 
 #define NUM_LEADING_BYTES      (MAX_LEADING_BYTE_PRIVATE - MIN_LEADING_BYTE)
@@ -643,17 +640,20 @@ decoding_table_remove_char (Lisp_Object ccs, int code_point)
   decoding_table_put_char (ccs, code_point, Qunbound);
 }
 
-#ifdef HAVE_CHISE_CLIENT
+#ifdef HAVE_CHISE
 Emchar load_char_decoding_entry_maybe (Lisp_Object ccs, int code_point);
 #endif
 
-Emchar decode_defined_char (Lisp_Object charset, int code_point);
+Emchar decode_defined_char (Lisp_Object charset, int code_point,
+                           int without_inheritance);
 
-INLINE_HEADER Emchar DECODE_CHAR (Lisp_Object charset, int code_point);
 INLINE_HEADER Emchar
-DECODE_CHAR (Lisp_Object charset, int code_point)
+DECODE_CHAR (Lisp_Object charset, int code_point, int without_inheritance);
+INLINE_HEADER Emchar
+DECODE_CHAR (Lisp_Object charset, int code_point, int without_inheritance)
 {
-  Emchar char_id = decode_defined_char (charset, code_point);
+  Emchar char_id
+    = decode_defined_char (charset, code_point, without_inheritance);
 
   if (char_id >= 0)
     return char_id;
@@ -669,9 +669,9 @@ INLINE_HEADER Emchar
 MAKE_CHAR (Lisp_Object charset, int c1, int c2)
 {
   if (XCHARSET_DIMENSION (charset) == 1)
-    return DECODE_CHAR (charset, c1);
+    return DECODE_CHAR (charset, c1, 0);
   else
-    return DECODE_CHAR (charset, (c1 << 8) | c2);
+    return DECODE_CHAR (charset, (c1 << 8) | c2, 0);
 }
 
 extern Lisp_Object Vcharacter_attribute_table;
@@ -706,6 +706,30 @@ encode_char_1 (Emchar ch, Lisp_Object* charset)
   return encode_builtin_char_1 (ch, charset);
 }
 
+INLINE_HEADER int encode_char_2 (Emchar ch, Lisp_Object* charset);
+INLINE_HEADER int
+encode_char_2 (Emchar ch, Lisp_Object* charset)
+{
+  Lisp_Object charsets = Vdefault_coded_charset_priority_list;
+
+  while (!NILP (charsets))
+    {
+      *charset = Ffind_charset (Fcar (charsets));
+      if ( !NILP (*charset)
+          && (XCHARSET_DIMENSION (*charset) <= 2) )
+       {
+         int code_point = charset_code_point (*charset, ch, 0);
+
+         if (code_point >= 0)
+           return code_point;
+       }
+      charsets = Fcdr (charsets);            
+    }
+  
+  /* otherwise --- maybe for bootstrap */
+  return encode_builtin_char_1 (ch, charset);
+}
+
 #define ENCODE_CHAR(ch, charset)       encode_char_1 (ch, &(charset))
 
 INLINE_HEADER void
@@ -764,7 +788,7 @@ CHAR_TO_CHARC (Emchar ch)
 {
   Charc cc;
 
-  cc.code_point = encode_char_1 (ch, &cc.charset);
+  cc.code_point = encode_char_2 (ch, &cc.charset);
   return cc;
 }