(Vchar_attribute_hash_table): New variable.
(Vcharacter_attribute_table): Deleted.
(Vcharacter_name_table): Deleted.
(put_char_attribute): Deleted.
(remove_char_attribute): Deleted.
(struct char_attribute_alist_closure): New structure.
(add_char_attribute_alist_mapper): New function.
(Fchar_attribute_alist): Use `Vchar_attribute_hash_table' instead of
`Vcharacter_attribute_table' and `Vcharacter_name_table'.
(Fget_char_attribute): Likewise.
(Fput_char_attribute): Likewise.
(Fremove_char_attribute): Use `Vchar_attribute_hash_table' instead of
`remove_char_attribute'.
(Fdefine_char): Return character.
(vars_of_mule_charset): Don't setup `Vcharacter_attribute_table' and
`Vcharacter_name_table'.
(complex_vars_of_mule_charset): Likewise `Vchar_attribute_hash_table'.

update.

(add_emchar_rune): Use `ASCII_TO_CHARC', `CHAR_TO_CHARC' and
`CHARC_CHARSET'.
(create_text_block): Use `CHARC_ASCII_EQ' and `CHARC_IS_SPACE'.
(generate_formatted_string_db): Use `CHARC_TO_CHAR'.
(create_string_text_block): Use `CHARC_ASCII_EQ' and `CHARC_IS_SPACE'.
(pixel_to_glyph_translation): Use `CHARC_ASCII_EQ'.

(separate_textual_runs): Use `CHARC_CHARSET' and `CHARC_CODE_POINT'.
(x_output_display_block): Use `CHARC_CHARSET' and `CHARC_ASCII_EQ'.

(tty_output_display_block): Use `CHARC_ASCII_EQ'.
(tty_output_display_block): Likewise; use `ASCII_TO_CHARC'.

(compare_runes): Use `CHARC_EQ'.

(find_charsets_in_charc_string): Use `CHARC_CHARSET_ID'.
(charc_string_displayed_columns): Use `CHARC_COLUMNS'.
(convert_bufbyte_string_into_charc_dynarr): Use `CHAR_TO_CHARC'.
(convert_charc_string_into_bufbyte_dynarr): Use `CHARC_TO_CHAR'.
(convert_charc_string_into_malloced_string): Likewise.

(CHARC_CHARSET): New macro.
(CHARC_CHARSET_ID): New macro.
(CHARC_CODE_POINT): New macro.
(CHARC_COLUMNS): New macro.
(CHARC_TO_CHAR): New inline function.
(CHARC_EQ): New inline function.
(CHARC_ASCII_EQ): New inline function.
(CHARC_IS_SPACE): New inline function.
(ASCII_TO_CHARC): New inline function.

(encode_char_2): Deleted.
(ENCODE_CHAR): Use `encode_char_1' again.
(breakup_char_1): Likewise.
(CHAR_TO_CHARC): New inline function.

(CHAR_TO_CHARC): New inline function.

update.

(x_output_toolbar_button): Use <Charc_dynarr *> instead of
<Emchar_dynarr *> for buf; use
`convert_bufbyte_string_into_charc_dynarr' instead of
`convert_bufbyte_string_into_emchar_dynarr'; use
`find_charsets_in_charc_string' instead of
`find_charsets_in_emchar_string'.

(Fx_store_cutbuffer_internal): Modify for UTF-2000.

- Include "character.h".
(struct rune): New member `cglyph'; delete member `chr'.

