Sync with r21-2-26.

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

diff --git a/src/char-ucs.h b/src/char-ucs.h
index d51083c..1e3fbe1 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -81,7 +81,7 @@ extern Lisp_Object Vcharset_latin_viscii_upper;
 
 typedef int Charset_ID;
 
-#define MIN_LEADING_BYTE               -0x40
+#define MIN_LEADING_BYTE               -0x60
 #define CHARSET_ID_OFFSET              0x00
 
 /* represent normal 80-9F */
@@ -112,8 +112,31 @@ typedef int Charset_ID;
 /* Japanese JIS X0208-1990     2/4 2/{(8),9,10,11} 4/2 (B) */
 #define LEADING_BYTE_JAPANESE_JISX0208_1990 (CHARSET_ID_OFFSET - 10)
 
+/* Konjaku-Mojikyo font (for pseudo-JIS X 0208 encoding) */
+#define LEADING_BYTE_MOJIKYO_PJ_1      (CHARSET_ID_OFFSET - 11)
+#define LEADING_BYTE_MOJIKYO_PJ_2      (CHARSET_ID_OFFSET - 12)
+#define LEADING_BYTE_MOJIKYO_PJ_3      (CHARSET_ID_OFFSET - 13)
+#define LEADING_BYTE_MOJIKYO_PJ_4      (CHARSET_ID_OFFSET - 14)
+#define LEADING_BYTE_MOJIKYO_PJ_5      (CHARSET_ID_OFFSET - 15)
+#define LEADING_BYTE_MOJIKYO_PJ_6      (CHARSET_ID_OFFSET - 16)
+#define LEADING_BYTE_MOJIKYO_PJ_7      (CHARSET_ID_OFFSET - 17)
+#define LEADING_BYTE_MOJIKYO_PJ_8      (CHARSET_ID_OFFSET - 18)
+#define LEADING_BYTE_MOJIKYO_PJ_9      (CHARSET_ID_OFFSET - 19)
+#define LEADING_BYTE_MOJIKYO_PJ_10     (CHARSET_ID_OFFSET - 20)
+#define LEADING_BYTE_MOJIKYO_PJ_11     (CHARSET_ID_OFFSET - 21)
+#define LEADING_BYTE_MOJIKYO_PJ_12     (CHARSET_ID_OFFSET - 22)
+#define LEADING_BYTE_MOJIKYO_PJ_13     (CHARSET_ID_OFFSET - 23)
+#define LEADING_BYTE_MOJIKYO_PJ_14     (CHARSET_ID_OFFSET - 24)
+#define LEADING_BYTE_MOJIKYO_PJ_15     (CHARSET_ID_OFFSET - 25)
+#define LEADING_BYTE_MOJIKYO_PJ_16     (CHARSET_ID_OFFSET - 26)
+#define LEADING_BYTE_MOJIKYO_PJ_17     (CHARSET_ID_OFFSET - 27)
+#define LEADING_BYTE_MOJIKYO_PJ_18     (CHARSET_ID_OFFSET - 28)
+#define LEADING_BYTE_MOJIKYO_PJ_19     (CHARSET_ID_OFFSET - 29)
+#define LEADING_BYTE_MOJIKYO_PJ_20     (CHARSET_ID_OFFSET - 30)
+#define LEADING_BYTE_MOJIKYO_PJ_21     (CHARSET_ID_OFFSET - 31)
+
 #define MIN_LEADING_BYTE_PRIVATE       MIN_LEADING_BYTE
-#define MAX_LEADING_BYTE_PRIVATE       (CHARSET_ID_OFFSET - 11)
+#define MAX_LEADING_BYTE_PRIVATE       (CHARSET_ID_OFFSET - 32)
 
 
 /* #define CHARSET_ID_OFFSET_94                (CHARSET_ID_OFFSET - '0') */
@@ -333,11 +356,15 @@ DECLARE_LRECORD (charset, struct Lisp_Charset);
 #define XCHARSET_CODE_OFFSET(cs)  CHARSET_CODE_OFFSET(XCHARSET(cs))
 #define XCHARSET_BYTE_OFFSET(cs)  CHARSET_BYTE_OFFSET(XCHARSET(cs))
 
-/* Table of charsets indexed by (leading byte - 128). */
-extern Lisp_Object charset_by_leading_byte[NUM_LEADING_BYTES];
+struct charset_lookup {
+  /* Table of charsets indexed by (leading byte - 128). */
+  Lisp_Object charset_by_leading_byte[NUM_LEADING_BYTES];
+  
+  /* Table of charsets indexed by type/final-byte/direction. */
+  Lisp_Object charset_by_attributes[4][128];
+};
 
