/* Rewritten by Ben Wing <ben@xemacs.org>. */
#include <config.h>
+#ifdef UTF2000
+#include <limits.h>
+#endif
#include "lisp.h"
#include "buffer.h"
Lisp_Object Vcharset_latin_viscii_upper;
Lisp_Object Vcharset_ideograph_daikanwa;
Lisp_Object Vcharset_mojikyo;
+Lisp_Object Vcharset_mojikyo_2022_1;
Lisp_Object Vcharset_mojikyo_pj_1;
Lisp_Object Vcharset_mojikyo_pj_2;
Lisp_Object Vcharset_mojikyo_pj_3;
#ifdef UTF2000
+#define BT_UINT8_MIN 0
+#define BT_UINT8_MAX (UCHAR_MAX - 3)
+#define BT_UINT8_t (UCHAR_MAX - 2)
+#define BT_UINT8_nil (UCHAR_MAX - 1)
+#define BT_UINT8_unbound UCHAR_MAX
+
+INLINE_HEADER int INT_UINT8_P (Lisp_Object obj);
+INLINE_HEADER int UINT8_VALUE_P (Lisp_Object obj);
+INLINE_HEADER unsigned char UINT8_ENCODE (Lisp_Object obj);
+INLINE_HEADER Lisp_Object UINT8_DECODE (unsigned char n);
+INLINE_HEADER unsigned short UINT8_TO_UINT16 (unsigned char n);
+
+INLINE_HEADER int
+INT_UINT8_P (Lisp_Object obj)
+{
+ if (INTP (obj))
+ {
+ int num = XINT (obj);
+
+ return (BT_UINT8_MIN <= num) && (num <= BT_UINT8_MAX);
+ }
+ else
+ return 0;
+}
+
+INLINE_HEADER int
+UINT8_VALUE_P (Lisp_Object obj)
+{
+ return EQ (obj, Qunbound)
+ || EQ (obj, Qnil) || EQ (obj, Qt) || INT_UINT8_P (obj);
+}
+
+INLINE_HEADER unsigned char
+UINT8_ENCODE (Lisp_Object obj)
+{
+ if (EQ (obj, Qunbound))
+ return BT_UINT8_unbound;
+ else if (EQ (obj, Qnil))
+ return BT_UINT8_nil;
+ else if (EQ (obj, Qt))
+ return BT_UINT8_t;
+ else
+ return XINT (obj);
+}
+
+INLINE_HEADER Lisp_Object
+UINT8_DECODE (unsigned char n)
+{
+ if (n == BT_UINT8_unbound)
+ return Qunbound;
+ else if (n == BT_UINT8_nil)
+ return Qnil;
+ else if (n == BT_UINT8_t)
+ return Qt;
+ else
+ return make_int (n);
+}
+
+static Lisp_Object
+mark_uint8_byte_table (Lisp_Object obj)
+{
+ return Qnil;
+}
+
+static void
+print_uint8_byte_table (Lisp_Object obj,
+ Lisp_Object printcharfun, int escapeflag)
+{
+ Lisp_Uint8_Byte_Table *bte = XUINT8_BYTE_TABLE (obj);
+ int i;
+ struct gcpro gcpro1, gcpro2;
+ GCPRO2 (obj, printcharfun);
+
+ write_c_string ("\n#<uint8-byte-table", printcharfun);
+ for (i = 0; i < 256; i++)
+ {
+ unsigned char n = bte->property[i];
+ if ( (i & 15) == 0 )
+ write_c_string ("\n ", printcharfun);
+ write_c_string (" ", printcharfun);
+ if (n == BT_UINT8_unbound)
+ write_c_string ("void", printcharfun);
+ else if (n == BT_UINT8_nil)
+ write_c_string ("nil", printcharfun);
+ else if (n == BT_UINT8_t)
+ write_c_string ("t", printcharfun);
+ else
+ {
+ char buf[4];
+
+ sprintf (buf, "%hd", n);
+ write_c_string (buf, printcharfun);
+ }
+ }
+ UNGCPRO;
+ write_c_string (">", printcharfun);
+}
+
+static int
+uint8_byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
+{
+ Lisp_Uint8_Byte_Table *te1 = XUINT8_BYTE_TABLE (obj1);
+ Lisp_Uint8_Byte_Table *te2 = XUINT8_BYTE_TABLE (obj2);
+ int i;
+
+ for (i = 0; i < 256; i++)
+ if (te1->property[i] != te2->property[i])
+ return 0;
+ return 1;
+}
+
+static unsigned long
+uint8_byte_table_hash (Lisp_Object obj, int depth)
+{
+ Lisp_Uint8_Byte_Table *te = XUINT8_BYTE_TABLE (obj);
+ int i;
+ hashcode_t hash = 0;
+
+ for (i = 0; i < 256; i++)
+ hash = HASH2 (hash, te->property[i]);
+ return hash;
+}
+
+DEFINE_LRECORD_IMPLEMENTATION ("uint8-byte-table", uint8_byte_table,
+ mark_uint8_byte_table,
+ print_uint8_byte_table,
+ 0, uint8_byte_table_equal,
+ uint8_byte_table_hash,
+ 0 /* uint8_byte_table_description */,
+ Lisp_Uint8_Byte_Table);
+
+static Lisp_Object
+make_uint8_byte_table (unsigned char initval)
+{
+ Lisp_Object obj;
+ int i;
+ Lisp_Uint8_Byte_Table *cte;
+
+ cte = alloc_lcrecord_type (Lisp_Uint8_Byte_Table,
+ &lrecord_uint8_byte_table);
+
+ for (i = 0; i < 256; i++)
+ cte->property[i] = initval;
+
+ XSETUINT8_BYTE_TABLE (obj, cte);
+ return obj;
+}
+
+static int
+uint8_byte_table_same_value_p (Lisp_Object obj)
+{
+ Lisp_Uint8_Byte_Table *bte = XUINT8_BYTE_TABLE (obj);
+ unsigned char v0 = bte->property[0];
+ int i;
+
+ for (i = 1; i < 256; i++)
+ {
+ if (bte->property[i] != v0)
+ return 0;
+ }
+ return -1;
+}
+
+
+#define BT_UINT16_MIN 0
+#define BT_UINT16_MAX (USHRT_MAX - 3)
+#define BT_UINT16_t (USHRT_MAX - 2)
+#define BT_UINT16_nil (USHRT_MAX - 1)
+#define BT_UINT16_unbound USHRT_MAX
+
+INLINE_HEADER int INT_UINT16_P (Lisp_Object obj);
+INLINE_HEADER int UINT16_VALUE_P (Lisp_Object obj);
+INLINE_HEADER unsigned short UINT16_ENCODE (Lisp_Object obj);
+INLINE_HEADER Lisp_Object UINT16_DECODE (unsigned short us);
+
+INLINE_HEADER int
+INT_UINT16_P (Lisp_Object obj)
+{
+ if (INTP (obj))
+ {
+ int num = XINT (obj);
+
+ return (BT_UINT16_MIN <= num) && (num <= BT_UINT16_MAX);
+ }
+ else
+ return 0;
+}
+
+INLINE_HEADER int
+UINT16_VALUE_P (Lisp_Object obj)
+{
+ return EQ (obj, Qunbound)
+ || EQ (obj, Qnil) || EQ (obj, Qt) || INT_UINT16_P (obj);
+}
+
+INLINE_HEADER unsigned short
+UINT16_ENCODE (Lisp_Object obj)
+{
+ if (EQ (obj, Qunbound))
+ return BT_UINT16_unbound;
+ else if (EQ (obj, Qnil))
+ return BT_UINT16_nil;
+ else if (EQ (obj, Qt))
+ return BT_UINT16_t;
+ else
+ return XINT (obj);
+}
+
+INLINE_HEADER Lisp_Object
+UINT16_DECODE (unsigned short n)
+{
+ if (n == BT_UINT16_unbound)
+ return Qunbound;
+ else if (n == BT_UINT16_nil)
+ return Qnil;
+ else if (n == BT_UINT16_t)
+ return Qt;
+ else
+ return make_int (n);
+}
+
+INLINE_HEADER unsigned short
+UINT8_TO_UINT16 (unsigned char n)
+{
+ if (n == BT_UINT8_unbound)
+ return BT_UINT16_unbound;
+ else if (n == BT_UINT8_nil)
+ return BT_UINT16_nil;
+ else if (n == BT_UINT8_t)
+ return BT_UINT16_t;
+ else
+ return n;
+}
+
+static Lisp_Object
+mark_uint16_byte_table (Lisp_Object obj)
+{
+ return Qnil;
+}
+
+static void
+print_uint16_byte_table (Lisp_Object obj,
+ Lisp_Object printcharfun, int escapeflag)
+{
+ Lisp_Uint16_Byte_Table *bte = XUINT16_BYTE_TABLE (obj);
+ int i;
+ struct gcpro gcpro1, gcpro2;
+ GCPRO2 (obj, printcharfun);
+
+ write_c_string ("\n#<uint16-byte-table", printcharfun);
+ for (i = 0; i < 256; i++)
+ {
+ unsigned short n = bte->property[i];
+ if ( (i & 15) == 0 )
+ write_c_string ("\n ", printcharfun);
+ write_c_string (" ", printcharfun);
+ if (n == BT_UINT16_unbound)
+ write_c_string ("void", printcharfun);
+ else if (n == BT_UINT16_nil)
+ write_c_string ("nil", printcharfun);
+ else if (n == BT_UINT16_t)
+ write_c_string ("t", printcharfun);
+ else
+ {
+ char buf[7];
+
+ sprintf (buf, "%hd", n);
+ write_c_string (buf, printcharfun);
+ }
+ }
+ UNGCPRO;
+ write_c_string (">", printcharfun);
+}
+
+static int
+uint16_byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
+{
+ Lisp_Uint16_Byte_Table *te1 = XUINT16_BYTE_TABLE (obj1);
+ Lisp_Uint16_Byte_Table *te2 = XUINT16_BYTE_TABLE (obj2);
+ int i;
+
+ for (i = 0; i < 256; i++)
+ if (te1->property[i] != te2->property[i])
+ return 0;
+ return 1;
+}
+
+static unsigned long
+uint16_byte_table_hash (Lisp_Object obj, int depth)
+{
+ Lisp_Uint16_Byte_Table *te = XUINT16_BYTE_TABLE (obj);
+ int i;
+ hashcode_t hash = 0;
+
+ for (i = 0; i < 256; i++)
+ hash = HASH2 (hash, te->property[i]);
+ return hash;
+}
+
+DEFINE_LRECORD_IMPLEMENTATION ("uint16-byte-table", uint16_byte_table,
+ mark_uint16_byte_table,
+ print_uint16_byte_table,
+ 0, uint16_byte_table_equal,
+ uint16_byte_table_hash,
+ 0 /* uint16_byte_table_description */,
+ Lisp_Uint16_Byte_Table);
+
+static Lisp_Object
+make_uint16_byte_table (unsigned short initval)
+{
+ Lisp_Object obj;
+ int i;
+ Lisp_Uint16_Byte_Table *cte;
+
+ cte = alloc_lcrecord_type (Lisp_Uint16_Byte_Table,
+ &lrecord_uint16_byte_table);
+
+ for (i = 0; i < 256; i++)
+ cte->property[i] = initval;
+
+ XSETUINT16_BYTE_TABLE (obj, cte);
+ return obj;
+}
+
+static Lisp_Object
+expand_uint8_byte_table_to_uint16 (Lisp_Object table)
+{
+ Lisp_Object obj;
+ int i;
+ Lisp_Uint8_Byte_Table* bte = XUINT8_BYTE_TABLE(table);
+ Lisp_Uint16_Byte_Table* cte;
+
+ cte = alloc_lcrecord_type (Lisp_Uint16_Byte_Table,
+ &lrecord_uint16_byte_table);
+ for (i = 0; i < 256; i++)
+ {
+ cte->property[i] = UINT8_TO_UINT16 (bte->property[i]);
+ }
+ XSETUINT16_BYTE_TABLE (obj, cte);
+ return obj;
+}
+
+static int
+uint16_byte_table_same_value_p (Lisp_Object obj)
+{
+ Lisp_Uint16_Byte_Table *bte = XUINT16_BYTE_TABLE (obj);
+ unsigned short v0 = bte->property[0];
+ int i;
+
+ for (i = 1; i < 256; i++)
+ {
+ if (bte->property[i] != v0)
+ return 0;
+ }
+ return -1;
+}
+
+
static Lisp_Object
mark_byte_table (Lisp_Object obj)
{
return Qnil;
}
+static void
+print_byte_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
+{
+ Lisp_Byte_Table *bte = XBYTE_TABLE (obj);
+ int i;
+ struct gcpro gcpro1, gcpro2;
+ GCPRO2 (obj, printcharfun);
+
+ write_c_string ("\n#<byte-table", printcharfun);
+ for (i = 0; i < 256; i++)
+ {
+ Lisp_Object elt = bte->property[i];
+ if ( (i & 15) == 0 )
+ write_c_string ("\n ", printcharfun);
+ write_c_string (" ", printcharfun);
+ if (EQ (elt, Qunbound))
+ write_c_string ("void", printcharfun);
+ else
+ print_internal (elt, printcharfun, escapeflag);
+ }
+ UNGCPRO;
+ write_c_string (">", printcharfun);
+}
+
static int
byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
DEFINE_LRECORD_IMPLEMENTATION ("byte-table", byte_table,
mark_byte_table,
- internal_object_printer,
+ print_byte_table,
0, byte_table_equal,
byte_table_hash,
byte_table_description,
Lisp_Byte_Table);
static Lisp_Object
-make_byte_table (Lisp_Object initval, int older)
+make_byte_table (Lisp_Object initval)
{
Lisp_Object obj;
int i;
Lisp_Byte_Table *cte;
- if (older)
- cte = alloc_older_lcrecord_type (Lisp_Byte_Table, &lrecord_byte_table);
- else
- cte = alloc_lcrecord_type (Lisp_Byte_Table, &lrecord_byte_table);
+ cte = alloc_lcrecord_type (Lisp_Byte_Table, &lrecord_byte_table);
for (i = 0; i < 256; i++)
cte->property[i] = initval;
return obj;
}
-static Lisp_Object
-copy_byte_table (Lisp_Object entry)
+static int
+byte_table_same_value_p (Lisp_Object obj)
{
- Lisp_Byte_Table *cte = XBYTE_TABLE (entry);
- Lisp_Object obj;
+ Lisp_Byte_Table *bte = XBYTE_TABLE (obj);
+ Lisp_Object v0 = bte->property[0];
int i;
- Lisp_Byte_Table *ctenew
- = alloc_lcrecord_type (Lisp_Byte_Table, &lrecord_byte_table);
- for (i = 0; i < 256; i++)
+ for (i = 1; i < 256; i++)
{
- Lisp_Object new = cte->property[i];
- if (BYTE_TABLE_P (new))
- ctenew->property[i] = copy_byte_table (new);
- else
- ctenew->property[i] = new;
+ if (!internal_equal (bte->property[i], v0, 0))
+ return 0;
}
+ return -1;
+}
- XSETBYTE_TABLE (obj, ctenew);
- return obj;
+
+Lisp_Object get_byte_table (Lisp_Object table, unsigned char idx);
+Lisp_Object put_byte_table (Lisp_Object table, unsigned char idx,
+ Lisp_Object value);
+
+Lisp_Object
+get_byte_table (Lisp_Object table, unsigned char idx)
+{
+ if (UINT8_BYTE_TABLE_P (table))
+ return UINT8_DECODE (XUINT8_BYTE_TABLE(table)->property[idx]);
+ else if (UINT16_BYTE_TABLE_P (table))
+ return UINT16_DECODE (XUINT16_BYTE_TABLE(table)->property[idx]);
+ else if (BYTE_TABLE_P (table))
+ return XBYTE_TABLE(table)->property[idx];
+ else
+ return table;
}
+Lisp_Object
+put_byte_table (Lisp_Object table, unsigned char idx, Lisp_Object value)
+{
+ if (UINT8_BYTE_TABLE_P (table))
+ {
+ if (UINT8_VALUE_P (value))
+ {
+ XUINT8_BYTE_TABLE(table)->property[idx] = UINT8_ENCODE (value);
+ if (!UINT8_BYTE_TABLE_P (value) &&
+ !UINT16_BYTE_TABLE_P (value) && !BYTE_TABLE_P (value)
+ && uint8_byte_table_same_value_p (table))
+ {
+ return value;
+ }
+ }
+ else if (UINT16_VALUE_P (value))
+ {
+ Lisp_Object new = expand_uint8_byte_table_to_uint16 (table);
+
+ XUINT16_BYTE_TABLE(new)->property[idx] = UINT16_ENCODE (value);
+ return new;
+ }
+ else
+ {
+ Lisp_Object new = make_byte_table (Qnil);
+ int i;
+
+ for (i = 0; i < 256; i++)
+ {
+ XBYTE_TABLE(new)->property[i]
+ = UINT8_DECODE (XUINT8_BYTE_TABLE(table)->property[i]);
+ }
+ XBYTE_TABLE(new)->property[idx] = value;
+ return new;
+ }
+ }
+ else if (UINT16_BYTE_TABLE_P (table))
+ {
+ if (UINT16_VALUE_P (value))
+ {
+ XUINT16_BYTE_TABLE(table)->property[idx] = UINT16_ENCODE (value);
+ if (!UINT8_BYTE_TABLE_P (value) &&
+ !UINT16_BYTE_TABLE_P (value) && !BYTE_TABLE_P (value)
+ && uint16_byte_table_same_value_p (table))
+ {
+ return value;
+ }
+ }
+ else
+ {
+ Lisp_Object new = make_byte_table (Qnil);
+ int i;
+
+ for (i = 0; i < 256; i++)
+ {
+ XBYTE_TABLE(new)->property[i]
+ = UINT16_DECODE (XUINT16_BYTE_TABLE(table)->property[i]);
+ }
+ XBYTE_TABLE(new)->property[idx] = value;
+ return new;
+ }
+ }
+ else if (BYTE_TABLE_P (table))
+ {
+ XBYTE_TABLE(table)->property[idx] = value;
+ if (!UINT8_BYTE_TABLE_P (value) &&
+ !UINT16_BYTE_TABLE_P (value) && !BYTE_TABLE_P (value)
+ && byte_table_same_value_p (table))
+ {
+ return value;
+ }
+ }
+ else if (!internal_equal (table, value, 0))
+ {
+ if (UINT8_VALUE_P (table) && UINT8_VALUE_P (value))
+ {
+ table = make_uint8_byte_table (UINT8_ENCODE (table));
+ XUINT8_BYTE_TABLE(table)->property[idx] = UINT8_ENCODE (value);
+ }
+ else if (UINT16_VALUE_P (table) && UINT16_VALUE_P (value))
+ {
+ table = make_uint16_byte_table (UINT16_ENCODE (table));
+ XUINT16_BYTE_TABLE(table)->property[idx] = UINT16_ENCODE (value);
+ }
+ else
+ {
+ table = make_byte_table (table);
+ XBYTE_TABLE(table)->property[idx] = value;
+ }
+ }
+ return table;
+}
static Lisp_Object
mark_char_id_table (Lisp_Object obj)
return cte->table;
}
+static void
+print_char_id_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
+{
+ Lisp_Object table = XCHAR_ID_TABLE (obj)->table;
+ int i;
+ struct gcpro gcpro1, gcpro2;
+ GCPRO2 (obj, printcharfun);
+
+ write_c_string ("#<char-id-table ", printcharfun);
+ for (i = 0; i < 256; i++)
+ {
+ Lisp_Object elt = get_byte_table (table, i);
+ if (i != 0) write_c_string ("\n ", printcharfun);
+ if (EQ (elt, Qunbound))
+ write_c_string ("void", printcharfun);
+ else
+ print_internal (elt, printcharfun, escapeflag);
+ }
+ UNGCPRO;
+ write_c_string (">", printcharfun);
+}
+
static int
char_id_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- Lisp_Char_ID_Table *cte1 = XCHAR_ID_TABLE (obj1);
- Lisp_Char_ID_Table *cte2 = XCHAR_ID_TABLE (obj2);
+ Lisp_Object table1 = XCHAR_ID_TABLE (obj1)->table;
+ Lisp_Object table2 = XCHAR_ID_TABLE (obj2)->table;
+ int i;
- return byte_table_equal (cte1->table, cte2->table, depth + 1);
+ for (i = 0; i < 256; i++)
+ {
+ if (!internal_equal (get_byte_table (table1, i),
+ get_byte_table (table2, i), 0))
+ return 0;
+ }
+ return -1;
}
static unsigned long
DEFINE_LRECORD_IMPLEMENTATION ("char-id-table", char_id_table,
mark_char_id_table,
- internal_object_printer,
+ print_char_id_table,
0, char_id_table_equal,
char_id_table_hash,
char_id_table_description,
Lisp_Char_ID_Table);
static Lisp_Object
-make_char_id_table (Lisp_Object initval, int older)
+make_char_id_table (Lisp_Object initval)
{
Lisp_Object obj;
Lisp_Char_ID_Table *cte;
- if (older)
- cte = alloc_older_lcrecord_type (Lisp_Char_ID_Table,
- &lrecord_char_id_table);
- else
- cte = alloc_lcrecord_type (Lisp_Char_ID_Table, &lrecord_char_id_table);
+ cte = alloc_lcrecord_type (Lisp_Char_ID_Table, &lrecord_char_id_table);
- cte->table = make_byte_table (initval, older);
+ cte->table = make_byte_table (initval);
XSETCHAR_ID_TABLE (obj, cte);
return obj;
}
-/* not used */
-#if 0
-static Lisp_Object
-copy_char_id_table (Lisp_Object entry)
-{
- Lisp_Char_ID_Table *cte = XCHAR_ID_TABLE (entry);
- Lisp_Object obj;
- Lisp_Char_ID_Table *ctenew
- = alloc_lcrecord_type (Lisp_Char_ID_Table, &lrecord_char_id_table);
-
- ctenew->table = copy_byte_table (cte->table);
- XSETCHAR_ID_TABLE (obj, ctenew);
- return obj;
-}
-#endif
-
Lisp_Object
get_char_id_table (Emchar ch, Lisp_Object table)
{
unsigned int code = ch;
- Lisp_Byte_Table* cpt
- = XBYTE_TABLE (XCHAR_ID_TABLE (table)->table);
- Lisp_Object ret = cpt->property [(unsigned char)(code >> 24)];
- if (BYTE_TABLE_P (ret))
- cpt = XBYTE_TABLE (ret);
- else
- return ret;
-
- ret = cpt->property [(unsigned char) (code >> 16)];
- if (BYTE_TABLE_P (ret))
- cpt = XBYTE_TABLE (ret);
- else
- return ret;
-
- ret = cpt->property [(unsigned char) (code >> 8)];
- if (BYTE_TABLE_P (ret))
- cpt = XBYTE_TABLE (ret);
- else
- return ret;
-
- return cpt->property [(unsigned char) code];
+ return
+ get_byte_table
+ (get_byte_table
+ (get_byte_table
+ (get_byte_table
+ (XCHAR_ID_TABLE (table)->table,
+ (unsigned char)(code >> 24)),
+ (unsigned char) (code >> 16)),
+ (unsigned char) (code >> 8)),
+ (unsigned char) code);
}
void put_char_id_table (Emchar ch, Lisp_Object value, Lisp_Object table);
put_char_id_table (Emchar ch, Lisp_Object value, Lisp_Object table)
{
unsigned int code = ch;
- Lisp_Byte_Table* cpt1 = XBYTE_TABLE (XCHAR_ID_TABLE (table)->table);
- Lisp_Object ret = cpt1->property[(unsigned char)(code >> 24)];
+ Lisp_Object table1, table2, table3, table4;
- if (BYTE_TABLE_P (ret))
- {
- Lisp_Byte_Table* cpt2 = XBYTE_TABLE (ret);
-
- ret = cpt2->property[(unsigned char)(code >> 16)];
- if (BYTE_TABLE_P (ret))
- {
- Lisp_Byte_Table* cpt3 = XBYTE_TABLE (ret);
-
- ret = cpt3->property[(unsigned char)(code >> 8)];
- if (BYTE_TABLE_P (ret))
- {
- Lisp_Byte_Table* cpt4 = XBYTE_TABLE (ret);
-
- cpt4->property[(unsigned char)code] = value;
- }
- else if (!EQ (ret, value))
- {
- Lisp_Object cpt4
- = make_byte_table (ret, OLDER_RECORD_P (table));
-
- XBYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
- cpt3->property[(unsigned char)(code >> 8)] = cpt4;
- }
- }
- else if (!EQ (ret, value))
- {
- int older = OLDER_RECORD_P (table);
- Lisp_Object cpt3 = make_byte_table (ret, older);
- Lisp_Object cpt4 = make_byte_table (ret, older);
-
- XBYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
- XBYTE_TABLE(cpt3)->property[(unsigned char)(code >> 8)]
- = cpt4;
- cpt2->property[(unsigned char)(code >> 16)] = cpt3;
- }
- }
- else if (!EQ (ret, value))
- {
- int older = OLDER_RECORD_P (table);
- Lisp_Object cpt2 = make_byte_table (ret, older);
- Lisp_Object cpt3 = make_byte_table (ret, older);
- Lisp_Object cpt4 = make_byte_table (ret, older);
+ table1 = XCHAR_ID_TABLE (table)->table;
+ table2 = get_byte_table (table1, (unsigned char)(code >> 24));
+ table3 = get_byte_table (table2, (unsigned char)(code >> 16));
+ table4 = get_byte_table (table3, (unsigned char)(code >> 8));
- XBYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
- XBYTE_TABLE(cpt3)->property[(unsigned char)(code >> 8)] = cpt4;
- XBYTE_TABLE(cpt2)->property[(unsigned char)(code >> 16)] = cpt3;
- cpt1->property[(unsigned char)(code >> 24)] = cpt2;
- }
+ table4 = put_byte_table (table4, (unsigned char)code, value);
+ table3 = put_byte_table (table3, (unsigned char)(code >> 8), table4);
+ table2 = put_byte_table (table2, (unsigned char)(code >> 16), table3);
+ XCHAR_ID_TABLE (table)->table
+ = put_byte_table (table1, (unsigned char)(code >> 24), table2);
}
return char_attribute_list;
}
+DEFUN ("find-char-attribute-table", Ffind_char_attribute_table, 1, 1, 0, /*
+Return char-id-table corresponding to ATTRIBUTE.
+*/
+ (attribute))
+{
+ return Fgethash (attribute, Vchar_attribute_hash_table, Qnil);
+}
+
/* We store the char-id-tables in hash tables with the attributes as
the key and the actual char-id-table object as the value. Each
ntable = get_char_id_table (c, table);
if (!CHAR_ID_TABLE_P (ntable))
{
- ntable
- = make_char_id_table (Qnil, OLDER_RECORD_P (table));
+ ntable = make_char_id_table (Qnil);
put_char_id_table (c, ntable, table);
}
table = ntable;
if (NILP (table))
{
- table = make_char_id_table (Qunbound, 0);
+ table = make_char_id_table (Qunbound);
Fputhash (attribute, table, Vchar_attribute_hash_table);
}
put_char_id_table (XCHAR (character), value, table);
if (NILP (encoding_table = XCHARSET_ENCODING_TABLE (ccs)))
{
XCHARSET_ENCODING_TABLE (ccs)
- = encoding_table = make_char_id_table (Qnil, -1);
+ = encoding_table = make_char_id_table (Qnil);
}
put_char_id_table (XCHAR (character), value, encoding_table);
return Qt;
Qvietnamese_viscii_lower,
Qvietnamese_viscii_upper,
Qmojikyo,
+ Qmojikyo_2022_1,
Qmojikyo_pj_1,
Qmojikyo_pj_2,
Qmojikyo_pj_3,
mark_object (cs->registry);
mark_object (cs->ccl_program);
#ifdef UTF2000
- /* mark_object (cs->encoding_table); */
+ mark_object (cs->encoding_table);
/* mark_object (cs->decoding_table); */
#endif
return cs->name;
Emchar ucs_min, Emchar ucs_max,
Emchar code_offset, unsigned char byte_offset)
{
- unsigned char type = 0;
Lisp_Object obj;
Lisp_Charset *cs = alloc_lcrecord_type (Lisp_Charset, &lrecord_charset);
CHARSET_BYTE_OFFSET(cs) = byte_offset;
#endif
- switch (CHARSET_CHARS (cs))
- {
- case 94:
- switch (CHARSET_DIMENSION (cs))
- {
- case 1:
- type = CHARSET_TYPE_94;
- break;
- case 2:
- type = CHARSET_TYPE_94X94;
- break;
- }
- break;
- case 96:
- switch (CHARSET_DIMENSION (cs))
- {
- case 1:
- type = CHARSET_TYPE_96;
- break;
- case 2:
- type = CHARSET_TYPE_96X96;
- break;
- }
- break;
-#ifdef UTF2000
- case 128:
- switch (CHARSET_DIMENSION (cs))
- {
- case 1:
- type = CHARSET_TYPE_128;
- break;
- case 2:
- type = CHARSET_TYPE_128X128;
- break;
- }
- break;
- case 256:
- switch (CHARSET_DIMENSION (cs))
- {
- case 1:
- type = CHARSET_TYPE_256;
- break;
- case 2:
- type = CHARSET_TYPE_256X256;
- break;
- }
- break;
-#endif
- }
-#ifndef UTF2000
- CHARSET_TYPE (cs) = type;
-#endif
-
#ifndef UTF2000
if (id == LEADING_BYTE_ASCII)
CHARSET_REP_BYTES (cs) = 1;
/* some charsets do not have final characters. This includes
ASCII, Control-1, Composite, and the two faux private
charsets. */
+ unsigned char iso2022_type
+ = (dimension == 1 ? 0 : 2) + (chars == 94 ? 0 : 1);
#if UTF2000
if (code_offset == 0)
{
- assert (NILP (chlook->charset_by_attributes[type][final]));
- chlook->charset_by_attributes[type][final] = obj;
+ assert (NILP (chlook->charset_by_attributes[iso2022_type][final]));
+ chlook->charset_by_attributes[iso2022_type][final] = obj;
}
#else
- assert (NILP (chlook->charset_by_attributes[type][final][direction]));
- chlook->charset_by_attributes[type][final][direction] = obj;
+ assert (NILP
+ (chlook->charset_by_attributes[iso2022_type][final][direction]));
+ chlook->charset_by_attributes[iso2022_type][final][direction] = obj;
#endif
}
return -1;
}
}
+ if (EQ (charset, Vcharset_mojikyo_2022_1)
+ && (MIN_CHAR_MOJIKYO < ch) && (ch < MIN_CHAR_MOJIKYO + 94 * 60 * 94))
+ {
+ int m = ch - MIN_CHAR_MOJIKYO - 1;
+ int byte1 = m / (94 * 60) + 33;
+ int byte2 = (m % (94 * 60)) / 94;
+ int byte3 = m % 94 + 33;
+
+ if (byte2 < 30)
+ byte2 += 16 + 32;
+ else
+ byte2 += 18 + 32;
+ return (byte1 << 16) | (byte2 << 8) | byte3;
+ }
return -1;
}
}
else if (c <= MAX_CHAR_94)
{
- *charset = CHARSET_BY_ATTRIBUTES (CHARSET_TYPE_94,
+ *charset = CHARSET_BY_ATTRIBUTES (94, 1,
((c - MIN_CHAR_94) / 94) + '0',
CHARSET_LEFT_TO_RIGHT);
if (!NILP (*charset))
}
else if (c <= MAX_CHAR_96)
{
- *charset = CHARSET_BY_ATTRIBUTES (CHARSET_TYPE_96,
+ *charset = CHARSET_BY_ATTRIBUTES (96, 1,
((c - MIN_CHAR_96) / 96) + '0',
CHARSET_LEFT_TO_RIGHT);
if (!NILP (*charset))
else if (c <= MAX_CHAR_94x94)
{
*charset
- = CHARSET_BY_ATTRIBUTES (CHARSET_TYPE_94X94,
+ = CHARSET_BY_ATTRIBUTES (94, 2,
((c - MIN_CHAR_94x94) / (94 * 94)) + '0',
CHARSET_LEFT_TO_RIGHT);
if (!NILP (*charset))
else if (c <= MAX_CHAR_96x96)
{
*charset
- = CHARSET_BY_ATTRIBUTES (CHARSET_TYPE_96X96,
+ = CHARSET_BY_ATTRIBUTES (96, 2,
((c - MIN_CHAR_96x96) / (96 * 96)) + '0',
CHARSET_LEFT_TO_RIGHT);
if (!NILP (*charset))
{
int id, dimension = 1, chars = 94, graphic = 0, final = 0, columns = -1;
int direction = CHARSET_LEFT_TO_RIGHT;
- int type;
Lisp_Object registry = Qnil;
Lisp_Object charset;
Lisp_Object rest, keyword, value;
("Final must be in the range 0x30 - 0x5F for dimension == 2",
make_char (final));
- if (dimension == 1)
- type = (chars == 94) ? CHARSET_TYPE_94 : CHARSET_TYPE_96;
- else
- type = (chars == 94) ? CHARSET_TYPE_94X94 : CHARSET_TYPE_96X96;
-
- if (!NILP (CHARSET_BY_ATTRIBUTES (type, final, CHARSET_LEFT_TO_RIGHT)) ||
- !NILP (CHARSET_BY_ATTRIBUTES (type, final, CHARSET_RIGHT_TO_LEFT)))
+ if (!NILP (CHARSET_BY_ATTRIBUTES (chars, dimension, final,
+ CHARSET_LEFT_TO_RIGHT)) ||
+ !NILP (CHARSET_BY_ATTRIBUTES (chars, dimension, final,
+ CHARSET_RIGHT_TO_LEFT)))
error
("Character set already defined for this DIMENSION/CHARS/FINAL combo");
(dimension, chars, final, direction))
{
int dm, ch, fi, di = -1;
- int type;
Lisp_Object obj = Qnil;
CHECK_INT (dimension);
signal_simple_error
("Final must be in the range 0x30 - 0x5F for dimension == 2", final);
- if (dm == 1)
- type = (ch == 94) ? CHARSET_TYPE_94 : CHARSET_TYPE_96;
- else
- type = (ch == 94) ? CHARSET_TYPE_94X94 : CHARSET_TYPE_96X96;
-
- if (di == -1)
+ if (di == -1)
{
- obj = CHARSET_BY_ATTRIBUTES (type, fi, CHARSET_LEFT_TO_RIGHT);
+ obj = CHARSET_BY_ATTRIBUTES (ch, dm, fi, CHARSET_LEFT_TO_RIGHT);
if (NILP (obj))
- obj = CHARSET_BY_ATTRIBUTES (type, fi, CHARSET_RIGHT_TO_LEFT);
+ obj = CHARSET_BY_ATTRIBUTES (ch, dm, fi, CHARSET_RIGHT_TO_LEFT);
}
else
- obj = CHARSET_BY_ATTRIBUTES (type, fi, di);
+ obj = CHARSET_BY_ATTRIBUTES (ch, dm, fi, di);
if (CHARSETP (obj))
return XCHARSET_NAME (obj);
syms_of_mule_charset (void)
{
#ifdef UTF2000
+ INIT_LRECORD_IMPLEMENTATION (uint8_byte_table);
+ INIT_LRECORD_IMPLEMENTATION (uint16_byte_table);
INIT_LRECORD_IMPLEMENTATION (byte_table);
INIT_LRECORD_IMPLEMENTATION (char_id_table);
#endif
DEFSUBR (Fset_charset_registry);
#ifdef UTF2000
DEFSUBR (Fchar_attribute_list);
+ DEFSUBR (Ffind_char_attribute_table);
DEFSUBR (Fchar_attribute_alist);
DEFSUBR (Fget_char_attribute);
DEFSUBR (Fput_char_attribute);
defsymbol (&Qvietnamese_viscii_upper, "vietnamese-viscii-upper");
defsymbol (&Qideograph_daikanwa, "ideograph-daikanwa");
defsymbol (&Qmojikyo, "mojikyo");
+ defsymbol (&Qmojikyo_2022_1, "mojikyo-2022-1");
defsymbol (&Qmojikyo_pj_1, "mojikyo-pj-1");
defsymbol (&Qmojikyo_pj_2, "mojikyo-pj-2");
defsymbol (&Qmojikyo_pj_3, "mojikyo-pj-3");
#endif
#ifdef UTF2000
- Vutf_2000_version = build_string("0.16 (Ōji)");
+ Vutf_2000_version = build_string("0.17 (Hōryūji)");
DEFVAR_LISP ("utf-2000-version", &Vutf_2000_version /*
Version number of UTF-2000.
*/ );
staticpro (&Vcharacter_composition_table);
- Vcharacter_composition_table = make_char_id_table (Qnil, -1);
+ Vcharacter_composition_table = make_char_id_table (Qnil);
staticpro (&Vcharacter_variant_table);
- Vcharacter_variant_table = make_char_id_table (Qnil, 0);
+ Vcharacter_variant_table = make_char_id_table (Qnil);
Vdefault_coded_charset_priority_list = Qnil;
DEFVAR_LISP ("default-coded-charset-priority-list",
build_string ("Konjaku-Mojikyo"),
build_string (""),
Qnil, MIN_CHAR_MOJIKYO, MAX_CHAR_MOJIKYO, 0, 0);
- staticpro (&Vcharset_mojikyo_pj_1);
- Vcharset_mojikyo_pj_1 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_1, Qmojikyo_pj_1, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-1"),
- build_string ("Mojikyo (pseudo JIS encoding) part 1"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 1"),
- build_string ("jisx0208\\.Mojikyo-1$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_2);
- Vcharset_mojikyo_pj_2 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_2, Qmojikyo_pj_2, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-2"),
- build_string ("Mojikyo (pseudo JIS encoding) part 2"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 2"),
- build_string ("jisx0208\\.Mojikyo-2$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_3);
- Vcharset_mojikyo_pj_3 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_3, Qmojikyo_pj_3, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-3"),
- build_string ("Mojikyo (pseudo JIS encoding) part 3"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 3"),
- build_string ("jisx0208\\.Mojikyo-3$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_4);
- Vcharset_mojikyo_pj_4 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_4, Qmojikyo_pj_4, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-4"),
- build_string ("Mojikyo (pseudo JIS encoding) part 4"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 4"),
- build_string ("jisx0208\\.Mojikyo-4$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_5);
- Vcharset_mojikyo_pj_5 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_5, Qmojikyo_pj_5, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-5"),
- build_string ("Mojikyo (pseudo JIS encoding) part 5"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 5"),
- build_string ("jisx0208\\.Mojikyo-5$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_6);
- Vcharset_mojikyo_pj_6 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_6, Qmojikyo_pj_6, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-6"),
- build_string ("Mojikyo (pseudo JIS encoding) part 6"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 6"),
- build_string ("jisx0208\\.Mojikyo-6$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_7);
- Vcharset_mojikyo_pj_7 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_7, Qmojikyo_pj_7, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-7"),
- build_string ("Mojikyo (pseudo JIS encoding) part 7"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 7"),
- build_string ("jisx0208\\.Mojikyo-7$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_8);
- Vcharset_mojikyo_pj_8 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_8, Qmojikyo_pj_8, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-8"),
- build_string ("Mojikyo (pseudo JIS encoding) part 8"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 8"),
- build_string ("jisx0208\\.Mojikyo-8$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_9);
- Vcharset_mojikyo_pj_9 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_9, Qmojikyo_pj_9, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-9"),
- build_string ("Mojikyo (pseudo JIS encoding) part 9"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 9"),
- build_string ("jisx0208\\.Mojikyo-9$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_10);
- Vcharset_mojikyo_pj_10 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_10, Qmojikyo_pj_10, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-10"),
- build_string ("Mojikyo (pseudo JIS encoding) part 10"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 10"),
- build_string ("jisx0208\\.Mojikyo-10$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_11);
- Vcharset_mojikyo_pj_11 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_11, Qmojikyo_pj_11, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-11"),
- build_string ("Mojikyo (pseudo JIS encoding) part 11"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 11"),
- build_string ("jisx0208\\.Mojikyo-11$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_12);
- Vcharset_mojikyo_pj_12 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_12, Qmojikyo_pj_12, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-12"),
- build_string ("Mojikyo (pseudo JIS encoding) part 12"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 12"),
- build_string ("jisx0208\\.Mojikyo-12$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_13);
- Vcharset_mojikyo_pj_13 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_13, Qmojikyo_pj_13, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-13"),
- build_string ("Mojikyo (pseudo JIS encoding) part 13"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 13"),
- build_string ("jisx0208\\.Mojikyo-13$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_14);
- Vcharset_mojikyo_pj_14 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_14, Qmojikyo_pj_14, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-14"),
- build_string ("Mojikyo (pseudo JIS encoding) part 14"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 14"),
- build_string ("jisx0208\\.Mojikyo-14$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_15);
- Vcharset_mojikyo_pj_15 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_15, Qmojikyo_pj_15, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-15"),
- build_string ("Mojikyo (pseudo JIS encoding) part 15"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 15"),
- build_string ("jisx0208\\.Mojikyo-15$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_16);
- Vcharset_mojikyo_pj_16 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_16, Qmojikyo_pj_16, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-16"),
- build_string ("Mojikyo (pseudo JIS encoding) part 16"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 16"),
- build_string ("jisx0208\\.Mojikyo-16$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_17);
- Vcharset_mojikyo_pj_17 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_17, Qmojikyo_pj_17, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-17"),
- build_string ("Mojikyo (pseudo JIS encoding) part 17"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 17"),
- build_string ("jisx0208\\.Mojikyo-17$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_18);
- Vcharset_mojikyo_pj_18 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_18, Qmojikyo_pj_18, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-18"),
- build_string ("Mojikyo (pseudo JIS encoding) part 18"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 18"),
- build_string ("jisx0208\\.Mojikyo-18$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_19);
- Vcharset_mojikyo_pj_19 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_19, Qmojikyo_pj_19, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-19"),
- build_string ("Mojikyo (pseudo JIS encoding) part 19"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 19"),
- build_string ("jisx0208\\.Mojikyo-19$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_20);
- Vcharset_mojikyo_pj_20 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_20, Qmojikyo_pj_20, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-20"),
- build_string ("Mojikyo (pseudo JIS encoding) part 20"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 20"),
- build_string ("jisx0208\\.Mojikyo-20$"),
+ staticpro (&Vcharset_mojikyo_2022_1);
+ Vcharset_mojikyo_2022_1 =
+ make_charset (LEADING_BYTE_MOJIKYO_2022_1, Qmojikyo_2022_1, 94, 3,
+ 2, 2, ':', CHARSET_LEFT_TO_RIGHT,
+ build_string ("Mojikyo-2022-1"),
+ build_string ("Mojikyo ISO-2022 Part 1"),
+ build_string ("Konjaku-Mojikyo for ISO/IEC 2022 Part 1"),
+ build_string (""),
Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_21);
- Vcharset_mojikyo_pj_21 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_21, Qmojikyo_pj_21, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-21"),
- build_string ("Mojikyo (pseudo JIS encoding) part 21"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 21"),
- build_string ("jisx0208\\.Mojikyo-21$"),
+
+#define DEF_MOJIKYO_PJ(n) \
+ staticpro (&Vcharset_mojikyo_pj_##n); \
+ Vcharset_mojikyo_pj_##n = \
+ make_charset (LEADING_BYTE_MOJIKYO_PJ_##n, Qmojikyo_pj_##n, 94, 2, \
+ 2, 0, 0, CHARSET_LEFT_TO_RIGHT, \
+ build_string ("Mojikyo-PJ-"#n), \
+ build_string ("Mojikyo (pseudo JIS encoding) part "#n), \
+ build_string \
+ ("Konjaku-Mojikyo (pseudo JIS encoding) part "#n), \
+ build_string \
+ ("\\(MojikyoPJ-"#n "\\|jisx0208\\.Mojikyo-"#n "\\)$"), \
Qnil, 0, 0, 0, 33);
+
+ DEF_MOJIKYO_PJ (1);
+ DEF_MOJIKYO_PJ (2);
+ DEF_MOJIKYO_PJ (3);
+ DEF_MOJIKYO_PJ (4);
+ DEF_MOJIKYO_PJ (5);
+ DEF_MOJIKYO_PJ (6);
+ DEF_MOJIKYO_PJ (7);
+ DEF_MOJIKYO_PJ (8);
+ DEF_MOJIKYO_PJ (9);
+ DEF_MOJIKYO_PJ (10);
+ DEF_MOJIKYO_PJ (11);
+ DEF_MOJIKYO_PJ (12);
+ DEF_MOJIKYO_PJ (13);
+ DEF_MOJIKYO_PJ (14);
+ DEF_MOJIKYO_PJ (15);
+ DEF_MOJIKYO_PJ (16);
+ DEF_MOJIKYO_PJ (17);
+ DEF_MOJIKYO_PJ (18);
+ DEF_MOJIKYO_PJ (19);
+ DEF_MOJIKYO_PJ (20);
+ DEF_MOJIKYO_PJ (21);
+
staticpro (&Vcharset_ethiopic_ucs);
Vcharset_ethiopic_ucs =
make_charset (LEADING_BYTE_ETHIOPIC_UCS, Qethiopic_ucs, 256, 2,
projects / chise / xemacs-chise.git / blobdiff