(redisplay_text_width_charc_string): New function; delete
`redisplay_text_width_emchar_string'.
(rtw_charc_dynarr): New variable; renamed from `rtw_emchar_dynarr'.
(redisplay_text_width_string): Use `rtw_charc_dynarr' instead of
`rtw_emchar_dynarr'; use `convert_bufbyte_string_into_charc_dynarr'
instead of `convert_bufbyte_string_into_emchar_dynarr'; use
`redisplay_text_width_charc_string' instead of
`redisplay_text_width_emchar_string'.
(redisplay_frame_text_width_string): Use `rtw_charc_dynarr' instead of
`rtw_emchar_dynarr'; use `convert_bufbyte_string_into_charc_dynarr'
instead of `convert_bufbyte_string_into_emchar_dynarr'.
(add_emchar_rune): Add <Charc> instead of <Emchar>; use
`redisplay_text_width_charc_string' instead of
`redisplay_text_width_emchar_string'.
(create_text_block): Modify for <struct rune> change.
(generate_formatted_string_db): Likewise.
(create_string_text_block): Likewise.
(pixel_to_glyph_translation): Likewise.

(separate_textual_runs): Use <const Charc *> instead of <const Emchar
*>.
(x_text_width): Likewise.
(x_output_display_block): Use <Charc_dynarr *> instead <Emchar_dynarr
*>; modify for <structure rune> change.
(x_output_string): Use <Charc_dynarr *> instead of <Emchar_dynarr *>.

(tty_text_width): Use <const Charc *> instead of <const Emchar *>; use
`charc_string_displayed_columns' instead of
`emchar_string_displayed_columns'.
(tty_output_display_block): Use <Charc_dynarr *> instead of
<Emchar_dynarr *> for buf; modify for <structure rune> change; use
`tty_output_charc_dynarr' instead of `tty_output_emchar_dynarr'.
(tty_output_charc_dynarr_dynarr): New variable; renamed from
`tty_output_emchar_dynarr_dynarr'.
(tty_output_charc_dynarr): New function; delete
`tty_output_charc_dynarr'.

(compare_runes): Modify for `struct rune'.
(redisplay_output_layout): Use <Charc_dynarr *> instead of
<Emchar_dynarr *> for buf; use
`convert_bufbyte_string_into_charc_dynarr' instead of
`convert_bufbyte_string_into_emchar_dynarr'.

(title_string_charc_dynarr): New variable; renamed from
`title_string_emchar_dynarr'.
(generate_title_string): Use `title_string_charc_dynarr' instead of
`title_string_emchar_dynarr'; use
`convert_charc_string_into_malloced_string' instead of
`convert_emchar_string_into_malloced_string'.
(init_frame): Use `title_string_charc_dynarr' instead of
`title_string_emchar_dynarr'.

- Include "character.h".
(struct console_methods): Use <const Charc *> instead of <const Emchar
*> in `text_width_method'; use <Charc_dynarr *> instead of
<Emchar_dynarr *> in output_string_method.

(x_output_string): Use <Charc_dynarr *> instead of <Emchar_dynarr *>.

(stream_text_width): Use <const Charc *> instead of <const Emchar *>.

(Charc_dynarr): New type.

(structure Charc): New structure; define new type `Charc'.

(DECODE_CHAR): New inline function.
(encode_char_1): New inline function.
(ENCODE_CHAR): New macro.
(structure Charc): New structure; define new type `Charc'.

(Vcharset_control_1): New macro.
(Vcharset_latin_iso8859_1): New macro.
(DECODE_CHAR): New inline function.
(encode_char_1): New inline function.
(ENCODE_CHAR): New macro.
(structure Charc): New structure; define new type `Charc'.

(find_charsets_in_charc_string): New function; delete
`find_charsets_in_emchar_string'.
(charc_string_displayed_columns): New function; delete
`emchar_string_displayed_columns'.
(convert_bufbyte_string_into_charc_dynarr): New function; delete
`convert_bufbyte_string_into_emchar_dynarr'.
(convert_charc_string_into_bufbyte_dynarr): New function; delete
`convert_charc_string_into_bufbyte_dynarr'.
(convert_charc_string_into_malloced_string): New function; delete
`convert_charc_string_into_malloced_string'.

(find_charsets_in_charc_string): New prototype; delete
`find_charsets_in_emchar_string'.
(charc_string_displayed_columns): New prototype; delete
`emchar_string_displayed_columns'.
(convert_charc_string_into_bufbyte_dynarr): New prototype; delete
`convert_charc_string_into_bufbyte_dynarr'.
(convert_charc_string_into_malloced_string): New prototype; delete
`convert_charc_string_into_malloced_string'.

update.

(get_non_ascii_char_table_value): Use <Charset_ID>.

Use <short> for <Charset_ID>.

Use <unsigned char> for <Charset_ID>.

Sync with r21-2-34.

This commit was manufactured by cvs2svn to create branch 'utf-2000'.

Initial revision

update.

Fix typo about `utf_2000_p'.

