X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchar-ucs.h;h=dd9aacf1d3e4e463efd92776d85697e740281ccc;hb=280624d95d3fd2fdee5e852a92cdb7457736cba8;hp=d51083ca22b438d9b90ee15939b9e08680b71d6c;hpb=3860bc8fe5b4a3bbfc3ac94d47ef141db0fca7d5;p=chise%2Fxemacs-chise.git-

diff --git a/src/char-ucs.h b/src/char-ucs.h
index d51083c..dd9aacf 100644
--- 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') */
@@ -435,13 +458,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