Mercurial > hg > xemacs-beta
comparison src/mule-charset.c @ 4952:19a72041c5ed
Mule-izing, various fixes related to char * arguments
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_result_status):
* postgresql/postgresql.c (Fpq_res_status):
Mule-ize large parts of it.
2010-01-26 Ben Wing <ben@xemacs.org>
* ldap/eldap.c (print_ldap):
* ldap/eldap.c (allocate_ldap):
Use write_ascstring().
src/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (build_ascstring):
* alloc.c (build_msg_cistring):
* alloc.c (staticpro_1):
* alloc.c (staticpro_name):
* alloc.c (staticpro_nodump_1):
* alloc.c (staticpro_nodump_name):
* alloc.c (unstaticpro_nodump_1):
* alloc.c (mcpro_1):
* alloc.c (mcpro_name):
* alloc.c (object_memory_usage_stats):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_once_early):
* buffer.c (print_buffer):
* buffer.c (vars_of_buffer):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.c (init_initial_directory):
* bytecode.c (invalid_byte_code):
* bytecode.c (print_compiled_function):
* bytecode.c (mark_compiled_function):
* chartab.c (print_table_entry):
* chartab.c (print_char_table):
* config.h.in:
* console-gtk.c:
* console-gtk.c (gtk_device_to_console_connection):
* console-gtk.c (gtk_semi_canonicalize_console_connection):
* console-gtk.c (gtk_canonicalize_console_connection):
* console-gtk.c (gtk_semi_canonicalize_device_connection):
* console-gtk.c (gtk_canonicalize_device_connection):
* console-stream.c (stream_init_frame_1):
* console-stream.c (vars_of_console_stream):
* console-stream.c (init_console_stream):
* console-x.c (x_semi_canonicalize_console_connection):
* console-x.c (x_semi_canonicalize_device_connection):
* console-x.c (x_canonicalize_device_connection):
* console-x.h:
* data.c (eq_with_ebola_notice):
* data.c (Fsubr_interactive):
* data.c (Fnumber_to_string):
* data.c (digit_to_number):
* device-gtk.c (gtk_init_device):
* device-msw.c (print_devmode):
* device-x.c (x_event_name):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-msw.c (vars_of_dialog_mswindows):
* doc.c (weird_doc):
* doc.c (Fsnarf_documentation):
* doc.c (vars_of_doc):
* dumper.c (pdump):
* dynarr.c:
* dynarr.c (Dynarr_realloc):
* editfns.c (Fuser_real_login_name):
* editfns.c (get_home_directory):
* elhash.c (print_hash_table_data):
* elhash.c (print_hash_table):
* emacs.c (main_1):
* emacs.c (vars_of_emacs):
* emodules.c:
* emodules.c (_emodules_list):
* emodules.c (Fload_module):
* emodules.c (Funload_module):
* emodules.c (Flist_modules):
* emodules.c (find_make_module):
* emodules.c (attempt_module_delete):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_subr):
* emodules.c (emodules_doc_sym):
* emodules.c (syms_of_module):
* emodules.c (vars_of_module):
* emodules.h:
* eval.c (print_subr):
* eval.c (signal_call_debugger):
* eval.c (build_error_data):
* eval.c (signal_error):
* eval.c (maybe_signal_error):
* eval.c (signal_continuable_error):
* eval.c (maybe_signal_continuable_error):
* eval.c (signal_error_2):
* eval.c (maybe_signal_error_2):
* eval.c (signal_continuable_error_2):
* eval.c (maybe_signal_continuable_error_2):
* eval.c (signal_ferror):
* eval.c (maybe_signal_ferror):
* eval.c (signal_continuable_ferror):
* eval.c (maybe_signal_continuable_ferror):
* eval.c (signal_ferror_with_frob):
* eval.c (maybe_signal_ferror_with_frob):
* eval.c (signal_continuable_ferror_with_frob):
* eval.c (maybe_signal_continuable_ferror_with_frob):
* eval.c (syntax_error):
* eval.c (syntax_error_2):
* eval.c (maybe_syntax_error):
* eval.c (sferror):
* eval.c (sferror_2):
* eval.c (maybe_sferror):
* eval.c (invalid_argument):
* eval.c (invalid_argument_2):
* eval.c (maybe_invalid_argument):
* eval.c (invalid_constant):
* eval.c (invalid_constant_2):
* eval.c (maybe_invalid_constant):
* eval.c (invalid_operation):
* eval.c (invalid_operation_2):
* eval.c (maybe_invalid_operation):
* eval.c (invalid_change):
* eval.c (invalid_change_2):
* eval.c (maybe_invalid_change):
* eval.c (invalid_state):
* eval.c (invalid_state_2):
* eval.c (maybe_invalid_state):
* eval.c (wtaerror):
* eval.c (stack_overflow):
* eval.c (out_of_memory):
* eval.c (print_multiple_value):
* eval.c (issue_call_trapping_problems_warning):
* eval.c (backtrace_specials):
* eval.c (backtrace_unevalled_args):
* eval.c (Fbacktrace):
* eval.c (warn_when_safe):
* event-Xt.c (modwarn):
* event-Xt.c (modbarf):
* event-Xt.c (check_modifier):
* event-Xt.c (store_modifier):
* event-Xt.c (emacs_Xt_format_magic_event):
* event-Xt.c (describe_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (store_modifier):
* event-gtk.c (gtk_reset_modifier_mapping):
* event-msw.c (dde_eval_string):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (FROB):
* event-msw.c (emacs_mswindows_format_magic_event):
* event-stream.c (external_debugging_print_event):
* event-stream.c (execute_help_form):
* event-stream.c (vars_of_event_stream):
* events.c (print_event_1):
* events.c (print_event):
* events.c (event_equal):
* extents.c (print_extent_1):
* extents.c (print_extent):
* extents.c (vars_of_extents):
* faces.c (print_face):
* faces.c (complex_vars_of_faces):
* file-coding.c:
* file-coding.c (print_coding_system):
* file-coding.c (print_coding_system_in_print_method):
* file-coding.c (default_query_method):
* file-coding.c (find_coding_system):
* file-coding.c (make_coding_system_1):
* file-coding.c (chain_print):
* file-coding.c (undecided_print):
* file-coding.c (gzip_print):
* file-coding.c (vars_of_file_coding):
* file-coding.c (complex_vars_of_file_coding):
* fileio.c:
* fileio.c (report_file_type_error):
* fileio.c (report_error_with_errno):
* fileio.c (report_file_error):
* fileio.c (barf_or_query_if_file_exists):
* fileio.c (vars_of_fileio):
* floatfns.c (matherr):
* fns.c (print_bit_vector):
* fns.c (Fmapconcat):
* fns.c (add_suffix_to_symbol):
* fns.c (add_prefix_to_symbol):
* frame-gtk.c:
* frame-gtk.c (Fgtk_window_id):
* frame-x.c (def):
* frame-x.c (x_cde_transfer_callback):
* frame.c:
* frame.c (Fmake_frame):
* gc.c (show_gc_cursor_and_message):
* gc.c (vars_of_gc):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (gtk_print_image_instance):
* glyphs-msw.c (mswindows_print_image_instance):
* glyphs-x.c (x_print_image_instance):
* glyphs-x.c (update_widget_face):
* glyphs.c (make_string_from_file):
* glyphs.c (print_image_instance):
* glyphs.c (signal_image_error):
* glyphs.c (signal_image_error_2):
* glyphs.c (signal_double_image_error):
* glyphs.c (signal_double_image_error_2):
* glyphs.c (xbm_mask_file_munging):
* glyphs.c (pixmap_to_lisp_data):
* glyphs.h:
* gui.c (gui_item_display_flush_left):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* intl-win32.c:
* intl-win32.c (langcode_to_lang):
* intl-win32.c (sublangcode_to_lang):
* intl-win32.c (Fmswindows_get_locale_info):
* intl-win32.c (lcid_to_locale_mule_or_no):
* intl-win32.c (mswindows_multibyte_to_unicode_print):
* intl-win32.c (complex_vars_of_intl_win32):
* keymap.c:
* keymap.c (print_keymap):
* keymap.c (ensure_meta_prefix_char_keymapp):
* keymap.c (Fkey_description):
* keymap.c (Ftext_char_description):
* lisp.h:
* lisp.h (struct):
* lisp.h (DECLARE_INLINE_HEADER):
* lread.c (Fload_internal):
* lread.c (locate_file):
* lread.c (read_escape):
* lread.c (read_raw_string):
* lread.c (read1):
* lread.c (read_list):
* lread.c (read_compiled_function):
* lread.c (init_lread):
* lrecord.h:
* marker.c (print_marker):
* marker.c (marker_equal):
* menubar-msw.c (displayable_menu_item):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar.c (vars_of_menubar):
* minibuf.c (reinit_complex_vars_of_minibuf):
* minibuf.c (complex_vars_of_minibuf):
* mule-charset.c (Fmake_charset):
* mule-charset.c (complex_vars_of_mule_charset):
* mule-coding.c (iso2022_print):
* mule-coding.c (fixed_width_query):
* number.c (bignum_print):
* number.c (ratio_print):
* number.c (bigfloat_print):
* number.c (bigfloat_finalize):
* objects-msw.c:
* objects-msw.c (mswindows_color_to_string):
* objects-msw.c (mswindows_color_list):
* objects-tty.c:
* objects-tty.c (tty_font_list):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c (xft_find_charset_font):
* objects-xlike-inc.c (endif):
* print.c:
* print.c (write_istring):
* print.c (write_ascstring):
* print.c (Fterpri):
* print.c (Fprint):
* print.c (print_error_message):
* print.c (print_vector_internal):
* print.c (print_cons):
* print.c (print_string):
* print.c (printing_unreadable_object):
* print.c (print_internal):
* print.c (print_float):
* print.c (print_symbol):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_canonicalize_host_name):
* process.c (print_process):
* process.c (report_process_error):
* process.c (report_network_error):
* process.c (make_process_internal):
* process.c (Fstart_process_internal):
* process.c (status_message):
* process.c (putenv_internal):
* process.c (vars_of_process):
* process.h:
* profile.c (vars_of_profile):
* rangetab.c (print_range_table):
* realpath.c (vars_of_realpath):
* redisplay.c (vars_of_redisplay):
* search.c (wordify):
* search.c (Freplace_match):
* sheap.c (sheap_adjust_h):
* sound.c (report_sound_error):
* sound.c (Fplay_sound_file):
* specifier.c (print_specifier):
* symbols.c (Fsubr_name):
* symbols.c (do_symval_forwarding):
* symbols.c (set_default_buffer_slot_variable):
* symbols.c (set_default_console_slot_variable):
* symbols.c (store_symval_forwarding):
* symbols.c (default_value):
* symbols.c (defsymbol_massage_name_1):
* symbols.c (defsymbol_massage_name_nodump):
* symbols.c (defsymbol_massage_name):
* symbols.c (defsymbol_massage_multiword_predicate_nodump):
* symbols.c (defsymbol_massage_multiword_predicate):
* symbols.c (defsymbol_nodump):
* symbols.c (defsymbol):
* symbols.c (defkeyword):
* symbols.c (defkeyword_massage_name):
* symbols.c (check_module_subr):
* symbols.c (deferror_1):
* symbols.c (deferror):
* symbols.c (deferror_massage_name):
* symbols.c (deferror_massage_name_and_message):
* symbols.c (defvar_magic):
* symeval.h:
* symeval.h (DEFVAR_SYMVAL_FWD):
* sysdep.c:
* sysdep.c (init_system_name):
* sysdll.c:
* sysdll.c (MAYBE_PREPEND_UNDERSCORE):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* sysdll.c (dll_close):
* sysdll.c (image_for_address):
* sysdll.c (my_find_image):
* sysdll.c (search_linked_libs):
* sysdll.h:
* sysfile.h:
* sysfile.h (DEFAULT_DIRECTORY_FALLBACK):
* syswindows.h:
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (Ftest_hash_tables):
* text.c (vars_of_text):
* text.h:
* tooltalk.c (tt_opnum_string):
* tooltalk.c (tt_message_arg_ival_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* tooltalk.c (vars_of_tooltalk):
* ui-gtk.c (Fdll_load):
* ui-gtk.c (type_to_marshaller_type):
* ui-gtk.c (Fgtk_import_function_internal):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* unicode.c (unicode_to_ichar):
* unicode.c (unicode_print):
* unicode.c (unicode_query):
* unicode.c (vars_of_unicode):
* unicode.c (complex_vars_of_unicode):
* win32.c:
* win32.c (mswindows_report_process_error):
* window.c (print_window):
* xemacs.def.in.in:
BASIC IDEA: Further fixing up uses of char * and CIbyte *
to reflect their actual semantics; Mule-izing some code;
redoing of the not-yet-working code to handle message translation.
Clean up code to handle message-translation (not yet working).
Create separate versions of build_msg_string() for working with
Ibyte *, CIbyte *, and Ascbyte * arguments. Assert that Ascbyte *
arguments are pure-ASCII. Make build_msg_string() be the same
as build_msg_ascstring(). Create same three versions of GETTEXT()
and DEFER_GETTEXT(). Also create build_defer_string() and
variants for the equivalent of DEFER_GETTEXT() when building a
string. Remove old CGETTEXT(). Clean up code where GETTEXT(),
DEFER_GETTEXT(), build_msg_string(), etc. was being called and
introduce some new calls to build_msg_string(), etc. Remove
GETTEXT() from calls to weird_doc() -- we assume that the
message snarfer knows about weird_doc(). Remove uses of
DEFER_GETTEXT() from error messages in sysdep.c and instead use
special comments /* @@@begin-snarf@@@ */ and /* @@@end-snarf@@@ */
that the message snarfer presumably knows about.
Create build_ascstring() and use it in many instances in place
of build_string(). The purpose of having Ascbyte * variants is
to make the code more self-documenting in terms of what sort of
semantics is expected for char * strings. In fact in the process
of looking for uses of build_string(), much improperly Mule-ized
was discovered.
Mule-ize a lot of code as described in previous paragraph,
e.g. in sysdep.c.
Make the error functions take Ascbyte * strings and fix up a
couple of places where non-pure-ASCII strings were being passed in
(file-coding.c, mule-coding.c, unicode.c). (It's debatable whether
we really need to make the error functions work this way. It
helps catch places where code is written in a way that message
translation won't work, but we may well never implement message
translation.)
Make staticpro() and friends take Ascbyte * strings instead of
raw char * strings. Create a const_Ascbyte_ptr dynarr type
to describe what's held by staticpro_names[] and friends,
create pdump descriptions for const_Ascbyte_ptr dynarrs, and
use them in place of specially-crafted staticpro descriptions.
Mule-ize certain other functions (e.g. x_event_name) by correcting
raw use of char * to Ascbyte *, Rawbyte * or another such type,
and raw use of char[] buffers to another type (usually Ascbyte[]).
Change many uses of write_c_string() to write_msg_string(),
write_ascstring(), etc.
Mule-ize emodules.c, emodules.h, sysdll.h.
Fix some un-Mule-ized code in intl-win32.c.
A comment in event-Xt.c and the limitations of the message
snarfer (make-msgfile or whatever) is presumably incorrect --
it should be smart enough to handle function calls spread over
more than one line. Clean up code in event-Xt.c that was
written awkwardly for this reason.
In config.h.in, instead of NEED_ERROR_CHECK_TYPES_INLINES,
create a more general XEMACS_DEFS_NEEDS_INLINE_DECLS to
indicate when inlined functions need to be declared in
xemacs.defs.in.in, and make use of it in xemacs.defs.in.in.
We need to do this because postgresql.c now calls qxestrdup(),
which is an inline function.
Make nconc2() and other such functions MODULE_API and put
them in xemacs.defs.in.in since postgresql.c now uses them.
Clean up indentation in lread.c and a few other places.
In text.h, document ASSERT_ASCTEXT_ASCII() and
ASSERT_ASCTEXT_ASCII_LEN(), group together the stand-in
encodings and add some more for DLL symbols, function and
variable names, etc.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Tue, 26 Jan 2010 23:22:30 -0600 |
| parents | a98ca4640147 |
| children | 304aebb79cd3 |
comparison
equal
deleted
inserted
replaced
| 4951:de60897044f4 | 4952:19a72041c5ed |
|---|---|
| 626 | 626 |
| 627 qxesprintf (tempname, "___temporary___%d__", id); | 627 qxesprintf (tempname, "___temporary___%d__", id); |
| 628 name = Fmake_symbol (build_intstring (tempname)); /* Uninterned. */ | 628 name = Fmake_symbol (build_intstring (tempname)); /* Uninterned. */ |
| 629 } | 629 } |
| 630 if (NILP (doc_string)) | 630 if (NILP (doc_string)) |
| 631 doc_string = build_string (""); | 631 doc_string = build_ascstring (""); |
| 632 if (NILP (registries)) | 632 if (NILP (registries)) |
| 633 registries = make_vector(0, Qnil); | 633 registries = make_vector(0, Qnil); |
| 634 if (NILP (short_name)) | 634 if (NILP (short_name)) |
| 635 short_name = XSYMBOL (name)->name; | 635 short_name = XSYMBOL (name)->name; |
| 636 if (NILP (long_name)) | 636 if (NILP (long_name)) |
| 1158 staticpro (&Vcharset_ascii); | 1158 staticpro (&Vcharset_ascii); |
| 1159 Vcharset_ascii = | 1159 Vcharset_ascii = |
| 1160 make_charset (LEADING_BYTE_ASCII, Qascii, 1, | 1160 make_charset (LEADING_BYTE_ASCII, Qascii, 1, |
| 1161 CHARSET_TYPE_94, 1, 0, 'B', | 1161 CHARSET_TYPE_94, 1, 0, 'B', |
| 1162 CHARSET_LEFT_TO_RIGHT, | 1162 CHARSET_LEFT_TO_RIGHT, |
| 1163 build_string ("ASCII"), | 1163 build_ascstring ("ASCII"), |
| 1164 build_msg_string ("ASCII"), | 1164 build_defer_string ("ASCII"), |
| 1165 build_msg_string ("ASCII (ISO646 IRV)"), | 1165 build_defer_string ("ASCII (ISO646 IRV)"), |
| 1166 vector1(build_string("iso8859-1")), 0, 0); | 1166 vector1(build_ascstring("iso8859-1")), 0, 0); |
| 1167 staticpro (&Vcharset_control_1); | 1167 staticpro (&Vcharset_control_1); |
| 1168 Vcharset_control_1 = | 1168 Vcharset_control_1 = |
| 1169 make_charset (LEADING_BYTE_CONTROL_1, Qcontrol_1, 2, | 1169 make_charset (LEADING_BYTE_CONTROL_1, Qcontrol_1, 2, |
| 1170 CHARSET_TYPE_94, 1, 1, 0, | 1170 CHARSET_TYPE_94, 1, 1, 0, |
| 1171 CHARSET_LEFT_TO_RIGHT, | 1171 CHARSET_LEFT_TO_RIGHT, |
| 1172 build_string ("C1"), | 1172 build_ascstring ("C1"), |
| 1173 build_msg_string ("Control characters"), | 1173 build_defer_string ("Control characters"), |
| 1174 build_msg_string ("Control characters 128-191"), | 1174 build_defer_string ("Control characters 128-191"), |
| 1175 vector1(build_string("iso8859-1")), 0, 0); | 1175 vector1(build_ascstring("iso8859-1")), 0, 0); |
| 1176 staticpro (&Vcharset_latin_iso8859_1); | 1176 staticpro (&Vcharset_latin_iso8859_1); |
| 1177 Vcharset_latin_iso8859_1 = | 1177 Vcharset_latin_iso8859_1 = |
| 1178 make_charset (LEADING_BYTE_LATIN_ISO8859_1, Qlatin_iso8859_1, 2, | 1178 make_charset (LEADING_BYTE_LATIN_ISO8859_1, Qlatin_iso8859_1, 2, |
| 1179 CHARSET_TYPE_96, 1, 1, 'A', | 1179 CHARSET_TYPE_96, 1, 1, 'A', |
| 1180 CHARSET_LEFT_TO_RIGHT, | 1180 CHARSET_LEFT_TO_RIGHT, |
| 1181 build_string ("Latin-1"), | 1181 build_ascstring ("Latin-1"), |
| 1182 build_msg_string ("ISO8859-1 (Latin-1)"), | 1182 build_defer_string ("ISO8859-1 (Latin-1)"), |
| 1183 build_msg_string ("ISO8859-1 (Latin-1)"), | 1183 build_defer_string ("ISO8859-1 (Latin-1)"), |
| 1184 vector1(build_string("iso8859-1")), 0, 0); | 1184 vector1(build_ascstring("iso8859-1")), 0, 0); |
| 1185 staticpro (&Vcharset_latin_iso8859_2); | 1185 staticpro (&Vcharset_latin_iso8859_2); |
| 1186 Vcharset_latin_iso8859_2 = | 1186 Vcharset_latin_iso8859_2 = |
| 1187 make_charset (LEADING_BYTE_LATIN_ISO8859_2, Qlatin_iso8859_2, 2, | 1187 make_charset (LEADING_BYTE_LATIN_ISO8859_2, Qlatin_iso8859_2, 2, |
| 1188 CHARSET_TYPE_96, 1, 1, 'B', | 1188 CHARSET_TYPE_96, 1, 1, 'B', |
| 1189 CHARSET_LEFT_TO_RIGHT, | 1189 CHARSET_LEFT_TO_RIGHT, |
| 1190 build_string ("Latin-2"), | 1190 build_ascstring ("Latin-2"), |
| 1191 build_msg_string ("ISO8859-2 (Latin-2)"), | 1191 build_defer_string ("ISO8859-2 (Latin-2)"), |
| 1192 build_msg_string ("ISO8859-2 (Latin-2)"), | 1192 build_defer_string ("ISO8859-2 (Latin-2)"), |
| 1193 vector1(build_string("iso8859-2")), 0, 0); | 1193 vector1(build_ascstring("iso8859-2")), 0, 0); |
| 1194 staticpro (&Vcharset_latin_iso8859_3); | 1194 staticpro (&Vcharset_latin_iso8859_3); |
| 1195 Vcharset_latin_iso8859_3 = | 1195 Vcharset_latin_iso8859_3 = |
| 1196 make_charset (LEADING_BYTE_LATIN_ISO8859_3, Qlatin_iso8859_3, 2, | 1196 make_charset (LEADING_BYTE_LATIN_ISO8859_3, Qlatin_iso8859_3, 2, |
| 1197 CHARSET_TYPE_96, 1, 1, 'C', | 1197 CHARSET_TYPE_96, 1, 1, 'C', |
| 1198 CHARSET_LEFT_TO_RIGHT, | 1198 CHARSET_LEFT_TO_RIGHT, |
| 1199 build_string ("Latin-3"), | 1199 build_ascstring ("Latin-3"), |
| 1200 build_msg_string ("ISO8859-3 (Latin-3)"), | 1200 build_defer_string ("ISO8859-3 (Latin-3)"), |
| 1201 build_msg_string ("ISO8859-3 (Latin-3)"), | 1201 build_defer_string ("ISO8859-3 (Latin-3)"), |
| 1202 vector1(build_string("iso8859-3")), 0, 0); | 1202 vector1(build_ascstring("iso8859-3")), 0, 0); |
| 1203 staticpro (&Vcharset_latin_iso8859_4); | 1203 staticpro (&Vcharset_latin_iso8859_4); |
| 1204 Vcharset_latin_iso8859_4 = | 1204 Vcharset_latin_iso8859_4 = |
| 1205 make_charset (LEADING_BYTE_LATIN_ISO8859_4, Qlatin_iso8859_4, 2, | 1205 make_charset (LEADING_BYTE_LATIN_ISO8859_4, Qlatin_iso8859_4, 2, |
| 1206 CHARSET_TYPE_96, 1, 1, 'D', | 1206 CHARSET_TYPE_96, 1, 1, 'D', |
| 1207 CHARSET_LEFT_TO_RIGHT, | 1207 CHARSET_LEFT_TO_RIGHT, |
| 1208 build_string ("Latin-4"), | 1208 build_ascstring ("Latin-4"), |
| 1209 build_msg_string ("ISO8859-4 (Latin-4)"), | 1209 build_defer_string ("ISO8859-4 (Latin-4)"), |
| 1210 build_msg_string ("ISO8859-4 (Latin-4)"), | 1210 build_defer_string ("ISO8859-4 (Latin-4)"), |
| 1211 vector1(build_string("iso8859-4")), 0, 0); | 1211 vector1(build_ascstring("iso8859-4")), 0, 0); |
| 1212 staticpro (&Vcharset_thai_tis620); | 1212 staticpro (&Vcharset_thai_tis620); |
| 1213 Vcharset_thai_tis620 = | 1213 Vcharset_thai_tis620 = |
| 1214 make_charset (LEADING_BYTE_THAI_TIS620, Qthai_tis620, 2, | 1214 make_charset (LEADING_BYTE_THAI_TIS620, Qthai_tis620, 2, |
| 1215 CHARSET_TYPE_96, 1, 1, 'T', | 1215 CHARSET_TYPE_96, 1, 1, 'T', |
| 1216 CHARSET_LEFT_TO_RIGHT, | 1216 CHARSET_LEFT_TO_RIGHT, |
| 1217 build_string ("TIS620"), | 1217 build_ascstring ("TIS620"), |
| 1218 build_msg_string ("TIS620 (Thai)"), | 1218 build_defer_string ("TIS620 (Thai)"), |
| 1219 build_msg_string ("TIS620.2529 (Thai)"), | 1219 build_defer_string ("TIS620.2529 (Thai)"), |
| 1220 vector1(build_string("tis620.2529-1")), 0, 0); | 1220 vector1(build_ascstring("tis620.2529-1")), 0, 0); |
| 1221 staticpro (&Vcharset_greek_iso8859_7); | 1221 staticpro (&Vcharset_greek_iso8859_7); |
| 1222 Vcharset_greek_iso8859_7 = | 1222 Vcharset_greek_iso8859_7 = |
| 1223 make_charset (LEADING_BYTE_GREEK_ISO8859_7, Qgreek_iso8859_7, 2, | 1223 make_charset (LEADING_BYTE_GREEK_ISO8859_7, Qgreek_iso8859_7, 2, |
| 1224 CHARSET_TYPE_96, 1, 1, 'F', | 1224 CHARSET_TYPE_96, 1, 1, 'F', |
| 1225 CHARSET_LEFT_TO_RIGHT, | 1225 CHARSET_LEFT_TO_RIGHT, |
| 1226 build_string ("ISO8859-7"), | 1226 build_ascstring ("ISO8859-7"), |
| 1227 build_msg_string ("ISO8859-7 (Greek)"), | 1227 build_defer_string ("ISO8859-7 (Greek)"), |
| 1228 build_msg_string ("ISO8859-7 (Greek)"), | 1228 build_defer_string ("ISO8859-7 (Greek)"), |
| 1229 vector1(build_string("iso8859-7")), 0, 0); | 1229 vector1(build_ascstring("iso8859-7")), 0, 0); |
| 1230 staticpro (&Vcharset_arabic_iso8859_6); | 1230 staticpro (&Vcharset_arabic_iso8859_6); |
| 1231 Vcharset_arabic_iso8859_6 = | 1231 Vcharset_arabic_iso8859_6 = |
| 1232 make_charset (LEADING_BYTE_ARABIC_ISO8859_6, Qarabic_iso8859_6, 2, | 1232 make_charset (LEADING_BYTE_ARABIC_ISO8859_6, Qarabic_iso8859_6, 2, |
| 1233 CHARSET_TYPE_96, 1, 1, 'G', | 1233 CHARSET_TYPE_96, 1, 1, 'G', |
| 1234 CHARSET_RIGHT_TO_LEFT, | 1234 CHARSET_RIGHT_TO_LEFT, |
| 1235 build_string ("ISO8859-6"), | 1235 build_ascstring ("ISO8859-6"), |
| 1236 build_msg_string ("ISO8859-6 (Arabic)"), | 1236 build_defer_string ("ISO8859-6 (Arabic)"), |
| 1237 build_msg_string ("ISO8859-6 (Arabic)"), | 1237 build_defer_string ("ISO8859-6 (Arabic)"), |
| 1238 vector1(build_string ("iso8859-6")), 0, 0); | 1238 vector1(build_ascstring ("iso8859-6")), 0, 0); |
| 1239 staticpro (&Vcharset_hebrew_iso8859_8); | 1239 staticpro (&Vcharset_hebrew_iso8859_8); |
| 1240 Vcharset_hebrew_iso8859_8 = | 1240 Vcharset_hebrew_iso8859_8 = |
| 1241 make_charset (LEADING_BYTE_HEBREW_ISO8859_8, Qhebrew_iso8859_8, 2, | 1241 make_charset (LEADING_BYTE_HEBREW_ISO8859_8, Qhebrew_iso8859_8, 2, |
| 1242 CHARSET_TYPE_96, 1, 1, 'H', | 1242 CHARSET_TYPE_96, 1, 1, 'H', |
| 1243 CHARSET_RIGHT_TO_LEFT, | 1243 CHARSET_RIGHT_TO_LEFT, |
| 1244 build_string ("ISO8859-8"), | 1244 build_ascstring ("ISO8859-8"), |
| 1245 build_msg_string ("ISO8859-8 (Hebrew)"), | 1245 build_defer_string ("ISO8859-8 (Hebrew)"), |
| 1246 build_msg_string ("ISO8859-8 (Hebrew)"), | 1246 build_defer_string ("ISO8859-8 (Hebrew)"), |
| 1247 vector1(build_string ("iso8859-8")), 0, 0); | 1247 vector1(build_ascstring ("iso8859-8")), 0, 0); |
| 1248 staticpro (&Vcharset_katakana_jisx0201); | 1248 staticpro (&Vcharset_katakana_jisx0201); |
| 1249 Vcharset_katakana_jisx0201 = | 1249 Vcharset_katakana_jisx0201 = |
| 1250 make_charset (LEADING_BYTE_KATAKANA_JISX0201, Qkatakana_jisx0201, 2, | 1250 make_charset (LEADING_BYTE_KATAKANA_JISX0201, Qkatakana_jisx0201, 2, |
| 1251 CHARSET_TYPE_94, 1, 1, 'I', | 1251 CHARSET_TYPE_94, 1, 1, 'I', |
| 1252 CHARSET_LEFT_TO_RIGHT, | 1252 CHARSET_LEFT_TO_RIGHT, |
| 1253 build_string ("JISX0201 Kana"), | 1253 build_ascstring ("JISX0201 Kana"), |
| 1254 build_msg_string ("JISX0201.1976 (Japanese Kana)"), | 1254 build_defer_string ("JISX0201.1976 (Japanese Kana)"), |
| 1255 build_msg_string ("JISX0201.1976 Japanese Kana"), | 1255 build_defer_string ("JISX0201.1976 Japanese Kana"), |
| 1256 vector1(build_string ("jisx0201.1976-0")), 0, 0); | 1256 vector1(build_ascstring ("jisx0201.1976-0")), 0, 0); |
| 1257 staticpro (&Vcharset_latin_jisx0201); | 1257 staticpro (&Vcharset_latin_jisx0201); |
| 1258 Vcharset_latin_jisx0201 = | 1258 Vcharset_latin_jisx0201 = |
| 1259 make_charset (LEADING_BYTE_LATIN_JISX0201, Qlatin_jisx0201, 2, | 1259 make_charset (LEADING_BYTE_LATIN_JISX0201, Qlatin_jisx0201, 2, |
| 1260 CHARSET_TYPE_94, 1, 0, 'J', | 1260 CHARSET_TYPE_94, 1, 0, 'J', |
| 1261 CHARSET_LEFT_TO_RIGHT, | 1261 CHARSET_LEFT_TO_RIGHT, |
| 1262 build_string ("JISX0201 Roman"), | 1262 build_ascstring ("JISX0201 Roman"), |
| 1263 build_msg_string ("JISX0201.1976 (Japanese Roman)"), | 1263 build_defer_string ("JISX0201.1976 (Japanese Roman)"), |
| 1264 build_msg_string ("JISX0201.1976 Japanese Roman"), | 1264 build_defer_string ("JISX0201.1976 Japanese Roman"), |
| 1265 vector1(build_string ("jisx0201.1976-0")), 0, 0); | 1265 vector1(build_ascstring ("jisx0201.1976-0")), 0, 0); |
| 1266 staticpro (&Vcharset_cyrillic_iso8859_5); | 1266 staticpro (&Vcharset_cyrillic_iso8859_5); |
| 1267 Vcharset_cyrillic_iso8859_5 = | 1267 Vcharset_cyrillic_iso8859_5 = |
| 1268 make_charset (LEADING_BYTE_CYRILLIC_ISO8859_5, Qcyrillic_iso8859_5, 2, | 1268 make_charset (LEADING_BYTE_CYRILLIC_ISO8859_5, Qcyrillic_iso8859_5, 2, |
| 1269 CHARSET_TYPE_96, 1, 1, 'L', | 1269 CHARSET_TYPE_96, 1, 1, 'L', |
| 1270 CHARSET_LEFT_TO_RIGHT, | 1270 CHARSET_LEFT_TO_RIGHT, |
| 1271 build_string ("ISO8859-5"), | 1271 build_ascstring ("ISO8859-5"), |
| 1272 build_msg_string ("ISO8859-5 (Cyrillic)"), | 1272 build_defer_string ("ISO8859-5 (Cyrillic)"), |
| 1273 build_msg_string ("ISO8859-5 (Cyrillic)"), | 1273 build_defer_string ("ISO8859-5 (Cyrillic)"), |
| 1274 vector1(build_string ("iso8859-5")), 0, 0); | 1274 vector1(build_ascstring ("iso8859-5")), 0, 0); |
| 1275 staticpro (&Vcharset_latin_iso8859_9); | 1275 staticpro (&Vcharset_latin_iso8859_9); |
| 1276 Vcharset_latin_iso8859_9 = | 1276 Vcharset_latin_iso8859_9 = |
| 1277 make_charset (LEADING_BYTE_LATIN_ISO8859_9, Qlatin_iso8859_9, 2, | 1277 make_charset (LEADING_BYTE_LATIN_ISO8859_9, Qlatin_iso8859_9, 2, |
| 1278 CHARSET_TYPE_96, 1, 1, 'M', | 1278 CHARSET_TYPE_96, 1, 1, 'M', |
| 1279 CHARSET_LEFT_TO_RIGHT, | 1279 CHARSET_LEFT_TO_RIGHT, |
| 1280 build_string ("Latin-5"), | 1280 build_ascstring ("Latin-5"), |
| 1281 build_msg_string ("ISO8859-9 (Latin-5)"), | 1281 build_defer_string ("ISO8859-9 (Latin-5)"), |
| 1282 build_msg_string ("ISO8859-9 (Latin-5)"), | 1282 build_defer_string ("ISO8859-9 (Latin-5)"), |
| 1283 vector1(build_string ("iso8859-9")), 0, 0); | 1283 vector1(build_ascstring ("iso8859-9")), 0, 0); |
| 1284 staticpro (&Vcharset_latin_iso8859_15); | 1284 staticpro (&Vcharset_latin_iso8859_15); |
| 1285 Vcharset_latin_iso8859_15 = | 1285 Vcharset_latin_iso8859_15 = |
| 1286 make_charset (LEADING_BYTE_LATIN_ISO8859_15, Qlatin_iso8859_15, 2, | 1286 make_charset (LEADING_BYTE_LATIN_ISO8859_15, Qlatin_iso8859_15, 2, |
| 1287 CHARSET_TYPE_96, 1, 1, 'b', | 1287 CHARSET_TYPE_96, 1, 1, 'b', |
| 1288 CHARSET_LEFT_TO_RIGHT, | 1288 CHARSET_LEFT_TO_RIGHT, |
| 1289 build_string ("Latin-9"), | 1289 build_ascstring ("Latin-9"), |
| 1290 build_msg_string ("ISO8859-15 (Latin-9)"), | 1290 build_defer_string ("ISO8859-15 (Latin-9)"), |
| 1291 build_msg_string ("ISO8859-15 (Latin-9)"), | 1291 build_defer_string ("ISO8859-15 (Latin-9)"), |
| 1292 vector1(build_string ("iso8859-15")), 0, 0); | 1292 vector1(build_ascstring ("iso8859-15")), 0, 0); |
| 1293 staticpro (&Vcharset_japanese_jisx0208_1978); | 1293 staticpro (&Vcharset_japanese_jisx0208_1978); |
| 1294 Vcharset_japanese_jisx0208_1978 = | 1294 Vcharset_japanese_jisx0208_1978 = |
| 1295 make_charset (LEADING_BYTE_JAPANESE_JISX0208_1978, Qjapanese_jisx0208_1978, 3, | 1295 make_charset (LEADING_BYTE_JAPANESE_JISX0208_1978, Qjapanese_jisx0208_1978, 3, |
| 1296 CHARSET_TYPE_94X94, 2, 0, '@', | 1296 CHARSET_TYPE_94X94, 2, 0, '@', |
| 1297 CHARSET_LEFT_TO_RIGHT, | 1297 CHARSET_LEFT_TO_RIGHT, |
| 1298 build_string ("JISX0208.1978"), | 1298 build_ascstring ("JISX0208.1978"), |
| 1299 build_msg_string ("JISX0208.1978 (Japanese)"), | 1299 build_defer_string ("JISX0208.1978 (Japanese)"), |
| 1300 build_msg_string | 1300 build_defer_string |
| 1301 ("JISX0208.1978 Japanese Kanji (so called \"old JIS\")"), | 1301 ("JISX0208.1978 Japanese Kanji (so called \"old JIS\")"), |
| 1302 vector2(build_string("jisx0208.1978-0"), | 1302 vector2(build_ascstring("jisx0208.1978-0"), |
| 1303 build_string("jisc6226.1978-0")), 0, 0); | 1303 build_ascstring("jisc6226.1978-0")), 0, 0); |
| 1304 staticpro (&Vcharset_chinese_gb2312); | 1304 staticpro (&Vcharset_chinese_gb2312); |
| 1305 Vcharset_chinese_gb2312 = | 1305 Vcharset_chinese_gb2312 = |
| 1306 make_charset (LEADING_BYTE_CHINESE_GB2312, Qchinese_gb2312, 3, | 1306 make_charset (LEADING_BYTE_CHINESE_GB2312, Qchinese_gb2312, 3, |
| 1307 CHARSET_TYPE_94X94, 2, 0, 'A', | 1307 CHARSET_TYPE_94X94, 2, 0, 'A', |
| 1308 CHARSET_LEFT_TO_RIGHT, | 1308 CHARSET_LEFT_TO_RIGHT, |
| 1309 build_string ("GB2312"), | 1309 build_ascstring ("GB2312"), |
| 1310 build_msg_string ("GB2312)"), | 1310 build_defer_string ("GB2312)"), |
| 1311 build_msg_string ("GB2312 Chinese simplified"), | 1311 build_defer_string ("GB2312 Chinese simplified"), |
| 1312 vector2(build_string("gb2312.1980-0"), | 1312 vector2(build_ascstring("gb2312.1980-0"), |
| 1313 build_string("gb2312.80&gb8565.88-0")), 0, 0); | 1313 build_ascstring("gb2312.80&gb8565.88-0")), 0, 0); |
| 1314 staticpro (&Vcharset_japanese_jisx0208); | 1314 staticpro (&Vcharset_japanese_jisx0208); |
| 1315 Vcharset_japanese_jisx0208 = | 1315 Vcharset_japanese_jisx0208 = |
| 1316 make_charset (LEADING_BYTE_JAPANESE_JISX0208, Qjapanese_jisx0208, 3, | 1316 make_charset (LEADING_BYTE_JAPANESE_JISX0208, Qjapanese_jisx0208, 3, |
| 1317 CHARSET_TYPE_94X94, 2, 0, 'B', | 1317 CHARSET_TYPE_94X94, 2, 0, 'B', |
| 1318 CHARSET_LEFT_TO_RIGHT, | 1318 CHARSET_LEFT_TO_RIGHT, |
| 1319 build_string ("JISX0208"), | 1319 build_ascstring ("JISX0208"), |
| 1320 build_msg_string ("JISX0208.1983/1990 (Japanese)"), | 1320 build_defer_string ("JISX0208.1983/1990 (Japanese)"), |
| 1321 build_msg_string ("JISX0208.1983/1990 Japanese Kanji"), | 1321 build_defer_string ("JISX0208.1983/1990 Japanese Kanji"), |
| 1322 vector2(build_string("jisx0208.1983-0"), | 1322 vector2(build_ascstring("jisx0208.1983-0"), |
| 1323 build_string("jisx0208.1990-0")), 0, 0); | 1323 build_ascstring("jisx0208.1990-0")), 0, 0); |
| 1324 staticpro (&Vcharset_korean_ksc5601); | 1324 staticpro (&Vcharset_korean_ksc5601); |
| 1325 Vcharset_korean_ksc5601 = | 1325 Vcharset_korean_ksc5601 = |
| 1326 make_charset (LEADING_BYTE_KOREAN_KSC5601, Qkorean_ksc5601, 3, | 1326 make_charset (LEADING_BYTE_KOREAN_KSC5601, Qkorean_ksc5601, 3, |
| 1327 CHARSET_TYPE_94X94, 2, 0, 'C', | 1327 CHARSET_TYPE_94X94, 2, 0, 'C', |
| 1328 CHARSET_LEFT_TO_RIGHT, | 1328 CHARSET_LEFT_TO_RIGHT, |
| 1329 build_string ("KSC5601"), | 1329 build_ascstring ("KSC5601"), |
| 1330 build_msg_string ("KSC5601 (Korean"), | 1330 build_defer_string ("KSC5601 (Korean"), |
| 1331 build_msg_string ("KSC5601 Korean Hangul and Hanja"), | 1331 build_defer_string ("KSC5601 Korean Hangul and Hanja"), |
| 1332 vector1(build_string("ksc5601.1987-0")), 0, 0); | 1332 vector1(build_ascstring("ksc5601.1987-0")), 0, 0); |
| 1333 staticpro (&Vcharset_japanese_jisx0212); | 1333 staticpro (&Vcharset_japanese_jisx0212); |
| 1334 Vcharset_japanese_jisx0212 = | 1334 Vcharset_japanese_jisx0212 = |
| 1335 make_charset (LEADING_BYTE_JAPANESE_JISX0212, Qjapanese_jisx0212, 3, | 1335 make_charset (LEADING_BYTE_JAPANESE_JISX0212, Qjapanese_jisx0212, 3, |
| 1336 CHARSET_TYPE_94X94, 2, 0, 'D', | 1336 CHARSET_TYPE_94X94, 2, 0, 'D', |
| 1337 CHARSET_LEFT_TO_RIGHT, | 1337 CHARSET_LEFT_TO_RIGHT, |
| 1338 build_string ("JISX0212"), | 1338 build_ascstring ("JISX0212"), |
| 1339 build_msg_string ("JISX0212 (Japanese)"), | 1339 build_defer_string ("JISX0212 (Japanese)"), |
| 1340 build_msg_string ("JISX0212 Japanese Supplement"), | 1340 build_defer_string ("JISX0212 Japanese Supplement"), |
| 1341 vector1(build_string("jisx0212.1990-0")), 0, 0); | 1341 vector1(build_ascstring("jisx0212.1990-0")), 0, 0); |
| 1342 | 1342 |
| 1343 #define CHINESE_CNS_PLANE(n) "cns11643.1992-" n | 1343 #define CHINESE_CNS_PLANE(n) "cns11643.1992-" n |
| 1344 staticpro (&Vcharset_chinese_cns11643_1); | 1344 staticpro (&Vcharset_chinese_cns11643_1); |
| 1345 Vcharset_chinese_cns11643_1 = | 1345 Vcharset_chinese_cns11643_1 = |
| 1346 make_charset (LEADING_BYTE_CHINESE_CNS11643_1, Qchinese_cns11643_1, 3, | 1346 make_charset (LEADING_BYTE_CHINESE_CNS11643_1, Qchinese_cns11643_1, 3, |
| 1347 CHARSET_TYPE_94X94, 2, 0, 'G', | 1347 CHARSET_TYPE_94X94, 2, 0, 'G', |
| 1348 CHARSET_LEFT_TO_RIGHT, | 1348 CHARSET_LEFT_TO_RIGHT, |
| 1349 build_string ("CNS11643-1"), | 1349 build_ascstring ("CNS11643-1"), |
| 1350 build_msg_string ("CNS11643-1 (Chinese traditional)"), | 1350 build_defer_string ("CNS11643-1 (Chinese traditional)"), |
| 1351 build_msg_string | 1351 build_defer_string |
| 1352 ("CNS 11643 Plane 1 Chinese traditional"), | 1352 ("CNS 11643 Plane 1 Chinese traditional"), |
| 1353 vector1(build_string (CHINESE_CNS_PLANE("1"))), 0, 0); | 1353 vector1(build_ascstring (CHINESE_CNS_PLANE("1"))), 0, 0); |
| 1354 staticpro (&Vcharset_chinese_cns11643_2); | 1354 staticpro (&Vcharset_chinese_cns11643_2); |
| 1355 Vcharset_chinese_cns11643_2 = | 1355 Vcharset_chinese_cns11643_2 = |
| 1356 make_charset (LEADING_BYTE_CHINESE_CNS11643_2, Qchinese_cns11643_2, 3, | 1356 make_charset (LEADING_BYTE_CHINESE_CNS11643_2, Qchinese_cns11643_2, 3, |
| 1357 CHARSET_TYPE_94X94, 2, 0, 'H', | 1357 CHARSET_TYPE_94X94, 2, 0, 'H', |
| 1358 CHARSET_LEFT_TO_RIGHT, | 1358 CHARSET_LEFT_TO_RIGHT, |
| 1359 build_string ("CNS11643-2"), | 1359 build_ascstring ("CNS11643-2"), |
| 1360 build_msg_string ("CNS11643-2 (Chinese traditional)"), | 1360 build_defer_string ("CNS11643-2 (Chinese traditional)"), |
| 1361 build_msg_string | 1361 build_defer_string |
| 1362 ("CNS 11643 Plane 2 Chinese traditional"), | 1362 ("CNS 11643 Plane 2 Chinese traditional"), |
| 1363 vector1(build_string (CHINESE_CNS_PLANE("2"))), 0, 0); | 1363 vector1(build_ascstring (CHINESE_CNS_PLANE("2"))), 0, 0); |
| 1364 staticpro (&Vcharset_chinese_big5_1); | 1364 staticpro (&Vcharset_chinese_big5_1); |
| 1365 Vcharset_chinese_big5_1 = | 1365 Vcharset_chinese_big5_1 = |
| 1366 make_charset (LEADING_BYTE_CHINESE_BIG5_1, Qchinese_big5_1, 3, | 1366 make_charset (LEADING_BYTE_CHINESE_BIG5_1, Qchinese_big5_1, 3, |
| 1367 CHARSET_TYPE_94X94, 2, 0, '0', | 1367 CHARSET_TYPE_94X94, 2, 0, '0', |
| 1368 CHARSET_LEFT_TO_RIGHT, | 1368 CHARSET_LEFT_TO_RIGHT, |
| 1369 build_string ("Big5"), | 1369 build_ascstring ("Big5"), |
| 1370 build_msg_string ("Big5 (Level-1)"), | 1370 build_defer_string ("Big5 (Level-1)"), |
| 1371 build_msg_string | 1371 build_defer_string |
| 1372 ("Big5 Level-1 Chinese traditional"), | 1372 ("Big5 Level-1 Chinese traditional"), |
| 1373 vector1(build_string ("big5.eten-0")), 0, 0); | 1373 vector1(build_ascstring ("big5.eten-0")), 0, 0); |
| 1374 staticpro (&Vcharset_chinese_big5_2); | 1374 staticpro (&Vcharset_chinese_big5_2); |
| 1375 Vcharset_chinese_big5_2 = | 1375 Vcharset_chinese_big5_2 = |
| 1376 make_charset (LEADING_BYTE_CHINESE_BIG5_2, Qchinese_big5_2, 3, | 1376 make_charset (LEADING_BYTE_CHINESE_BIG5_2, Qchinese_big5_2, 3, |
| 1377 CHARSET_TYPE_94X94, 2, 0, '1', | 1377 CHARSET_TYPE_94X94, 2, 0, '1', |
| 1378 CHARSET_LEFT_TO_RIGHT, | 1378 CHARSET_LEFT_TO_RIGHT, |
| 1379 build_string ("Big5"), | 1379 build_ascstring ("Big5"), |
| 1380 build_msg_string ("Big5 (Level-2)"), | 1380 build_defer_string ("Big5 (Level-2)"), |
| 1381 build_msg_string | 1381 build_defer_string |
| 1382 ("Big5 Level-2 Chinese traditional"), | 1382 ("Big5 Level-2 Chinese traditional"), |
| 1383 vector1(build_string ("big5.eten-0")), 0, 0); | 1383 vector1(build_ascstring ("big5.eten-0")), 0, 0); |
| 1384 | 1384 |
| 1385 | 1385 |
| 1386 #ifdef ENABLE_COMPOSITE_CHARS | 1386 #ifdef ENABLE_COMPOSITE_CHARS |
| 1387 /* #### For simplicity, we put composite chars into a 96x96 charset. | 1387 /* #### For simplicity, we put composite chars into a 96x96 charset. |
| 1388 This is going to lead to problems because you can run out of | 1388 This is going to lead to problems because you can run out of |
| 1390 staticpro (&Vcharset_composite); | 1390 staticpro (&Vcharset_composite); |
| 1391 Vcharset_composite = | 1391 Vcharset_composite = |
| 1392 make_charset (LEADING_BYTE_COMPOSITE, Qcomposite, 3, | 1392 make_charset (LEADING_BYTE_COMPOSITE, Qcomposite, 3, |
| 1393 CHARSET_TYPE_96X96, 2, 0, 0, | 1393 CHARSET_TYPE_96X96, 2, 0, 0, |
| 1394 CHARSET_LEFT_TO_RIGHT, | 1394 CHARSET_LEFT_TO_RIGHT, |
| 1395 build_string ("Composite"), | 1395 build_ascstring ("Composite"), |
| 1396 build_msg_string ("Composite characters"), | 1396 build_defer_string ("Composite characters"), |
| 1397 build_msg_string ("Composite characters"), | 1397 build_defer_string ("Composite characters"), |
| 1398 vector1(build_string ("")), 0, 0); | 1398 vector1(build_ascstring ("")), 0, 0); |
| 1399 #else | 1399 #else |
| 1400 /* We create a hack so that we have a way of storing ESC 0 and ESC 1 | 1400 /* We create a hack so that we have a way of storing ESC 0 and ESC 1 |
| 1401 sequences as "characters", so that they will be output correctly. */ | 1401 sequences as "characters", so that they will be output correctly. */ |
| 1402 staticpro (&Vcharset_composite); | 1402 staticpro (&Vcharset_composite); |
| 1403 Vcharset_composite = | 1403 Vcharset_composite = |
| 1404 make_charset (LEADING_BYTE_COMPOSITE_REPLACEMENT, Qcomposite, 2, | 1404 make_charset (LEADING_BYTE_COMPOSITE_REPLACEMENT, Qcomposite, 2, |
| 1405 CHARSET_TYPE_96, 1, 1, '|', | 1405 CHARSET_TYPE_96, 1, 1, '|', |
| 1406 CHARSET_LEFT_TO_RIGHT, | 1406 CHARSET_LEFT_TO_RIGHT, |
| 1407 build_string ("Composite hack"), | 1407 build_ascstring ("Composite hack"), |
| 1408 build_msg_string ("Composite characters hack"), | 1408 build_defer_string ("Composite characters hack"), |
| 1409 build_msg_string ("Composite characters hack"), | 1409 build_defer_string ("Composite characters hack"), |
| 1410 vector1(build_string ("")), 0, 0); | 1410 vector1(build_ascstring ("")), 0, 0); |
| 1411 #endif /* ENABLE_COMPOSITE_CHARS */ | 1411 #endif /* ENABLE_COMPOSITE_CHARS */ |
| 1412 } | 1412 } |