update.

(vars_of_mule_charset): Update `utf-2000-version' to 0.16.

update.

(Vcharacter_morohashi_daikanwa_table): New variable.
(Qmorohashi_daikanwa): New variable.
(Fchar_attribute_alist): Use `Vcharacter_morohashi_daikanwa_table' for
`morohashi-daikanwa' attribute.
(Fget_char_attribute): Likewise.
(Fput_char_attribute): Likewise.
(Fdefine_char): Don't setup `morohashi-daikanwa' attribute if it has
the same value of `ideograph-daikanwa'.
(syms_of_mule_charset): Add new symbol `morohashi-daikanwa'.
(vars_of_mule_charset): Setup `Vcharacter_morohashi_daikanwa_table'.

update.

(Fchar_attribute_alist): Add coded-charset attributes.
(add_charset_to_list_mapper): Add `key' instead of
`XCHARSET_NAME (value)' to return aliases.

update.

(insert-char-data): If an element of `->decomposition' property is a
character, print it as same as an integer.

update.

(Vcharacter_ideographic_radical_table): New variable.
(Vcharacter_ideographic_strokes_table): New variable.
(Qideographic_radical): New variable.
(Qideographic_strokes): New variable.
(Fchar_attribute_alist): Use `Vcharacter_ideographic_radical_table'
for `ideographic-radical' attribute; use
`Vcharacter_ideographic_strokes_table' for `ideographic-strokes'
attribute.
(Fget_char_attribute): Likewise.
(Fput_char_attribute): Likewise.
(syms_of_mule_charset): Add new symbol `ideographic-radical' and
`ideographic-strokes'.
(vars_of_mule_charset): Setup `Vcharacter_ideographic_radical_table'
and `Vcharacter_ideographic_strokes_table'.

update.

(Vcharacter_total_strokes_table): New variable.
(Qtotal_strokes): New variable.
(Fchar_attribute_alist): Use `Vcharacter_total_strokes_table' for
`total-strokes' attribute.
(Fget_char_attribute): Likewise.
(Fput_char_attribute): Likewise.
(syms_of_mule_charset): Add new symbol `total-strokes'.
(vars_of_mule_charset): Setup `Vcharacter_total_strokes_table'.

update.

(Vcharacter_decomposition_table): New variable.
(Fchar_attribute_alist): Add `name' and `->decomposition' if they are
found.
(Fget_char_attribute): Use `Vcharacter_decomposition_table' for
`->decomposition' attribute.
(Fput_char_attribute): Likewise.
(vars_of_mule_charset): Setup `Vcharacter_decomposition_table'.

update.

(decoding_table_check_elements): New function.
(Fset_charset_mapping_table): Use `decoding_table_check_elements'.

update.

(Fset_charset_mapping_table): Use `put_char_ccs_code_point'.

update.

(decoding_table_put_char): New inline function.
(put_char_ccs_code_point): Use `decoding_table_put_char'.

update.

(CHARSET_BYTE_SIZE): New inline function.
(XCHARSET_BYTE_SIZE): New macro.
(decoding_table_remove_char): New inline function.
(put_char_ccs_code_point): Use `XCHARSET_BYTE_SIZE'; use
`decoding_table_remove_char'.
(remove_char_ccs): Use `decoding_table_remove_char'.
(Fset_charset_mapping_table): Use `CHARSET_BYTE_SIZE'.

