/* Functions to handle multilingual characters.
Copyright (C) 1992, 1995 Free Software Foundation, Inc.
Copyright (C) 1995 Sun Microsystems, Inc.
- Copyright (C) 1999,2000 MORIOKA Tomohiko
+ Copyright (C) 1999,2000,2001 MORIOKA Tomohiko
This file is part of XEmacs.
character = Fmake_char (ccs, Fcar (cell), Fcar (Fcdr (cell)));
else
character = Fdecode_char (ccs, cell);
- goto setup_attributes;
+ if (!NILP (character))
+ goto setup_attributes;
}
rest = Fcdr (rest);
}
#define BIG5_SAME_ROW (0xFF - 0xA1 + 0x7F - 0x40)
Emchar
-make_builtin_char (Lisp_Object charset, int c1, int c2)
+decode_builtin_char (Lisp_Object charset, int code_point)
{
- if (XCHARSET_UCS_MAX (charset))
- {
- Emchar code
- = (XCHARSET_DIMENSION (charset) == 1
- ?
- c1 - XCHARSET_BYTE_OFFSET (charset)
- :
- (c1 - XCHARSET_BYTE_OFFSET (charset)) * XCHARSET_CHARS (charset)
- + c2 - XCHARSET_BYTE_OFFSET (charset))
- - XCHARSET_CODE_OFFSET (charset) + XCHARSET_UCS_MIN (charset);
- if ((code < XCHARSET_UCS_MIN (charset))
- || (XCHARSET_UCS_MAX (charset) < code))
- signal_simple_error ("Arguments makes invalid character",
- make_char (code));
- return code;
- }
- else if (XCHARSET_DIMENSION (charset) == 1)
+ int final;
+
+ if (EQ (charset, Vcharset_chinese_big5))
{
- switch (XCHARSET_CHARS (charset))
+ int c1 = code_point >> 8;
+ int c2 = code_point & 0xFF;
+ unsigned int I
+ = (c1 - 0xA1) * BIG5_SAME_ROW
+ + c2 - (c2 < 0x7F ? 0x40 : 0x62);
+
+ if (c1 < 0xC9)
+ {
+ charset = Vcharset_chinese_big5_1;
+ }
+ else
{
- case 94:
- return MIN_CHAR_94
- + (XCHARSET_FINAL (charset) - '0') * 94 + (c1 - 33);
- case 96:
- return MIN_CHAR_96
- + (XCHARSET_FINAL (charset) - '0') * 96 + (c1 - 32);
- default:
- abort ();
+ charset = Vcharset_chinese_big5_2;
+ I -= (BIG5_SAME_ROW) * (0xC9 - 0xA1);
}
+ code_point = ((I / 94 + 33) << 8) | (I % 94 + 33);
}
- else
+ if ((final = XCHARSET_FINAL (charset)) >= '0')
{
- if (EQ (charset, Vcharset_chinese_big5))
+ if (XCHARSET_DIMENSION (charset) == 1)
{
- int B1 = c1, B2 = c2;
- unsigned int I
- = (B1 - 0xA1) * BIG5_SAME_ROW
- + B2 - (B2 < 0x7F ? 0x40 : 0x62);
-
- if (B1 < 0xC9)
- {
- charset = Vcharset_chinese_big5_1;
- }
- else
+ switch (XCHARSET_CHARS (charset))
{
- charset = Vcharset_chinese_big5_2;
- I -= (BIG5_SAME_ROW) * (0xC9 - 0xA1);
+ case 94:
+ return MIN_CHAR_94
+ + (final - '0') * 94 + ((code_point & 0x7F) - 33);
+ case 96:
+ return MIN_CHAR_96
+ + (final - '0') * 96 + ((code_point & 0x7F) - 32);
+ default:
+ abort ();
+ return -1;
}
- c1 = I / 94 + 33;
- c2 = I % 94 + 33;
}
- switch (XCHARSET_CHARS (charset))
+ else
{
- case 94:
- return MIN_CHAR_94x94
- + (XCHARSET_FINAL (charset) - '0') * 94 * 94
- + (c1 - 33) * 94 + (c2 - 33);
- case 96:
- return MIN_CHAR_96x96
- + (XCHARSET_FINAL (charset) - '0') * 96 * 96
- + (c1 - 32) * 96 + (c2 - 32);
- default:
- abort ();
+ switch (XCHARSET_CHARS (charset))
+ {
+ case 94:
+ return MIN_CHAR_94x94
+ + (final - '0') * 94 * 94
+ + (((code_point >> 8) & 0x7F) - 33) * 94
+ + ((code_point & 0x7F) - 33);
+ case 96:
+ return MIN_CHAR_96x96
+ + (final - '0') * 96 * 96
+ + (((code_point >> 8) & 0x7F) - 32) * 96
+ + ((code_point & 0x7F) - 32);
+ default:
+ abort ();
+ return -1;
+ }
}
}
+ else if (XCHARSET_UCS_MAX (charset))
+ {
+ Emchar cid
+ = (XCHARSET_DIMENSION (charset) == 1
+ ?
+ code_point - XCHARSET_BYTE_OFFSET (charset)
+ :
+ ((code_point >> 8) - XCHARSET_BYTE_OFFSET (charset))
+ * XCHARSET_CHARS (charset)
+ + (code_point & 0xFF) - XCHARSET_BYTE_OFFSET (charset))
+ - XCHARSET_CODE_OFFSET (charset) + XCHARSET_UCS_MIN (charset);
+ if ((cid < XCHARSET_UCS_MIN (charset))
+ || (XCHARSET_UCS_MAX (charset) < cid))
+ return -1;
+ return cid;
+ }
+ else
+ return -1;
}
int
c = XINT (code);
if (XCHARSET_GRAPHIC (charset) == 1)
c &= 0x7F7F7F7F;
- return make_char (DECODE_CHAR (charset, c));
+ c = DECODE_CHAR (charset, c);
+ return c ? make_char (c) : Qnil;
}
DEFUN ("decode-builtin-char", Fdecode_builtin_char, 2, 2, 0, /*
(charset, code))
{
int c;
- int final;
charset = Fget_charset (charset);
CHECK_INT (code);
- c = XINT (code);
-
- if ((final = XCHARSET_FINAL (charset)) >= '0')
+ if (EQ (charset, Vcharset_latin_viscii))
{
- if (XCHARSET_DIMENSION (charset) == 1)
+ Lisp_Object chr = Fdecode_char (charset, code);
+ Lisp_Object ret;
+
+ if (!NILP (chr))
{
- switch (XCHARSET_CHARS (charset))
+ if (!NILP
+ (ret = Fget_char_attribute (chr,
+ Vcharset_latin_viscii_lower,
+ Qnil)))
{
- case 94:
- return
- make_char (MIN_CHAR_94 + (final - '0') * 94
- + ((c & 0x7F) - 33));
- case 96:
- return
- make_char (MIN_CHAR_96 + (final - '0') * 96
- + ((c & 0x7F) - 32));
- default:
- return Fdecode_char (charset, code);
+ charset = Vcharset_latin_viscii_lower;
+ code = ret;
}
- }
- else
- {
- switch (XCHARSET_CHARS (charset))
+ else if (!NILP
+ (ret = Fget_char_attribute (chr,
+ Vcharset_latin_viscii_upper,
+ Qnil)))
{
- case 94:
- return
- make_char (MIN_CHAR_94x94
- + (final - '0') * 94 * 94
- + (((c >> 8) & 0x7F) - 33) * 94
- + ((c & 0x7F) - 33));
- case 96:
- return
- make_char (MIN_CHAR_96x96
- + (final - '0') * 96 * 96
- + (((c >> 8) & 0x7F) - 32) * 96
- + ((c & 0x7F) - 32));
- default:
- return Fdecode_char (charset, code);
+ charset = Vcharset_latin_viscii_upper;
+ code = ret;
}
}
}
- else if (XCHARSET_UCS_MAX (charset))
- {
- Emchar cid
- = (XCHARSET_DIMENSION (charset) == 1
- ?
- c - XCHARSET_BYTE_OFFSET (charset)
- :
- ((c >> 8) - XCHARSET_BYTE_OFFSET (charset))
- * XCHARSET_CHARS (charset)
- + (c & 0xFF) - XCHARSET_BYTE_OFFSET (charset))
- - XCHARSET_CODE_OFFSET (charset) + XCHARSET_UCS_MIN (charset);
- if ((cid < XCHARSET_UCS_MIN (charset))
- || (XCHARSET_UCS_MAX (charset) < cid))
- return Fdecode_char (charset, code);
- return make_char (cid);
- }
- else
- return Fdecode_char (charset, code);
+ c = XINT (code);
+#if 0
+ if (XCHARSET_GRAPHIC (charset) == 1)
+ c &= 0x7F7F7F7F;
+#endif
+ c = decode_builtin_char (charset, c);
+ return c ? make_char (c) : Fdecode_char (charset, code);
}
#endif
Qnil, 0, 0xFFFF, 0, 0);
staticpro (&Vcharset_ucs_cns);
Vcharset_ucs_cns =
- make_charset (LEADING_BYTE_UCS_CNS, Qucs_cns, 256, 4,
+ make_charset (LEADING_BYTE_UCS_CNS, Qucs_cns, 256, 3,
1, 2, 0, CHARSET_LEFT_TO_RIGHT,
build_string ("UCS for CNS"),
build_string ("UCS for CNS 11643"),
build_string ("ISO/IEC 10646 for CNS 11643"),
build_string (""),
- Qnil, 0, 0xFFFFFFF, 0, 0);
+ Qnil, 0, 0, 0, 0);
#else
# define MIN_CHAR_THAI 0
# define MAX_CHAR_THAI 0