-/* Table of charsets indexed by type/final-byte. */
-extern Lisp_Object charset_by_attributes[4][128];
+extern struct charset_lookup *chlook;
 
 #ifdef ERROR_CHECK_TYPECHECK
 /* int not Bufbyte even though that is the actual type of a leading byte.
@@ -349,18 +376,18 @@ CHARSET_BY_LEADING_BYTE (Charset_ID lb)
 {
   assert (lb >= MIN_LEADING_BYTE &&
          lb < (MIN_LEADING_BYTE + NUM_LEADING_BYTES));
-  return charset_by_leading_byte[lb - MIN_LEADING_BYTE];
+  return chlook->charset_by_leading_byte[lb - MIN_LEADING_BYTE];
 }
 
 #else
 
 #define CHARSET_BY_LEADING_BYTE(lb) \
-  (charset_by_leading_byte[(lb) - MIN_LEADING_BYTE])
+  (chlook->charset_by_leading_byte[(lb) - MIN_LEADING_BYTE])
 
 #endif
 
 #define CHARSET_BY_ATTRIBUTES(type, final, dir) \
-  (charset_by_attributes[type][final])
+  (chlook->charset_by_attributes[type][final])
 
 \f
 /************************************************************************/
@@ -381,22 +408,21 @@ CHARSET_BY_LEADING_BYTE (Charset_ID lb)
 #define MIN_CHAR_THAI          0x0E00
 #define MAX_CHAR_THAI          0x0E5F
 
+/*
 #define MIN_CHAR_HIRAGANA      0x3041
 #define MAX_CHAR_HIRAGANA      0x3093
 
 #define MIN_CHAR_KATAKANA      0x30A1
 #define MAX_CHAR_KATAKANA      0x30F6
+*/
 
 #define MIN_CHAR_HALFWIDTH_KATAKANA    0xFF61
 #define MAX_CHAR_HALFWIDTH_KATAKANA    0xFF9F
 
-#define MIN_CHAR_OBS_94x94     0xE00000
-#define MIN_CHAR_JIS_X0208_1990        0xE04508
-#define MAX_CHAR_JIS_X0208_1990        0XE0678B
-#define MAX_CHAR_OBS_94x94     0XE1E337
+#define MAX_CHAR_BMP           0x00FFFF
 
-#define MIN_CHAR_DAIKANWA      0xE50000
-#define MAX_CHAR_DAIKANWA      0xE5FFFF
+#define MIN_CHAR_DAIKANWA      0xE00000
+#define MAX_CHAR_DAIKANWA      0xE0FFFF
 
 #define MIN_CHAR_94            0xE90940
 #define MAX_CHAR_94            (MIN_CHAR_94 + 94 * 80 - 1)
@@ -404,7 +430,9 @@ CHARSET_BY_LEADING_BYTE (Charset_ID lb)
 #define MAX_CHAR_96            (MIN_CHAR_96 + 96 * 80 - 1)
 
 #define MIN_CHAR_94x94         0xE9F6C0
+#define MIN_CHAR_JIS_X0208_1990        (MIN_CHAR_94x94 + 94 * 94 * 79)
 #define MAX_CHAR_94x94         (MIN_CHAR_94x94 + 94 * 94 * 80 - 1)
+#define MAX_CHAR_JIS_X0208_1990        MAX_CHAR_94x94
 #define MIN_CHAR_96x96         0xF4C000
 #define MAX_CHAR_96x96         (MIN_CHAR_96x96 + 96 * 96 * 80 - 1)
 
@@ -435,13 +463,7 @@ MAKE_CHAR (Lisp_Object charset, int c1, int c2)
       else
        return XCHAR (ch);
     }
-  if (EQ (charset, Vcharset_katakana_jisx0201))
-    if (c1 < 0x60)
-      return c1 + MIN_CHAR_HALFWIDTH_KATAKANA - 33;
-    else
-      /* return MIN_CHAR_94 + ('I' - '0') * 94 + (c1 - 33); */
-      return ' ';
-  else if (XCHARSET_UCS_MAX (charset))
+  if (XCHARSET_UCS_MAX (charset))
     {
       Emchar code
        = (XCHARSET_DIMENSION (charset) == 1