update.

(Vcharacter_name_table): New variable.
(Qname): New variable.
(Fget_char_attribute): Use `Vcharacter_name_table' for `name'
attribute.
(Fput_char_attribute): Use function `put_char_ccs_code_point'; use
`Vcharacter_name_table' for `name' attribute.
(Fremove_char_attribute): Use function `remove_char_ccs'.
(put_char_ccs_code_point): New function.
(remove_char_ccs): New function.
(syms_of_mule_charset): Add new symbol `name'.
(vars_of_mule_charset): Setup `Vcharacter_name_table'.

update.

(make_byte_table): Add new argument `older'.
(make_char_id_table): Likewise.
(copy_char_id_table): Comment out because it is not used.
(put_char_id_table): Modify for `make_byte_table'.
(Fput_char_attribute): Make encoding_table as older object; inherit
older bit of `Vcharacter_composition_table'.
(mark_charset): Don't mark `cs->encoding_table'.
(vars_of_mule_charset): Make `Vcharacter_attribute_table' as a normal
object; make `Vcharacter_composition_table' as an older object; delete
staticpro for `Vcharacter_composition_table'; make
`Vcharacter_variant_table' as a normal object.

(alloc_older_lcrecord): New function in UTF-2000.
(mark_object): Don't check older object in UTF-2000.

(struct lrecord_header): Add new member `older' in UTF-2000.
(set_lheader_implementation): Setup `SLI_header->older' in UTF-2000.
(set_lheader_older_implementation): New macro in UTF-2000.
(OLDER_RECORD_P): New macro in UTF-2000.
(OLDER_RECORD_HEADER_P): New macro in UTF-2000.
(alloc_older_lcrecord): New prototype in UTF-2000.
(alloc_older_lcrecord_type): New macro in UTF-2000.

update.

(default-coded-charset-priority-list): Delete `ucs'.

update.

(byte_table_description): Use `XD_LISP_OBJECT_ARRAY' instead of
`XD_LISP_OBJECT'.
(char_id_table_description): Delete bogus `, 1'.
(Fget_char_attribute): Refer encoding_table of each coded-charset to
get value of coded-charset attribute of a character.
(Fput_char_attribute): Use `make_older_vector' instead of
`make_vector'; use encoding_table of each coded-charset to store value
of coded-charset attribute of a character.
(Fremove_char_attribute): Use encoding_table of each coded-charset to
store value of coded-charset attribute of a character.
(mark_charset): Mark `cs->encoding_table'; don't mark
`cs->decoding_table'.
(charset_description): Add description of new member `encoding_table'.
(make_charset): Initialize `encoding_table'.

(struct Lisp_Charset): Add new member `encoding_table'.
(CHARSET_ENCODING_TABLE): New macro.
(XCHARSET_ENCODING_TABLE): New macro.
(charset_code_point): New implementation.
(encode_char_1): Likewise.

(all_older_lcrecords): New variable in UTF-2000.
(disksave_object_finalization_1): Call finalizers of
`all_older_lcrecords' in UTF-2000.
(make_older_vector): New function in UTF-2000.
(reinit_alloc_once_early): Initialize `all_older_lcrecords' in
UTF-2000.

(make_older_vector): New prototype in UTF-2000.

update.

(update-ideograph-radical-table): Ignore non `Ideograph' characters.

(insert-char-data): Change order for `script'.
(insert-char-data-with-variant): Add optional argument `script'.
(insert-char-range-data): Likewise.
(write-char-range-data-to-file): Likewise.

(BOPOMOFO LETTER K): Deleted.
(U+4E02): Add `->bopomofo-letter'.
(BOPOMOFO LETTER O): Deleted.
(M00004): Add `script', `->ucs' and `->bopomofo-letter'.
(M00005): Separate <BOPOMOFO LETTER E>.
(M00009): Separate <BOPOMOFO LETTER C>.

(BOPOMOFO LETTER K): Add script.
(BOPOMOFO LETTER C): Likewise.
(BOPOMOFO LETTER O): Likewise.
(BOPOMOFO LETTER E): Likewise.

update.

(insert-char-data): Support `insert-char-data'.

(BOPOMOFO LETTER K): Add `->ideograph' and `chinese-isoir165'; delete
`ideograph-daikanwa'.
(BOPOMOFO LETTER C): Likewise.
(BOPOMOFO LETTER O): Likewise.
(BOPOMOFO LETTER E): Likewise.
(BOPOMOFO LETTER U): Add `morohashi-daikanwa', `ideographic-radical',
`ideographic-strokes', `total-strokes'; use `->ideograph' instead of
`ideograph'.

update.

Sync with Emacs 20.6.90 to fix problem with latest binutils on Linux.

update.

(enum lrecord_type): Rename `lrecord_type_char_code_table' to
`lrecord_type_char_id_table'.

(COMPOSE_ADD_CHAR): Use `CHAR_ID_TABLE_P' and `get_char_id_table'
instead of `CHAR_CODE_TABLE_P' and `get_char_code_table'.

(mark_char_id_table): Renamed from `mark_char_code_table'.
(char_id_table_equal): Renamed from `char_code_table_equal'.
(char_id_table_hash): Renamed from `char_code_table_hash'.
(make_char_id_table): Renamed from `make_char_code_table'.
(copy_char_id_table): Renamed from `copy_char_code_table'.
(get_char_id_table): Renamed from `get_char_code_table'.
(put_char_id_table): Renamed from `put_char_code_table'.
(to_char_id): Renamed from `to_char_code'.

(struct Lisp_Char_ID_Table): Renamed from `Lisp_Char_Code_Table'.
(char_id_table): Renamed from `char_code_table'.
(XCHAR_ID_TABLE): Renamed from `XCHAR_CODE_TABLE'.
(XSETCHAR_ID_TABLE): Renamed from `XSETCHAR_CODE_TABLE'.
(CHAR_ID_TABLE_P): Renamed from `CHAR_CODE_TABLE_P'.
(GC_CHAR_ID_TABLE_P): Renamed from `GC_CHAR_CODE_TABLE_P'.
(get_char_id_table): Renamed from `get_char_code_table'.

update.

(enum lrecord_type): Rename `lrecord_type_char_byte_table' to
`lrecord_type_byte_table'.

(mark_byte_table): Renamed from `mark_char_byte_table'.
(byte_table_equal): Renamed from `char_byte_table_equal'.
(byte_table_hash): Renamed from `byte_table_hash'.
(make_byte_table): Renamed from `make_byte_table'.
(copy_byte_table): Renamed from `copy_char_byte_table'.

(struct Lisp_Byte_Table): Renamed from `Lisp_Char_Byte_Table'.
(byte_table): Renamed from `char_byte_table'.
(XBYTE_TABLE): Renamed from `XCHAR_BYTE_TABLE'.
(XSETBYTE_TABLE): Renamed from `XSET_CHAR_BYTE_TABLE'.
(BYTE_TABLE_P): Renamed from `XBYTE_TABLE_P'.
(GC_BYTE_TABLE_P): Renamed from `GC_CHAR_BYTE_TABLE_P'.

update.

Sync with r21-2-33 and r21-2-33-utf-2000.

This commit was generated by cvs2svn to compensate for changes in r1408,
which included commits to RCS files with non-trunk default branches.

XEmacs 21.2.33 "Melpomene".

This commit was manufactured by cvs2svn to create branch 'utf-2000'.

This commit was manufactured by cvs2svn to create branch 'XEmacs-21_4'.

Initial revision

XEmacs 21.2.32 "Kastor & Polydeukes".

This commit was generated by cvs2svn to compensate for changes in r1398,
which included commits to RCS files with non-trunk default branches.