annotate src/character.c @ 112364:42e22c4f06b7

Move all DEFVAR'd globals into a structure -- threading infrastructure * globals.h: New file. * xterm.h (Vx_pixel_size_width_font_regexp): Remove declaration. * window.h (Vinitial_window_system, Vminibuf_scroll_window) (Vwindow_system_version): Remove declaration. * w32term.h (Vw32_enable_palette) (Vx_pixel_size_width_font_regexp): Remove declaration. * w32menu.c (Voverriding_local_map) (Voverriding_local_map_menu_flag): Remove declaration. * w32inevt.c (Vw32_alt_is_meta, Vw32_apps_modifier) (Vw32_capslock_is_shiftlock, Vw32_enable_caps_lock) (Vw32_enable_num_lock, Vw32_lwindow_modifier) (Vw32_pass_lwindow_to_system, Vw32_pass_rwindow_to_system) (Vw32_phantom_key_code, Vw32_recognize_altgr) (Vw32_rwindow_modifier, Vw32_scroll_lock_modifier) (w32_use_full_screen_buffer): Remove declaration. * w32.c (Vsystem_configuration, Vw32_downcase_file_names) (Vw32_generate_fake_inodes, Vw32_get_true_file_attributes) (w32_num_mouse_buttons, w32_pipe_read_delay): Remove declaration. * termopts.h (Vtruncate_partial_width_windows, inverse_video) (no_redraw_on_reenter, visible_bell): Remove declaration. * sysdep.c (Vsystem_name): Remove declaration. * syntax.h (parse_sexp_lookup_properties): Remove declaration. * menu.h (Vmenu_updating_frame): Remove declaration. * macros.h (Vexecuting_kbd_macro, executing_kbd_macro_index): Remove declaration. * lisp.h (Vafter_init_time, Vafter_load_alist) (Vauto_save_list_file_name, Vbefore_init_time, Vcommand_history) (Vcompletion_regexp_list, Vcurrent_load_list) (Vcurrent_prefix_arg, Vdata_directory, Vdebug_on_error) (Vdoc_directory, Vdoc_file_name, Vdynamic_library_alist) (Vexec_directory, Vexec_path, Vexec_suffixes) (Vface_font_rescale_alist, Vface_ignored_fonts, Vfeatures) (Vhelp_form, Vhistory_length, Vinhibit_field_text_motion) (Vinhibit_quit, Vinhibit_read_only, Vinhibit_redisplay) (Vinstallation_directory, Vinvocation_directory) (Vinvocation_name, Vload_file_rep_suffixes, Vload_history) (Vload_suffixes, Vmark_even_if_inactive, Vmemory_full) (Vmessage_log_max, Vobarray, Vprint_length, Vprint_level) (Vpurify_flag, Vquit_flag, Vsaved_region_selection) (Vscalable_fonts_allowed, Vselect_active_regions) (Vshell_file_name, Vstandard_input, Vstandard_output) (Vsystem_name, Vtemporary_file_directory, Vthrow_on_input) (Vtop_level, Vtty_erase_char, Vundo_outer_limit) (Vuser_login_name, Vwindow_scroll_functions) (Vwindow_system_version, Vx_no_window_manager) (Vx_resource_class, Vx_resource_name, baud_rate) (completion_ignore_case, debug_on_next_call, gc_cons_threshold) (history_delete_duplicates, inhibit_x_resources) (last_nonmenu_event, load_in_progress, max_specpdl_size) (minibuffer_auto_raise, print_escape_newlines, scroll_margin) (use_dialog_box, use_file_dialog): Remove declaration. Include globals.h. * keymap.h (Voverriding_local_map) (Voverriding_local_map_menu_flag, meta_prefix_char): Remove declaration. * keyboard.h (Vdouble_click_time, Vfunction_key_map) (Vinput_method_function, Vkey_translation_map) (Vlucid_menu_bar_dirty_flag, Vthis_original_command) (do_mouse_tracking, extra_keyboard_modifiers) (num_nonmacro_input_events): Remove declaration. * intervals.h (Vchar_property_alias_alist) (Vdefault_text_properties, Vinhibit_point_motion_hooks) (Vtext_property_default_nonsticky): Remove declaration. * gtkutil.h (x_gtk_file_dialog_help_text) (x_gtk_show_hidden_files, x_gtk_use_old_file_dialog) (x_gtk_whole_detached_tool_bar): Remove declaration. * frame.h (Vdefault_frame_alist, Vframe_alpha_lower_limit) (Vmenu_bar_mode, Vmouse_highlight, Vterminal_frame) (Vtool_bar_mode, Vx_resource_class, Vx_resource_name) (focus_follows_mouse): Remove declaration. * fontset.h (Valternate_fontname_alist, Vfontset_alias_alist) (Vignore_relative_composition, Votf_script_alist) (Vuse_default_ascent, Vvertical_centering_font_regexp): Remove declaration. * font.h (Vfont_log): Remove declaration. * dosfns.h (Vdos_display_scancodes, Vdos_version) (Vdos_windows_version, dos_codepage, dos_country_code) (dos_decimal_point, dos_hyper_key, dos_keyboard_layout) (dos_keypad_mode, dos_super_key, dos_timezone_offset): Remove declaration. * disptab.h (Vglyph_table, Vstandard_display_table): Remove declaration. * dispextern.h (Vface_remapping_alist, Vglyphless_char_display) (Vmouse_autoselect_window, Voverflow_newline_into_fringe) (Vshow_trailing_whitespace, Vtool_bar_button_margin) (Vtool_bar_style, cursor_in_echo_area, display_hourglass_p) (inverse_video, mode_line_in_non_selected_windows) (tool_bar_button_relief, tool_bar_max_label_size) (underline_minimum_offset) (unibyte_display_via_language_environment, x_stretch_cursor_p): Remove declaration. * composite.h (Vauto_composition_function) (Vcomposition_function_table): Remove declaration. * commands.h (Vexecuting_kbd_macro) (Vminibuffer_local_completion_map) (Vminibuffer_local_filename_completion_map) (Vminibuffer_local_filename_must_match_map) (Vminibuffer_local_map, Vminibuffer_local_must_match_map) (Vminibuffer_local_ns_map, Vthis_command) (Vunread_command_events, cursor_in_echo_area) (last_command_event, last_nonmenu_event, unread_command_char): Remove declaration. * coding.h (Vcoding_system_for_read, Vcoding_system_for_write) (Vdefault_file_name_coding_system) (Vdefault_process_coding_system, Vfile_name_coding_system) (Vlast_coding_system_used, Vlocale_coding_system) (Vselect_safe_coding_system_function) (Vtranslation_table_for_input, coding_system_require_warning) (eol_mnemonic_dos, eol_mnemonic_mac, eol_mnemonic_undecided) (eol_mnemonic_unix, inherit_process_coding_system): Remove declaration. * charset.h (Vcharset_list, Vcurrent_iso639_language): Remove declaration. * character.h (Vauto_fill_chars, Vchar_direction_table) (Vchar_script_table, Vchar_width_table, Vprintable_chars) (Vscript_representative_chars, Vtranslation_table_vector) (Vunicode_category_table): Remove declaration. * ccl.h (Vfont_ccl_encoder_alist): Remove declaration. * buffer.h (Vafter_change_functions, Vbefore_change_functions) (Vdeactivate_mark, Vfirst_change_hook, Vtransient_mark_mode) (inhibit_modification_hooks): Remove declaration. * xterm.c (syms_of_xterm): Update. (Vx_alt_keysym, Vx_hyper_keysym, Vx_keysym_table) (Vx_meta_keysym, Vx_super_keysym, Vx_toolkit_scroll_bars) (x_mouse_click_focus_ignore_position) (x_underline_at_descent_line) (x_use_underline_position_properties): Remove. * xsmfns.c (syms_of_xsmfns): Update. (Vx_session_id, Vx_session_previous_id): Remove. * xsettings.c (syms_of_xsettings): Update. (Vxft_settings, use_system_font): Remove. * xselect.c (syms_of_xselect): Update. (Vselection_converter_alist, Vx_lost_selection_functions) (Vx_sent_selection_functions, x_selection_timeout): Remove. * xfns.c (syms_of_xfns): Update. (Vgtk_version_string, Vmotif_version_string) (Vx_cursor_fore_pixel, Vx_hourglass_pointer_shape) (Vx_max_tooltip_size, Vx_mode_pointer_shape) (Vx_no_window_manager, Vx_nontext_pointer_shape) (Vx_pixel_size_width_font_regexp, Vx_pointer_shape) (Vx_sensitive_text_pointer_shape) (Vx_window_horizontal_drag_shape, x_gtk_file_dialog_help_text) (x_gtk_show_hidden_files, x_gtk_use_old_file_dialog) (x_gtk_use_system_tooltips, x_gtk_whole_detached_tool_bar): Remove. * xfaces.c (syms_of_xfaces): Update. (Vface_default_stipple, Vface_font_rescale_alist) (Vface_ignored_fonts, Vface_new_frame_defaults) (Vface_remapping_alist, Vfont_list_limit) (Vscalable_fonts_allowed, Vtty_defined_color_alist): Remove. * xdisp.c (syms_of_xdisp): Update. (Vauto_resize_tool_bars, Vblink_cursor_alist) (Vdisplay_pixels_per_inch, Vfontification_functions) (Vframe_title_format, Vglobal_mode_string) (Vglyphless_char_display, Vhourglass_delay, Vhscroll_step) (Vicon_title_format, Vinhibit_redisplay) (Vline_number_display_limit, Vline_prefix) (Vmax_mini_window_height, Vmenu_bar_update_hook) (Vmenu_updating_frame, Vmessage_log_max) (Vmouse_autoselect_window, Vnobreak_char_display) (Voverlay_arrow_position, Voverlay_arrow_string) (Voverlay_arrow_variable_list, Vredisplay_end_trigger_functions) (Vresize_mini_windows, Vshow_trailing_whitespace) (Vtool_bar_border, Vtool_bar_button_margin, Vtool_bar_style) (Vtruncate_partial_width_windows, Vvoid_text_area_pointer) (Vwindow_scroll_functions, Vwindow_size_change_functions) (Vwindow_text_change_functions, Vwrap_prefix) (auto_raise_tool_bar_buttons_p, automatic_hscrolling_p) (debug_end_pos, display_hourglass_p, emacs_scroll_step) (highlight_nonselected_windows, hscroll_margin) (inhibit_eval_during_redisplay, inhibit_free_realized_faces) (inhibit_menubar_update, inhibit_try_cursor_movement) (inhibit_try_window_id, inhibit_try_window_reusing) (line_number_display_limit_width) (make_cursor_line_fully_visible_p, message_truncate_lines) (mode_line_inverse_video, multiple_frames, overline_margin) (scroll_conservatively, scroll_margin, tool_bar_button_relief) (tool_bar_max_label_size, underline_minimum_offset) (unibyte_display_via_language_environment, x_stretch_cursor_p): Remove. * window.c (syms_of_window): Update. (Vminibuf_scroll_window, Vother_window_scroll_buffer) (Vrecenter_redisplay, Vscroll_preserve_screen_position) (Vtemp_buffer_show_function, Vwindow_configuration_change_hook) (Vwindow_point_insertion_type, auto_window_vscroll_p) (mode_line_in_non_selected_windows, next_screen_context_lines) (window_min_height, window_min_width): Remove. (scroll_margin): Remove declaration. * w32term.c (syms_of_w32term): Update. (Vw32_capslock_is_shiftlock, Vw32_grab_focus_on_raise) (Vw32_recognize_altgr, Vw32_swap_mouse_buttons) (Vx_toolkit_scroll_bars, w32_num_mouse_buttons) (w32_use_visible_system_caret, x_underline_at_descent_line) (x_use_underline_position_properties): Remove. (Vcommand_line_args, Vsystem_name, extra_keyboard_modifiers): Remove declaration. * w32select.c (syms_of_w32select): Update. (Vnext_selection_coding_system, Vselection_coding_system): Remove. * w32proc.c (syms_of_ntproc): Update. (Vw32_downcase_file_names, Vw32_generate_fake_inodes) (Vw32_get_true_file_attributes, Vw32_quote_process_args) (Vw32_start_process_inherit_error_mode) (Vw32_start_process_share_console) (Vw32_start_process_show_window, w32_pipe_read_delay): Remove. (Vsystem_name): Remove declaration. * w32font.c (syms_of_w32font): Update. (Vw32_charset_info_alist): Remove. * w32fns.c (globals_of_w32fns, syms_of_w32fns): Update. (Vw32_alt_is_meta, Vw32_apps_modifier, Vw32_bdf_filename_alist) (Vw32_color_map, Vw32_enable_caps_lock, Vw32_enable_num_lock) (Vw32_enable_palette, Vw32_lwindow_modifier) (Vw32_pass_alt_to_system, Vw32_pass_lwindow_to_system) (Vw32_pass_rwindow_to_system, Vw32_phantom_key_code) (Vw32_rwindow_modifier, Vw32_scroll_lock_modifier) (Vx_cursor_fore_pixel, Vx_hourglass_pointer_shape) (Vx_max_tooltip_size, Vx_mode_pointer_shape) (Vx_no_window_manager, Vx_nontext_pointer_shape) (Vx_pixel_size_width_font_regexp, Vx_pointer_shape) (Vx_sensitive_text_pointer_shape) (Vx_window_horizontal_drag_shape, w32_ansi_code_page) (w32_enable_synthesized_fonts, w32_mouse_button_tolerance) (w32_mouse_move_interval) (w32_pass_extra_mouse_buttons_to_system) (w32_pass_multimedia_buttons_to_system, w32_quit_key) (w32_strict_fontnames, w32_strict_painting): Remove. (Vhourglass_delay, Vmenu_bar_mode, Vtool_bar_mode) (Vw32_recognize_altgr, Vwindow_system_version) (w32_num_mouse_buttons, w32_use_visible_system_caret): Remove declaration. * w32console.c (syms_of_ntterm): Update. (w32_use_full_screen_buffer): Remove. (Vtty_defined_color_alist): Remove declaration. * w16select.c (syms_of_win16select): Update. (Vnext_selection_coding_system, Vselection_coding_system): Remove. * undo.c (syms_of_undo): Update. (Vundo_outer_limit, Vundo_outer_limit_function) (undo_inhibit_record_point, undo_limit, undo_strong_limit): Remove. * textprop.c (syms_of_textprop): Update. (Vchar_property_alias_alist, Vdefault_text_properties) (Vinhibit_point_motion_hooks, Vtext_property_default_nonsticky): Remove. * terminal.c (syms_of_terminal): Update. (Vdelete_terminal_functions, Vring_bell_function): Remove. * term.c (syms_of_term): Update. (Vresume_tty_functions, Vsuspend_tty_functions) (no_redraw_on_reenter, system_uses_terminfo, visible_cursor): Remove. * syntax.c (syms_of_syntax): Update. (Vfind_word_boundary_function_table, multibyte_syntax_as_symbol) (open_paren_in_column_0_is_defun_start) (parse_sexp_ignore_comments, parse_sexp_lookup_properties) (words_include_escapes): Remove. * search.c (syms_of_search): Update. (Vinhibit_changing_match_data, Vsearch_spaces_regexp): Remove. * process.c (syms_of_process): Update. (Vprocess_adaptive_read_buffering, Vprocess_connection_type) (delete_exited_processes): Remove. * print.c (syms_of_print): Update. (Vfloat_output_format, Vprint_charset_text_property) (Vprint_circle, Vprint_continuous_numbering, Vprint_gensym) (Vprint_length, Vprint_level, Vprint_number_table) (Vstandard_output, print_escape_multibyte) (print_escape_newlines, print_escape_nonascii, print_quoted): Remove. * msdos.c (syms_of_msdos): Update. (Vdos_unsupported_char_glyph): Remove. (unibyte_display_via_language_environment): Remove declaration. * minibuf.c (syms_of_minibuf): Update. (Vcompletion_regexp_list, Vhistory_add_new_input) (Vhistory_length, Vminibuffer_completing_file_name) (Vminibuffer_completion_confirm) (Vminibuffer_completion_predicate, Vminibuffer_completion_table) (Vminibuffer_exit_hook, Vminibuffer_help_form) (Vminibuffer_history_position, Vminibuffer_history_variable) (Vminibuffer_prompt_properties, Vminibuffer_setup_hook) (Vread_buffer_function, Vread_expression_map) (completion_ignore_case, enable_recursive_minibuffers) (history_delete_duplicates, minibuffer_allow_text_properties) (minibuffer_auto_raise, read_buffer_completion_ignore_case): Remove. * marker.c (syms_of_marker): Update. (byte_debug_flag): Remove. * macros.c (syms_of_macros): Update. (Vexecuting_kbd_macro, executing_kbd_macro_index): Remove. * lread.c (syms_of_lread): Update. (Vafter_load_alist, Vbyte_boolean_vars) (Vbytecomp_version_regexp, Vcurrent_load_list) (Veval_buffer_list, Vload_file_name, Vload_file_rep_suffixes) (Vload_history, Vload_path, Vload_read_function) (Vload_source_file_function, Vload_suffixes, Vobarray) (Vold_style_backquotes, Vpreloaded_file_list, Vread_circle) (Vread_symbol_positions_list, Vread_with_symbol_positions) (Vsource_directory, Vstandard_input, Vuser_init_file, Vvalues) (force_load_messages, load_convert_to_unibyte) (load_dangerous_libraries, load_force_doc_strings) (load_in_progress): Remove. * keymap.c (syms_of_keymap): Update. (Vdefine_key_rebound_commands, Vemulation_mode_map_alists) (Vminibuffer_local_completion_map) (Vminibuffer_local_filename_completion_map) (Vminibuffer_local_filename_must_match_map) (Vminibuffer_local_map, Vminibuffer_local_must_match_map) (Vminibuffer_local_ns_map, Vminor_mode_map_alist) (Vminor_mode_overriding_map_alist, Vwhere_is_preferred_modifier): Remove. * keyboard.c (syms_of_keyboard): Update. (Vauto_save_timeout, Vcommand_error_function) (Vcommand_hook_internal, Vdeactivate_mark) (Vdeferred_action_function, Vdeferred_action_list) (Vdisable_point_adjustment, Vdouble_click_time) (Vecho_keystrokes, Venable_disabled_menus_and_buttons) (Vfunction_key_map, Vglobal_disable_point_adjustment) (Vhelp_char, Vhelp_event_list, Vhelp_form) (Vinput_method_function, Vinput_method_previous_message) (Vkey_translation_map, Vlast_event_frame) (Vlucid_menu_bar_dirty_flag, Vmenu_bar_final_items) (Vminibuffer_message_timeout, Voverriding_local_map) (Voverriding_local_map_menu_flag, Vpost_command_hook) (Vpre_command_hook, Vprefix_help_command) (Vsaved_region_selection, Vselect_active_regions) (Vshow_help_function, Vspecial_event_map, Vsuggest_key_bindings) (Vthis_command, Vthis_command_keys_shift_translated) (Vthis_original_command, Vthrow_on_input, Vtimer_idle_list) (Vtimer_list, Vtool_bar_separator_image_expression, Vtop_level) (Vtty_erase_char, Vunread_command_events) (Vunread_input_method_events, Vunread_post_input_method_events) (auto_save_interval, cannot_suspend, do_mouse_tracking) (double_click_fuzz, extra_keyboard_modifiers) (inhibit_local_menu_bar_menus, last_command_event) (last_input_event, last_nonmenu_event, menu_prompt_more_char) (menu_prompting, meta_prefix_char, num_input_keys) (num_nonmacro_input_events, polling_period, unread_command_char): Remove. * insdel.c (syms_of_insdel): Update. (Vcombine_after_change_calls, check_markers_debug_flag): Remove. * indent.c (syms_of_indent): Update. (indent_tabs_mode): Remove. * image.c (syms_of_image): Update. (Vimage_cache_eviction_delay, Vimage_types) (Vimagemagick_render_type, Vmax_image_size, Vx_bitmap_file_path) (cross_disabled_images): Remove. * fringe.c (syms_of_fringe): Update. (Vfringe_bitmaps, Voverflow_newline_into_fringe): Remove. * frame.c (syms_of_frame): Update. (Vdefault_frame_alist, Vdefault_frame_scroll_bars) (Vdelete_frame_functions, Vframe_alpha_lower_limit) (Vmake_pointer_invisible, Vmenu_bar_mode, Vmouse_highlight) (Vmouse_position_function, Vterminal_frame, Vtool_bar_mode) (Vx_resource_class, Vx_resource_name, focus_follows_mouse): Remove. * fontset.c (syms_of_fontset): Update. (Valternate_fontname_alist, Vfont_encoding_charset_alist) (Vfontset_alias_alist, Vignore_relative_composition) (Votf_script_alist, Vuse_default_ascent) (Vvertical_centering_font_regexp): Remove. * font.c (syms_of_font): Update. (Vfont_encoding_alist, Vfont_log, Vfont_slant_table) (Vfont_weight_table, Vfont_width_table): Remove. * fns.c (syms_of_fns): Update. (Vfeatures, use_dialog_box, use_file_dialog): Remove. * filelock.c (syms_of_filelock): Update. (Vtemporary_file_directory): Remove. * fileio.c (syms_of_fileio): Update. (Vafter_insert_file_functions, Vauto_save_include_big_deletions) (Vauto_save_list_file_name, Vauto_save_visited_file_name) (Vdefault_file_name_coding_system, Vfile_name_coding_system) (Vfile_name_handler_alist, Vinhibit_file_name_handlers) (Vinhibit_file_name_operation, Vset_auto_coding_function) (Vwrite_region_annotate_functions) (Vwrite_region_annotations_so_far) (Vwrite_region_post_annotation_function) (delete_by_moving_to_trash, write_region_inhibit_fsync): Remove. (Vw32_get_true_file_attributes): Remove declaration. * eval.c (syms_of_eval): Update. (Vdebug_ignored_errors, Vdebug_on_error, Vdebug_on_signal) (Vdebugger, Vinhibit_quit, Vmacro_declaration_function) (Vquit_flag, Vsignal_hook_function, Vstack_trace_on_error) (debug_on_next_call, debug_on_quit, debugger_may_continue) (max_lisp_eval_depth, max_specpdl_size): Remove. * emacs.c (syms_of_emacs): Update. (Vafter_init_time, Vbefore_init_time, Vcommand_line_args) (Vdynamic_library_alist, Vemacs_copyright, Vemacs_version) (Vinstallation_directory, Vinvocation_directory) (Vinvocation_name, Vkill_emacs_hook, Vpath_separator) (Vprevious_system_messages_locale, Vprevious_system_time_locale) (Vsystem_configuration, Vsystem_configuration_options) (Vsystem_messages_locale, Vsystem_time_locale, Vsystem_type) (inhibit_x_resources, noninteractive1): Remove. * editfns.c (syms_of_editfns): Update. (Vbuffer_access_fontified_property) (Vbuffer_access_fontify_functions, Vinhibit_field_text_motion) (Voperating_system_release, Vsystem_name, Vuser_full_name) (Vuser_login_name, Vuser_real_login_name): Remove. * dosfns.c (syms_of_dosfns): Update. (Vdos_display_scancodes, Vdos_version, Vdos_windows_version) (dos_codepage, dos_country_code, dos_decimal_point) (dos_hyper_key, dos_keyboard_layout, dos_keypad_mode) (dos_super_key, dos_timezone_offset): Remove. * doc.c (syms_of_doc): Update. (Vbuild_files, Vdoc_file_name): Remove. * dispnew.c (syms_of_display): Update. (Vglyph_table, Vinitial_window_system) (Vredisplay_preemption_period, Vstandard_display_table) (Vwindow_system_version, baud_rate, cursor_in_echo_area) (inverse_video, redisplay_dont_pause, visible_bell): Remove. * dired.c (syms_of_dired): Update. (Vcompletion_ignored_extensions): Remove. (Vw32_get_true_file_attributes): Remove declaration. * dbusbind.c (syms_of_dbusbind): Update. (Vdbus_debug, Vdbus_registered_buses) (Vdbus_registered_objects_table): Remove. * data.c (syms_of_data): Update. (Vmost_negative_fixnum, Vmost_positive_fixnum): Remove. * composite.c (syms_of_composite): Update. (Vauto_composition_function, Vauto_composition_mode) (Vcompose_chars_after_function, Vcomposition_function_table): Remove. * coding.c (syms_of_coding): Update. (Vcharset_revision_table, Vcoding_category_list) (Vcoding_system_alist, Vcoding_system_for_read) (Vcoding_system_for_write, Vcoding_system_list) (Vdefault_process_coding_system, Venable_character_translation) (Vfile_coding_system_alist, Vlast_code_conversion_error) (Vlast_coding_system_used, Vlatin_extra_code_table) (Vlocale_coding_system, Vnetwork_coding_system_alist) (Vprocess_coding_system_alist) (Vselect_safe_coding_system_function) (Vstandard_translation_table_for_decode) (Vstandard_translation_table_for_encode) (Vtranslation_table_for_input, coding_system_require_warning) (eol_mnemonic_dos, eol_mnemonic_mac, eol_mnemonic_undecided) (eol_mnemonic_unix, inherit_process_coding_system) (inhibit_eol_conversion, inhibit_iso_escape_detection) (inhibit_null_byte_detection): Remove. * cmds.c (syms_of_cmds): Update. (Vpost_self_insert_hook): Remove. * charset.c (syms_of_charset): Update. (Vcharset_list, Vcharset_map_path, Vcurrent_iso639_language) (inhibit_load_charset_map): Remove. * character.c (syms_of_character): Update. (Vauto_fill_chars, Vchar_direction_table, Vchar_script_table) (Vchar_width_table, Vprintable_chars) (Vscript_representative_chars, Vtranslation_table_vector) (Vunicode_category_table): Remove. * ccl.c (syms_of_ccl): Update. (Vcode_conversion_map_vector, Vfont_ccl_encoder_alist) (Vtranslation_hash_table_vector): Remove. * category.c (syms_of_category): Update. (Vword_combining_categories, Vword_separating_categories): Remove. * callproc.c (syms_of_callproc): Update. (Vconfigure_info_directory, Vdata_directory, Vdoc_directory) (Vexec_directory, Vexec_path, Vexec_suffixes) (Vinitial_environment, Vprocess_environment) (Vshared_game_score_directory, Vshell_file_name): Remove. * callint.c (syms_of_callint): Update. (Vcommand_debug_status, Vcommand_history, Vcurrent_prefix_arg) (Vmark_even_if_inactive, Vmouse_leave_buffer_hook): Remove. * bytecode.c (syms_of_bytecode): Update. (Vbyte_code_meter, byte_metering_on): Remove. * buffer.c (syms_of_buffer): Update. (Vafter_change_functions, Vbefore_change_functions) (Vchange_major_mode_hook, Vfirst_change_hook) (Vinhibit_read_only, Vkill_buffer_query_functions) (Vtransient_mark_mode, inhibit_modification_hooks): Remove. * alloc.c (syms_of_alloc): Update. (Vgc_cons_percentage, Vgc_elapsed, Vmemory_full) (Vmemory_signal_data, Vpost_gc_hook, Vpurify_flag) (cons_cells_consed, floats_consed, garbage_collection_messages) (gc_cons_threshold, gcs_done, intervals_consed) (misc_objects_consed, pure_bytes_used, string_chars_consed) (strings_consed, symbols_consed, vector_cells_consed): Remove. * lisp.h (DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL) (DEFVAR_INT): Assume global is in `globals'. * alloc.c (globals): Define.
author Tom Tromey <tromey@redhat.com>
date Tue, 18 Jan 2011 13:45:37 -0700
parents ef719132ddfa
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1 /* Basic character support.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
2 Copyright (C) 1995, 1997, 1998, 2001 Electrotechnical Laboratory, JAPAN.
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
3 Licensed to the Free Software Foundation.
112218
376148b31b5e Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents: 108650
diff changeset
4 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
91443
541da5d81b14 Update copyright years and GPL version.
Glenn Morris <rgm@gnu.org>
parents: 90942
diff changeset
5 Free Software Foundation, Inc.
112218
376148b31b5e Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents: 108650
diff changeset
6 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
7 National Institute of Advanced Industrial Science and Technology (AIST)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
8 Registration Number H13PRO009
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
9
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
10 This file is part of GNU Emacs.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
11
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94146
diff changeset
12 GNU Emacs is free software: you can redistribute it and/or modify
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
13 it under the terms of the GNU General Public License as published by
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94146
diff changeset
14 the Free Software Foundation, either version 3 of the License, or
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94146
diff changeset
15 (at your option) any later version.
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
16
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
17 GNU Emacs is distributed in the hope that it will be useful,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
18 but WITHOUT ANY WARRANTY; without even the implied warranty of
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
20 GNU General Public License for more details.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
21
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
22 You should have received a copy of the GNU General Public License
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94146
diff changeset
23 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
24
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
25 /* At first, see the document in `character.h' to understand the code
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
26 in this file. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
27
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
28 #ifdef emacs
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
29 #include <config.h>
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
30 #endif
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
31
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
32 #include <stdio.h>
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
33
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
34 #ifdef emacs
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
35
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
36 #include <sys/types.h>
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105661
diff changeset
37 #include <setjmp.h>
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
38 #include "lisp.h"
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
39 #include "character.h"
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
40 #include "buffer.h"
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
41 #include "charset.h"
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
42 #include "composite.h"
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
43 #include "disptab.h"
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
44
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
45 #else /* not emacs */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
46
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
47 #include "mulelib.h"
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
48
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
49 #endif /* emacs */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
50
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
51 Lisp_Object Qcharacterp;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
52
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
53 Lisp_Object Qauto_fill_chars;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
54
89888
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
55 /* Char-table of information about which character to unify to which
99482
e228d5755549 (Vchar_unify_table): Comment added.
Kenichi Handa <handa@m17n.org>
parents: 99475
diff changeset
56 Unicode character. Mainly used by the macro MAYBE_UNIFY_CHAR. */
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
57 Lisp_Object Vchar_unify_table;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
58
89020
b0277093a5f2 (_fetch_multibyte_char_len): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88990
diff changeset
59 /* Variable used locally in the macro FETCH_MULTIBYTE_CHAR. */
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
60 unsigned char *_fetch_multibyte_char_p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
61
88913
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
62 static Lisp_Object Qchar_script_table;
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
63
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
64
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
65
92483
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
66 /* If character code C has modifier masks, reflect them to the
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
67 character code if possible. Return the resulting code. */
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
68
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
69 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
70 char_resolve_modifier_mask (int c)
92483
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
71 {
92494
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
72 /* A non-ASCII character can't reflect modifier bits to the code. */
92483
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
73 if (! ASCII_CHAR_P ((c & ~CHAR_MODIFIER_MASK)))
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
74 return c;
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
75
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
76 /* For Meta, Shift, and Control modifiers, we need special care. */
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
77 if (c & CHAR_SHIFT)
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
78 {
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
79 /* Shift modifier is valid only with [A-Za-z]. */
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
80 if ((c & 0377) >= 'A' && (c & 0377) <= 'Z')
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
81 c &= ~CHAR_SHIFT;
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
82 else if ((c & 0377) >= 'a' && (c & 0377) <= 'z')
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
83 c = (c & ~CHAR_SHIFT) - ('a' - 'A');
92499
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
84 /* Shift modifier for control characters and SPC is ignored. */
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
85 else if ((c & ~CHAR_MODIFIER_MASK) <= 0x20)
92494
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
86 c &= ~CHAR_SHIFT;
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
87 }
92483
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
88 if (c & CHAR_CTL)
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
89 {
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
90 /* Simulate the code in lread.c. */
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
91 /* Allow `\C- ' and `\C-?'. */
92499
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
92 if ((c & 0377) == ' ')
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
93 c &= ~0177 & ~ CHAR_CTL;
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
94 else if ((c & 0377) == '?')
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
95 c = 0177 | (c & ~0177 & ~CHAR_CTL);
92483
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
96 /* ASCII control chars are made from letters (both cases),
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
97 as well as the non-letters within 0100...0137. */
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
98 else if ((c & 0137) >= 0101 && (c & 0137) <= 0132)
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
99 c &= (037 | (~0177 & ~CHAR_CTL));
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
100 else if ((c & 0177) >= 0100 && (c & 0177) <= 0137)
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
101 c &= (037 | (~0177 & ~CHAR_CTL));
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
102 }
105688
dfb23d6b0762 (char_resolve_modifier_mask): Don't resolve meta to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
103 #if 0 /* This is outside the scope of this function. (bug#4751) */
92499
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
104 if (c & CHAR_META)
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
105 {
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
106 /* Move the meta bit to the right place for a string. */
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
107 c = (c & ~CHAR_META) | 0x80;
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
108 }
105688
dfb23d6b0762 (char_resolve_modifier_mask): Don't resolve meta to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
109 #endif
92483
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
110
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
111 return c;
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
112 }
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
113
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
114
89888
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
115 /* Store multibyte form of character C at P. If C has modifier bits,
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
116 handle them appropriately. */
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
117
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
118 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
119 char_string (unsigned int c, unsigned char *p)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
120 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
121 int bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
122
89181
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
123 if (c & CHAR_MODIFIER_MASK)
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
124 {
92483
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
125 c = (unsigned) char_resolve_modifier_mask ((int) c);
89181
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
126 /* If C still has any modifier bits, just ignore it. */
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
127 c &= ~CHAR_MODIFIER_MASK;
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
128 }
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
129
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
130 MAYBE_UNIFY_CHAR (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
131
89181
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
132 if (c <= MAX_3_BYTE_CHAR)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
133 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
134 bytes = CHAR_STRING (c, p);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
135 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
136 else if (c <= MAX_4_BYTE_CHAR)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
137 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
138 p[0] = (0xF0 | (c >> 18));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
139 p[1] = (0x80 | ((c >> 12) & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
140 p[2] = (0x80 | ((c >> 6) & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
141 p[3] = (0x80 | (c & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
142 bytes = 4;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
143 }
89181
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
144 else if (c <= MAX_5_BYTE_CHAR)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
145 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
146 p[0] = 0xF8;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
147 p[1] = (0x80 | ((c >> 18) & 0x0F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
148 p[2] = (0x80 | ((c >> 12) & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
149 p[3] = (0x80 | ((c >> 6) & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
150 p[4] = (0x80 | (c & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
151 bytes = 5;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
152 }
90797
b74794d7f11a (char_string): Type of arg C changed to unsigned.
Kenichi Handa <handa@m17n.org>
parents: 90761
diff changeset
153 else if (c <= MAX_CHAR)
89181
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
154 {
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
155 c = CHAR_TO_BYTE8 (c);
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
156 bytes = BYTE8_STRING (c, p);
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
157 }
90797
b74794d7f11a (char_string): Type of arg C changed to unsigned.
Kenichi Handa <handa@m17n.org>
parents: 90761
diff changeset
158 else
b74794d7f11a (char_string): Type of arg C changed to unsigned.
Kenichi Handa <handa@m17n.org>
parents: 90761
diff changeset
159 error ("Invalid character: %d", c);
88427
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
160
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
161 return bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
162 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
163
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
164
89888
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
165 /* Return a character whose multibyte form is at P. Set LEN is not
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
166 NULL, it must be a pointer to integer. In that case, set *LEN to
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
167 the byte length of the multibyte form. If ADVANCED is not NULL, is
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
168 must be a pointer to unsigned char. In that case, set *ADVANCED to
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
169 the ending address (i.e. the starting address of the next
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
170 character) of the multibyte form. */
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
171
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
172 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
173 string_char (const unsigned char *p, const unsigned char **advanced, int *len)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
174 {
88427
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
175 int c;
88878
a0ae1a5876c7 (Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88853
diff changeset
176 const unsigned char *saved_p = p;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
177
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
178 if (*p < 0x80 || ! (*p & 0x20) || ! (*p & 0x10))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
179 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
180 c = STRING_CHAR_ADVANCE (p);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
181 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
182 else if (! (*p & 0x08))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
183 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
184 c = ((((p)[0] & 0xF) << 18)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
185 | (((p)[1] & 0x3F) << 12)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
186 | (((p)[2] & 0x3F) << 6)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
187 | ((p)[3] & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
188 p += 4;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
189 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
190 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
191 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
192 c = ((((p)[1] & 0x3F) << 18)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
193 | (((p)[2] & 0x3F) << 12)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
194 | (((p)[3] & 0x3F) << 6)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
195 | ((p)[4] & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
196 p += 5;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
197 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
198
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
199 MAYBE_UNIFY_CHAR (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
200
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
201 if (len)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
202 *len = p - saved_p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
203 if (advanced)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
204 *advanced = p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
205 return c;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
206 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
207
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
208
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
209 /* Translate character C by translation table TABLE. If C is
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
210 negative, translate a character specified by CHARSET and CODE. If
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
211 no translation is found in TABLE, return the untranslated
89757
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
212 character. If TABLE is a list, elements are char tables. In this
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
213 case, translace C by all tables. */
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
214
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
215 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
216 translate_char (Lisp_Object table, int c)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
217 {
89757
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
218 if (CHAR_TABLE_P (table))
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
219 {
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
220 Lisp_Object ch;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
221
89757
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
222 ch = CHAR_TABLE_REF (table, c);
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
223 if (CHARACTERP (ch))
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
224 c = XINT (ch);
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
225 }
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
226 else
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
227 {
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
228 for (; CONSP (table); table = XCDR (table))
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
229 c = translate_char (XCAR (table), c);
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
230 }
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
231 return c;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
232 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
233
103740
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
234 /* Convert ASCII or 8-bit character C to unibyte. If C is none of
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
235 them, return (C & 0xFF).
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
236
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
237 The argument REV_TBL is now ignored. It will be removed in the
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
238 future. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
239
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
240 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
241 multibyte_char_to_unibyte (int c, Lisp_Object rev_tbl)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
242 {
103740
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
243 if (c < 0x80)
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
244 return c;
89054
8a6da305ac40 (unibyte_to_multibyte_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 89029
diff changeset
245 if (CHAR_BYTE8_P (c))
8a6da305ac40 (unibyte_to_multibyte_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 89029
diff changeset
246 return CHAR_TO_BYTE8 (c);
103740
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
247 return (c & 0xFF);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
248 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
249
90761
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
250 /* Like multibyte_char_to_unibyte, but return -1 if C is not supported
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
251 by charset_unibyte. */
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
252
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
253 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
254 multibyte_char_to_unibyte_safe (int c)
90761
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
255 {
103740
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
256 if (c < 0x80)
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
257 return c;
90761
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
258 if (CHAR_BYTE8_P (c))
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
259 return CHAR_TO_BYTE8 (c);
103740
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
260 return -1;
90761
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
261 }
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
262
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
263 DEFUN ("characterp", Fcharacterp, Scharacterp, 1, 2, 0,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
264 doc: /* Return non-nil if OBJECT is a character. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
265 (Lisp_Object object, Lisp_Object ignore)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
266 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
267 return (CHARACTERP (object) ? Qt : Qnil);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
268 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
269
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
270 DEFUN ("max-char", Fmax_char, Smax_char, 0, 0, 0,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
271 doc: /* Return the character of the maximum code. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
272 (void)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
273 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
274 return make_number (MAX_CHAR);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
275 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
276
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
277 DEFUN ("unibyte-char-to-multibyte", Funibyte_char_to_multibyte,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
278 Sunibyte_char_to_multibyte, 1, 1, 0,
94146
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
279 doc: /* Convert the byte CH to multibyte character. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
280 (Lisp_Object ch)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
281 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
282 int c;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
283
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
284 CHECK_CHARACTER (ch);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
285 c = XFASTINT (ch);
103740
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
286 if (c >= 0x100)
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
287 error ("Not a unibyte character: %d", c);
105661
bac26aa40069 Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103740
diff changeset
288 MAKE_CHAR_MULTIBYTE (c);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
289 return make_number (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
290 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
291
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
292 DEFUN ("multibyte-char-to-unibyte", Fmultibyte_char_to_unibyte,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
293 Smultibyte_char_to_unibyte, 1, 1, 0,
94146
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
294 doc: /* Convert the multibyte character CH to a byte.
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
295 If the multibyte character does not represent a byte, return -1. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
296 (Lisp_Object ch)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
297 {
94146
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
298 int cm;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
299
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
300 CHECK_CHARACTER (ch);
94146
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
301 cm = XFASTINT (ch);
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
302 if (cm < 256)
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
303 /* Can't distinguish a byte read from a unibyte buffer from
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
304 a latin1 char, so let's let it slide. */
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
305 return ch;
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
306 else
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
307 {
95856
f13a77e0e34f * character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
308 int cu = CHAR_TO_BYTE_SAFE (cm);
94146
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
309 return make_number (cu);
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
310 }
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
311 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
312
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
313 DEFUN ("char-width", Fchar_width, Schar_width, 1, 1, 0,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
314 doc: /* Return width of CHAR when displayed in the current buffer.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
315 The width is measured by how many columns it occupies on the screen.
94114
327f7207ff7e (Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents: 92499
diff changeset
316 Tab is taken to occupy `tab-width' columns.
327f7207ff7e (Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents: 92499
diff changeset
317 usage: (char-width CHAR) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
318 (Lisp_Object ch)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
319 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
320 Lisp_Object disp;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
321 int c, width;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
322 struct Lisp_Char_Table *dp = buffer_display_table ();
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
323
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
324 CHECK_CHARACTER (ch);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
325 c = XINT (ch);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
326
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
327 /* Get the way the display table would display it. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
328 disp = dp ? DISP_CHAR_VECTOR (dp, c) : Qnil;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
329
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
330 if (VECTORP (disp))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
331 width = ASIZE (disp);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
332 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
333 width = CHAR_WIDTH (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
334
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
335 return make_number (width);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
336 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
337
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
338 /* Return width of string STR of length LEN when displayed in the
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
339 current buffer. The width is measured by how many columns it
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
340 occupies on the screen. If PRECISION > 0, return the width of
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
341 longest substring that doesn't exceed PRECISION, and set number of
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
342 characters and bytes of the substring in *NCHARS and *NBYTES
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
343 respectively. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
344
110504
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
345 EMACS_INT
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
346 c_string_width (const unsigned char *str, EMACS_INT len, int precision,
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
347 EMACS_INT *nchars, EMACS_INT *nbytes)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
348 {
110504
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
349 EMACS_INT i = 0, i_byte = 0;
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
350 EMACS_INT width = 0;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
351 struct Lisp_Char_Table *dp = buffer_display_table ();
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
352
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
353 while (i_byte < len)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
354 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
355 int bytes, thiswidth;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
356 Lisp_Object val;
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
357 int c = STRING_CHAR_AND_LENGTH (str + i_byte, bytes);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
358
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
359 if (dp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
360 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
361 val = DISP_CHAR_VECTOR (dp, c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
362 if (VECTORP (val))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
363 thiswidth = XVECTOR (val)->size;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
364 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
365 thiswidth = CHAR_WIDTH (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
366 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
367 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
368 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
369 thiswidth = CHAR_WIDTH (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
370 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
371
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
372 if (precision > 0
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
373 && (width + thiswidth > precision))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
374 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
375 *nchars = i;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
376 *nbytes = i_byte;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
377 return width;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
378 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
379 i++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
380 i_byte += bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
381 width += thiswidth;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
382 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
383
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
384 if (precision > 0)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
385 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
386 *nchars = i;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
387 *nbytes = i_byte;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
388 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
389
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
390 return width;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
391 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
392
88427
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
393 /* Return width of string STR of length LEN when displayed in the
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
394 current buffer. The width is measured by how many columns it
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
395 occupies on the screen. */
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
396
110504
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
397 EMACS_INT
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
398 strwidth (const unsigned char *str, EMACS_INT len)
88427
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
399 {
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
400 return c_string_width (str, len, -1, NULL, NULL);
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
401 }
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
402
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
403 /* Return width of Lisp string STRING when displayed in the current
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
404 buffer. The width is measured by how many columns it occupies on
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
405 the screen while paying attention to compositions. If PRECISION >
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
406 0, return the width of longest substring that doesn't exceed
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
407 PRECISION, and set number of characters and bytes of the substring
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
408 in *NCHARS and *NBYTES respectively. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
409
110504
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
410 EMACS_INT
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
411 lisp_string_width (Lisp_Object string, int precision,
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
412 EMACS_INT *nchars, EMACS_INT *nbytes)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
413 {
110504
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
414 EMACS_INT len = SCHARS (string);
90256
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
415 /* This set multibyte to 0 even if STRING is multibyte when it
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
416 contains only ascii and eight-bit-graphic, but that's
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
417 intentional. */
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
418 int multibyte = len < SBYTES (string);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
419 unsigned char *str = SDATA (string);
110504
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
420 EMACS_INT i = 0, i_byte = 0;
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
421 EMACS_INT width = 0;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
422 struct Lisp_Char_Table *dp = buffer_display_table ();
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
423
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
424 while (i < len)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
425 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
426 int chars, bytes, thiswidth;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
427 Lisp_Object val;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
428 int cmp_id;
89511
bae1254b8517 (lisp_string_width): Make ignore and end EMACS_INT.
Dave Love <fx@gnu.org>
parents: 89483
diff changeset
429 EMACS_INT ignore, end;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
430
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
431 if (find_composition (i, -1, &ignore, &end, &val, string)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
432 && ((cmp_id = get_composition_id (i, i_byte, end - i, val, string))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
433 >= 0))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
434 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
435 thiswidth = composition_table[cmp_id]->width;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
436 chars = end - i;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
437 bytes = string_char_to_byte (string, end) - i_byte;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
438 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
439 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
440 {
90256
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
441 int c;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
442
90256
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
443 if (multibyte)
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
444 c = STRING_CHAR_AND_LENGTH (str + i_byte, bytes);
90256
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
445 else
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
446 c = str[i_byte], bytes = 1;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
447 chars = 1;
90256
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
448 if (dp)
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
449 {
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
450 val = DISP_CHAR_VECTOR (dp, c);
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
451 if (VECTORP (val))
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
452 thiswidth = XVECTOR (val)->size;
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
453 else
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
454 thiswidth = CHAR_WIDTH (c);
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
455 }
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
456 else
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
457 {
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
458 thiswidth = CHAR_WIDTH (c);
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
459 }
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
460 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
461
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
462 if (precision > 0
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
463 && (width + thiswidth > precision))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
464 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
465 *nchars = i;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
466 *nbytes = i_byte;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
467 return width;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
468 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
469 i += chars;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
470 i_byte += bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
471 width += thiswidth;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
472 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
473
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
474 if (precision > 0)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
475 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
476 *nchars = i;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
477 *nbytes = i_byte;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
478 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
479
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
480 return width;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
481 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
482
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
483 DEFUN ("string-width", Fstring_width, Sstring_width, 1, 1, 0,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
484 doc: /* Return width of STRING when displayed in the current buffer.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
485 Width is measured by how many columns it occupies on the screen.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
486 When calculating width of a multibyte character in STRING,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
487 only the base leading-code is considered; the validity of
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
488 the following bytes is not checked. Tabs in STRING are always
94114
327f7207ff7e (Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents: 92499
diff changeset
489 taken to occupy `tab-width' columns.
327f7207ff7e (Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents: 92499
diff changeset
490 usage: (string-width STRING) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
491 (Lisp_Object str)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
492 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
493 Lisp_Object val;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
494
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
495 CHECK_STRING (str);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
496 XSETFASTINT (val, lisp_string_width (str, -1, NULL, NULL));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
497 return val;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
498 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
499
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
500 DEFUN ("char-direction", Fchar_direction, Schar_direction, 1, 1, 0,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
501 doc: /* Return the direction of CHAR.
94114
327f7207ff7e (Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents: 92499
diff changeset
502 The returned value is 0 for left-to-right and 1 for right-to-left.
327f7207ff7e (Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents: 92499
diff changeset
503 usage: (char-direction CHAR) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
504 (Lisp_Object ch)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
505 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
506 int c;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
507
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
508 CHECK_CHARACTER (ch);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
509 c = XINT (ch);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
510 return CHAR_TABLE_REF (Vchar_direction_table, c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
511 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
512
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
513 /* Return the number of characters in the NBYTES bytes at PTR.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
514 This works by looking at the contents and checking for multibyte
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
515 sequences while assuming that there's no invalid sequence.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
516 However, if the current buffer has enable-multibyte-characters =
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
517 nil, we treat each byte as a character. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
518
91807
507bcfb4342c * coding.c (coding_set_destination): Use BEG_BYTE rather than hardcoding 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91443
diff changeset
519 EMACS_INT
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
520 chars_in_text (const unsigned char *ptr, EMACS_INT nbytes)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
521 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
522 /* current_buffer is null at early stages of Emacs initialization. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
523 if (current_buffer == 0
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
524 || NILP (current_buffer->enable_multibyte_characters))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
525 return nbytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
526
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
527 return multibyte_chars_in_text (ptr, nbytes);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
528 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
529
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
530 /* Return the number of characters in the NBYTES bytes at PTR.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
531 This works by looking at the contents and checking for multibyte
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
532 sequences while assuming that there's no invalid sequence. It
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
533 ignores enable-multibyte-characters. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
534
91807
507bcfb4342c * coding.c (coding_set_destination): Use BEG_BYTE rather than hardcoding 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91443
diff changeset
535 EMACS_INT
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
536 multibyte_chars_in_text (const unsigned char *ptr, EMACS_INT nbytes)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
537 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
538 const unsigned char *endp = ptr + nbytes;
110504
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
539 EMACS_INT chars = 0;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
540
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
541 while (ptr < endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
542 {
110504
0fdd992ff057 Fix more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 110503
diff changeset
543 EMACS_INT len = MULTIBYTE_LENGTH (ptr, endp);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
544
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
545 if (len == 0)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
546 abort ();
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
547 ptr += len;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
548 chars++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
549 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
550
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
551 return chars;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
552 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
553
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
554 /* Parse unibyte text at STR of LEN bytes as a multibyte text, count
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
555 characters and bytes in it, and store them in *NCHARS and *NBYTES
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
556 respectively. On counting bytes, pay attention to that 8-bit
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
557 characters not constructing a valid multibyte sequence are
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
558 represented by 2-byte in a multibyte text. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
559
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
560 void
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
561 parse_str_as_multibyte (const unsigned char *str, EMACS_INT len,
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
562 EMACS_INT *nchars, EMACS_INT *nbytes)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
563 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
564 const unsigned char *endp = str + len;
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
565 EMACS_INT n, chars = 0, bytes = 0;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
566
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
567 if (len >= MAX_MULTIBYTE_LENGTH)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
568 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
569 const unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
570 while (str < adjusted_endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
571 {
107314
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
572 if (! CHAR_BYTE8_HEAD_P (*str)
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
573 && (n = MULTIBYTE_LENGTH_NO_CHECK (str)) > 0)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
574 str += n, bytes += n;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
575 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
576 str++, bytes += 2;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
577 chars++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
578 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
579 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
580 while (str < endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
581 {
107314
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
582 if (! CHAR_BYTE8_HEAD_P (*str)
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
583 && (n = MULTIBYTE_LENGTH (str, endp)) > 0)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
584 str += n, bytes += n;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
585 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
586 str++, bytes += 2;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
587 chars++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
588 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
589
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
590 *nchars = chars;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
591 *nbytes = bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
592 return;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
593 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
594
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
595 /* Arrange unibyte text at STR of NBYTES bytes as a multibyte text.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
596 It actually converts only such 8-bit characters that don't contruct
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
597 a multibyte sequence to multibyte forms of Latin-1 characters. If
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
598 NCHARS is nonzero, set *NCHARS to the number of characters in the
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
599 text. It is assured that we can use LEN bytes at STR as a work
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
600 area and that is enough. Return the number of bytes of the
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
601 resulting text. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
602
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
603 EMACS_INT
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
604 str_as_multibyte (unsigned char *str, EMACS_INT len, EMACS_INT nbytes,
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
605 EMACS_INT *nchars)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
606 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
607 unsigned char *p = str, *endp = str + nbytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
608 unsigned char *to;
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
609 EMACS_INT chars = 0;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
610 int n;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
611
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
612 if (nbytes >= MAX_MULTIBYTE_LENGTH)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
613 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
614 unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
615 while (p < adjusted_endp
107314
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
616 && ! CHAR_BYTE8_HEAD_P (*p)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
617 && (n = MULTIBYTE_LENGTH_NO_CHECK (p)) > 0)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
618 p += n, chars++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
619 }
107314
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
620 while (p < endp
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
621 && ! CHAR_BYTE8_HEAD_P (*p)
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
622 && (n = MULTIBYTE_LENGTH (p, endp)) > 0)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
623 p += n, chars++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
624 if (nchars)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
625 *nchars = chars;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
626 if (p == endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
627 return nbytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
628
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
629 to = p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
630 nbytes = endp - p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
631 endp = str + len;
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
632 memmove (endp - nbytes, p, nbytes);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
633 p = endp - nbytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
634
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
635 if (nbytes >= MAX_MULTIBYTE_LENGTH)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
636 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
637 unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
638 while (p < adjusted_endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
639 {
107314
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
640 if (! CHAR_BYTE8_HEAD_P (*p)
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
641 && (n = MULTIBYTE_LENGTH_NO_CHECK (p)) > 0)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
642 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
643 while (n--)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
644 *to++ = *p++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
645 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
646 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
647 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
648 int c = *p++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
649 c = BYTE8_TO_CHAR (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
650 to += CHAR_STRING (c, to);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
651 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
652 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
653 chars++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
654 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
655 while (p < endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
656 {
107314
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
657 if (! CHAR_BYTE8_HEAD_P (*p)
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
658 && (n = MULTIBYTE_LENGTH (p, endp)) > 0)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
659 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
660 while (n--)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
661 *to++ = *p++;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
662 }
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
663 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
664 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
665 int c = *p++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
666 c = BYTE8_TO_CHAR (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
667 to += CHAR_STRING (c, to);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
668 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
669 chars++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
670 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
671 if (nchars)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
672 *nchars = chars;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
673 return (to - str);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
674 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
675
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
676 /* Parse unibyte string at STR of LEN bytes, and return the number of
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
677 bytes it may ocupy when converted to multibyte string by
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
678 `str_to_multibyte'. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
679
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
680 EMACS_INT
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
681 parse_str_to_multibyte (const unsigned char *str, EMACS_INT len)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
682 {
109555
05e7e7c46ff0 Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109179
diff changeset
683 const unsigned char *endp = str + len;
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
684 EMACS_INT bytes;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
685
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
686 for (bytes = 0; str < endp; str++)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
687 bytes += (*str < 0x80) ? 1 : 2;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
688 return bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
689 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
690
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
691
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
692 /* Convert unibyte text at STR of NBYTES bytes to a multibyte text
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
693 that contains the same single-byte characters. It actually
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
694 converts all 8-bit characters to multibyte forms. It is assured
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
695 that we can use LEN bytes at STR as a work area and that is
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
696 enough. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
697
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
698 EMACS_INT
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
699 str_to_multibyte (unsigned char *str, EMACS_INT len, EMACS_INT bytes)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
700 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
701 unsigned char *p = str, *endp = str + bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
702 unsigned char *to;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
703
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
704 while (p < endp && *p < 0x80) p++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
705 if (p == endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
706 return bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
707 to = p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
708 bytes = endp - p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
709 endp = str + len;
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
710 memmove (endp - bytes, p, bytes);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
711 p = endp - bytes;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
712 while (p < endp)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
713 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
714 int c = *p++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
715
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
716 if (c >= 0x80)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
717 c = BYTE8_TO_CHAR (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
718 to += CHAR_STRING (c, to);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
719 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
720 return (to - str);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
721 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
722
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
723 /* Arrange multibyte text at STR of LEN bytes as a unibyte text. It
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
724 actually converts characters in the range 0x80..0xFF to
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
725 unibyte. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
726
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
727 EMACS_INT
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
728 str_as_unibyte (unsigned char *str, EMACS_INT bytes)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
729 {
88878
a0ae1a5876c7 (Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88853
diff changeset
730 const unsigned char *p = str, *endp = str + bytes;
a0ae1a5876c7 (Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88853
diff changeset
731 unsigned char *to;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
732 int c, len;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
733
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
734 while (p < endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
735 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
736 c = *p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
737 len = BYTES_BY_CHAR_HEAD (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
738 if (CHAR_BYTE8_HEAD_P (c))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
739 break;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
740 p += len;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
741 }
88878
a0ae1a5876c7 (Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88853
diff changeset
742 to = str + (p - str);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
743 while (p < endp)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
744 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
745 c = *p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
746 len = BYTES_BY_CHAR_HEAD (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
747 if (CHAR_BYTE8_HEAD_P (c))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
748 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
749 c = STRING_CHAR_ADVANCE (p);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
750 *to++ = CHAR_TO_BYTE8 (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
751 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
752 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
753 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
754 while (len--) *to++ = *p++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
755 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
756 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
757 return (to - str);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
758 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
759
96249
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
760 /* Convert eight-bit chars in SRC (in multibyte form) to the
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
761 corresponding byte and store in DST. CHARS is the number of
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
762 characters in SRC. The value is the number of bytes stored in DST.
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
763 Usually, the value is the same as CHARS, but is less than it if SRC
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
764 contains a non-ASCII, non-eight-bit characater. If ACCEPT_LATIN_1
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
765 is nonzero, a Latin-1 character is accepted and converted to a byte
96501
919775e9f3bf (str_to_unibyte): Modify the comment.
Kenichi Handa <handa@m17n.org>
parents: 96249
diff changeset
766 of that character code.
919775e9f3bf (str_to_unibyte): Modify the comment.
Kenichi Handa <handa@m17n.org>
parents: 96249
diff changeset
767 Note: Currently the arg ACCEPT_LATIN_1 is not used. */
96249
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
768
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
769 EMACS_INT
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
770 str_to_unibyte (const unsigned char *src, unsigned char *dst, EMACS_INT chars, int accept_latin_1)
96249
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
771 {
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
772 EMACS_INT i;
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
773
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
774 for (i = 0; i < chars; i++)
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
775 {
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
776 int c = STRING_CHAR_ADVANCE (src);
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
777
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
778 if (CHAR_BYTE8_P (c))
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
779 c = CHAR_TO_BYTE8 (c);
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
780 else if (! ASCII_CHAR_P (c)
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
781 && (! accept_latin_1 || c >= 0x100))
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
782 return i;
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
783 *dst++ = c;
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
784 }
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
785 return i;
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
786 }
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
787
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
788
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
789 EMACS_INT
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
790 string_count_byte8 (Lisp_Object string)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
791 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
792 int multibyte = STRING_MULTIBYTE (string);
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
793 EMACS_INT nbytes = SBYTES (string);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
794 unsigned char *p = SDATA (string);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
795 unsigned char *pend = p + nbytes;
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
796 EMACS_INT count = 0;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
797 int c, len;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
798
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
799 if (multibyte)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
800 while (p < pend)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
801 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
802 c = *p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
803 len = BYTES_BY_CHAR_HEAD (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
804
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
805 if (CHAR_BYTE8_HEAD_P (c))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
806 count++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
807 p += len;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
808 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
809 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
810 while (p < pend)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
811 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
812 if (*p++ >= 0x80)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
813 count++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
814 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
815 return count;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
816 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
817
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
818
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
819 Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
820 string_escape_byte8 (Lisp_Object string)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
821 {
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
822 EMACS_INT nchars = SCHARS (string);
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
823 EMACS_INT nbytes = SBYTES (string);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
824 int multibyte = STRING_MULTIBYTE (string);
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
825 EMACS_INT byte8_count;
88878
a0ae1a5876c7 (Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88853
diff changeset
826 const unsigned char *src, *src_end;
a0ae1a5876c7 (Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88853
diff changeset
827 unsigned char *dst;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
828 Lisp_Object val;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
829 int c, len;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
830
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
831 if (multibyte && nchars == nbytes)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
832 return string;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
833
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
834 byte8_count = string_count_byte8 (string);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
835
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
836 if (byte8_count == 0)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
837 return string;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
838
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
839 if (multibyte)
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
840 {
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
841 if ((MOST_POSITIVE_FIXNUM - nchars) / 3 < byte8_count
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
842 || (MOST_POSITIVE_FIXNUM - nbytes) / 2 < byte8_count)
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
843 error ("Maximum string size exceeded");
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
844
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
845 /* Convert 2-byte sequence of byte8 chars to 4-byte octal. */
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
846 val = make_uninit_multibyte_string (nchars + byte8_count * 3,
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
847 nbytes + byte8_count * 2);
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
848 }
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
849 else
110503
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
850 {
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
851 if ((MOST_POSITIVE_FIXNUM - nchars) / 3 < byte8_count)
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
852 error ("Maximum string size exceeded");
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
853 /* Convert 1-byte sequence of byte8 chars to 4-byte octal. */
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
854 val = make_uninit_string (nbytes + byte8_count * 3);
fda36a325177 Fix some more uses of int instead of EMACS_INT.
Eli Zaretskii <eliz@gnu.org>
parents: 109555
diff changeset
855 }
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
856
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
857 src = SDATA (string);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
858 src_end = src + nbytes;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
859 dst = SDATA (val);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
860 if (multibyte)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
861 while (src < src_end)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
862 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
863 c = *src;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
864 len = BYTES_BY_CHAR_HEAD (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
865
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
866 if (CHAR_BYTE8_HEAD_P (c))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
867 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
868 c = STRING_CHAR_ADVANCE (src);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
869 c = CHAR_TO_BYTE8 (c);
88427
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
870 sprintf ((char *) dst, "\\%03o", c);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
871 dst += 4;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
872 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
873 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
874 while (len--) *dst++ = *src++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
875 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
876 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
877 while (src < src_end)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
878 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
879 c = *src++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
880 if (c >= 0x80)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
881 {
88427
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
882 sprintf ((char *) dst, "\\%03o", c);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
883 dst += 4;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
884 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
885 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
886 *dst++ = c;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
887 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
888 return val;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
889 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
890
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
891
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
892 DEFUN ("string", Fstring, Sstring, 0, MANY, 0,
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
893 doc: /*
88640
90a6e8c61273 (Fstring): Doc fix.
Dave Love <fx@gnu.org>
parents: 88526
diff changeset
894 Concatenate all the argument characters and make the result a string.
90a6e8c61273 (Fstring): Doc fix.
Dave Love <fx@gnu.org>
parents: 88526
diff changeset
895 usage: (string &rest CHARACTERS) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
896 (int n, Lisp_Object *args)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
897 {
108650
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
898 int i, c;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
899 unsigned char *buf, *p;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
900 Lisp_Object str;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
901 USE_SAFE_ALLOCA;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
902
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
903 SAFE_ALLOCA (buf, unsigned char *, MAX_MULTIBYTE_LENGTH * n);
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
904 p = buf;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
905
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
906 for (i = 0; i < n; i++)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
907 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
908 CHECK_CHARACTER (args[i]);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
909 c = XINT (args[i]);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
910 p += CHAR_STRING (c, p);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
911 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
912
108650
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
913 str = make_string_from_bytes ((char *) buf, n, p - buf);
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
914 SAFE_FREE ();
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
915 return str;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
916 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
917
90841
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
918 DEFUN ("unibyte-string", Funibyte_string, Sunibyte_string, 0, MANY, 0,
90942
ba60bd18bc0b (Funibyte_string): Add "usage: ..." to the docstring.
Kenichi Handa <handa@m17n.org>
parents: 90841
diff changeset
919 doc: /* Concatenate all the argument bytes and make the result a unibyte string.
ba60bd18bc0b (Funibyte_string): Add "usage: ..." to the docstring.
Kenichi Handa <handa@m17n.org>
parents: 90841
diff changeset
920 usage: (unibyte-string &rest BYTES) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
921 (int n, Lisp_Object *args)
90841
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
922 {
108650
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
923 int i, c;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
924 unsigned char *buf, *p;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
925 Lisp_Object str;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
926 USE_SAFE_ALLOCA;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
927
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
928 SAFE_ALLOCA (buf, unsigned char *, n);
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
929 p = buf;
90841
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
930
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
931 for (i = 0; i < n; i++)
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
932 {
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
933 CHECK_NATNUM (args[i]);
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
934 c = XFASTINT (args[i]);
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
935 if (c >= 256)
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
936 args_out_of_range_3 (args[i], make_number (0), make_number (255));
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
937 *p++ = c;
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
938 }
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
939
108650
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
940 str = make_string_from_bytes ((char *) buf, n, p - buf);
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
941 SAFE_FREE ();
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
942 return str;
90841
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
943 }
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
944
98380
c3d306455ee9 (Fchar_resolve_modifiers): Rewrite Elisp function
Martin Rudalics <rudalics@gmx.at>
parents: 97907
diff changeset
945 DEFUN ("char-resolve-modifiers", Fchar_resolve_modifiers,
92494
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
946 Schar_resolve_modifiers, 1, 1, 0,
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
947 doc: /* Resolve modifiers in the character CHAR.
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
948 The value is a character with modifiers resolved into the character
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
949 code. Unresolved modifiers are kept in the value.
98380
c3d306455ee9 (Fchar_resolve_modifiers): Rewrite Elisp function
Martin Rudalics <rudalics@gmx.at>
parents: 97907
diff changeset
950 usage: (char-resolve-modifiers CHAR) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
951 (Lisp_Object character)
92494
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
952 {
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
953 int c;
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
954
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
955 CHECK_NUMBER (character);
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
956 c = XINT (character);
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
957 return make_number (char_resolve_modifier_mask (c));
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
958 }
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
959
99453
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
960 DEFUN ("get-byte", Fget_byte, Sget_byte, 0, 2, 0,
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
961 doc: /* Return a byte value of a character at point.
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
962 Optional 1st arg POSITION, if non-nil, is a position of a character to get
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
963 a byte value.
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
964 Optional 2nd arg STRING, if non-nil, is a string of which first
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
965 character is a target to get a byte value. In this case, POSITION, if
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
966 non-nil, is an index of a target character in the string.
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
967
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
968 If the current buffer (or STRING) is multibyte, and the target
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
969 character is not ASCII nor 8-bit character, an error is signalled. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
970 (Lisp_Object position, Lisp_Object string)
99453
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
971 {
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
972 int c;
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
973 EMACS_INT pos;
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
974 unsigned char *p;
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
975
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
976 if (NILP (string))
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
977 {
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
978 if (NILP (position))
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
979 {
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
980 p = PT_ADDR;
101818
86b3f8ddbaee * character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents: 101805
diff changeset
981 }
99453
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
982 else
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
983 {
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
984 CHECK_NUMBER_COERCE_MARKER (position);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
985 if (XINT (position) < BEGV || XINT (position) >= ZV)
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
986 args_out_of_range_3 (position, make_number (BEGV), make_number (ZV));
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
987 pos = XFASTINT (position);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
988 p = CHAR_POS_ADDR (pos);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
989 }
99475
98e08333a580 (Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents: 99453
diff changeset
990 if (NILP (current_buffer->enable_multibyte_characters))
98e08333a580 (Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents: 99453
diff changeset
991 return make_number (*p);
99453
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
992 }
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
993 else
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
994 {
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
995 CHECK_STRING (string);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
996 if (NILP (position))
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
997 {
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
998 p = SDATA (string);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
999 }
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1000 else
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1001 {
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1002 CHECK_NATNUM (position);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1003 if (XINT (position) >= SCHARS (string))
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1004 args_out_of_range (string, position);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1005 pos = XFASTINT (position);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1006 p = SDATA (string) + string_char_to_byte (string, pos);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1007 }
99475
98e08333a580 (Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents: 99453
diff changeset
1008 if (! STRING_MULTIBYTE (string))
98e08333a580 (Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents: 99453
diff changeset
1009 return make_number (*p);
99453
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1010 }
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
1011 c = STRING_CHAR (p);
99453
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1012 if (CHAR_BYTE8_P (c))
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1013 c = CHAR_TO_BYTE8 (c);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1014 else if (! ASCII_CHAR_P (c))
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1015 error ("Not an ASCII nor an 8-bit character: %d", c);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1016 return make_number (c);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1017 }
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1018
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1019
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1020 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
1021 init_character_once (void)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1022 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1023 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1024
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1025 #ifdef emacs
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1026
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1027 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
1028 syms_of_character (void)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1029 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1030 DEFSYM (Qcharacterp, "characterp");
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1031 DEFSYM (Qauto_fill_chars, "auto-fill-chars");
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1032
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1033 staticpro (&Vchar_unify_table);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1034 Vchar_unify_table = Qnil;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1035
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1036 defsubr (&Smax_char);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1037 defsubr (&Scharacterp);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1038 defsubr (&Sunibyte_char_to_multibyte);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1039 defsubr (&Smultibyte_char_to_unibyte);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1040 defsubr (&Schar_width);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1041 defsubr (&Sstring_width);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1042 defsubr (&Schar_direction);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1043 defsubr (&Sstring);
90841
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
1044 defsubr (&Sunibyte_string);
92494
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
1045 defsubr (&Schar_resolve_modifiers);
99453
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1046 defsubr (&Sget_byte);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1047
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112278
diff changeset
1048 DEFVAR_LISP ("translation-table-vector", Vtranslation_table_vector,
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1049 doc: /*
88926
f026b7e4fc61 (syms_of_character) <translation-table-vector>: Doc
Dave Love <fx@gnu.org>
parents: 88913
diff changeset
1050 Vector recording all translation tables ever defined.
f026b7e4fc61 (syms_of_character) <translation-table-vector>: Doc
Dave Love <fx@gnu.org>
parents: 88913
diff changeset
1051 Each element is a pair (SYMBOL . TABLE) relating the table to the
f026b7e4fc61 (syms_of_character) <translation-table-vector>: Doc
Dave Love <fx@gnu.org>
parents: 88913
diff changeset
1052 symbol naming it. The ID of a translation table is an index into this vector. */);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1053 Vtranslation_table_vector = Fmake_vector (make_number (16), Qnil);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1054
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112278
diff changeset
1055 DEFVAR_LISP ("auto-fill-chars", Vauto_fill_chars,
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1056 doc: /*
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1057 A char-table for characters which invoke auto-filling.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1058 Such characters have value t in this table. */);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1059 Vauto_fill_chars = Fmake_char_table (Qauto_fill_chars, Qnil);
88853
503c60238368 (syms_of_character): Fix CHAR_TABLE_SET call.
Dave Love <fx@gnu.org>
parents: 88743
diff changeset
1060 CHAR_TABLE_SET (Vauto_fill_chars, ' ', Qt);
503c60238368 (syms_of_character): Fix CHAR_TABLE_SET call.
Dave Love <fx@gnu.org>
parents: 88743
diff changeset
1061 CHAR_TABLE_SET (Vauto_fill_chars, '\n', Qt);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1062
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112278
diff changeset
1063 DEFVAR_LISP ("char-width-table", Vchar_width_table,
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1064 doc: /*
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1065 A char-table for width (columns) of each character. */);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1066 Vchar_width_table = Fmake_char_table (Qnil, make_number (1));
88743
4570f1a4c391 (syms_of_character): Setup Vchar_width_table for
Kenichi Handa <handa@m17n.org>
parents: 88716
diff changeset
1067 char_table_set_range (Vchar_width_table, 0x80, 0x9F, make_number (4));
4570f1a4c391 (syms_of_character): Setup Vchar_width_table for
Kenichi Handa <handa@m17n.org>
parents: 88716
diff changeset
1068 char_table_set_range (Vchar_width_table, MAX_5_BYTE_CHAR + 1, MAX_CHAR,
4570f1a4c391 (syms_of_character): Setup Vchar_width_table for
Kenichi Handa <handa@m17n.org>
parents: 88716
diff changeset
1069 make_number (4));
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1070
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112278
diff changeset
1071 DEFVAR_LISP ("char-direction-table", Vchar_direction_table,
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1072 doc: /* A char-table for direction of each character. */);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1073 Vchar_direction_table = Fmake_char_table (Qnil, make_number (1));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1074
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112278
diff changeset
1075 DEFVAR_LISP ("printable-chars", Vprintable_chars,
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1076 doc: /* A char-table for each printable character. */);
88716
f617b1bf301b (syms_of_character): Set the default value of
Kenichi Handa <handa@m17n.org>
parents: 88640
diff changeset
1077 Vprintable_chars = Fmake_char_table (Qnil, Qnil);
89029
ad8f56efa7c6 (syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents: 89020
diff changeset
1078 Fset_char_table_range (Vprintable_chars,
ad8f56efa7c6 (syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents: 89020
diff changeset
1079 Fcons (make_number (32), make_number (126)), Qt);
ad8f56efa7c6 (syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents: 89020
diff changeset
1080 Fset_char_table_range (Vprintable_chars,
ad8f56efa7c6 (syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents: 89020
diff changeset
1081 Fcons (make_number (160),
ad8f56efa7c6 (syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents: 89020
diff changeset
1082 make_number (MAX_5_BYTE_CHAR)), Qt);
88878
a0ae1a5876c7 (Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88853
diff changeset
1083
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112278
diff changeset
1084 DEFVAR_LISP ("char-script-table", Vchar_script_table,
88913
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1085 doc: /* Char table of script symbols.
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1086 It has one extra slot whose value is a list of script symbols. */);
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1087
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1088 /* Intern this now in case it isn't already done.
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1089 Setting this variable twice is harmless.
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1090 But don't staticpro it here--that is done in alloc.c. */
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105688
diff changeset
1091 Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");
88913
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1092 DEFSYM (Qchar_script_table, "char-script-table");
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1093 Fput (Qchar_script_table, Qchar_table_extra_slots, make_number (1));
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1094 Vchar_script_table = Fmake_char_table (Qchar_script_table, Qnil);
90403
81f1bbab281f (Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents: 90256
diff changeset
1095
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112278
diff changeset
1096 DEFVAR_LISP ("script-representative-chars", Vscript_representative_chars,
97907
3a2d65dc9abc (syms_of_character): Docstring of script-representative-chars fixed.
Kenichi Handa <handa@m17n.org>
parents: 97816
diff changeset
1097 doc: /* Alist of scripts vs the representative characters.
101805
b416b80570f8 (Vscript_representative_chars): Docstring modified.
Kenichi Handa <handa@m17n.org>
parents: 100951
diff changeset
1098 Each element is a cons (SCRIPT . CHARS).
101818
86b3f8ddbaee * character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents: 101805
diff changeset
1099 SCRIPT is a symbol representing a script or a subgroup of a script.
97907
3a2d65dc9abc (syms_of_character): Docstring of script-representative-chars fixed.
Kenichi Handa <handa@m17n.org>
parents: 97816
diff changeset
1100 CHARS is a list or a vector of characters.
99079
ffe8b1e92732 * character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents: 98380
diff changeset
1101 If it is a list, all characters in the list are necessary for supporting SCRIPT.
97907
3a2d65dc9abc (syms_of_character): Docstring of script-representative-chars fixed.
Kenichi Handa <handa@m17n.org>
parents: 97816
diff changeset
1102 If it is a vector, one of the characters in the vector is necessary.
3a2d65dc9abc (syms_of_character): Docstring of script-representative-chars fixed.
Kenichi Handa <handa@m17n.org>
parents: 97816
diff changeset
1103 This variable is used to find a font for a specific script. */);
90403
81f1bbab281f (Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents: 90256
diff changeset
1104 Vscript_representative_chars = Qnil;
97816
9999d9194509 (Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 96501
diff changeset
1105
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112278
diff changeset
1106 DEFVAR_LISP ("unicode-category-table", Vunicode_category_table,
97816
9999d9194509 (Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 96501
diff changeset
1107 doc: /* Char table of Unicode's "General Category".
99079
ffe8b1e92732 * character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents: 98380
diff changeset
1108 All Unicode characters have one of the following values (symbol):
ffe8b1e92732 * character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents: 98380
diff changeset
1109 Lu, Ll, Lt, Lm, Lo, Mn, Mc, Me, Nd, Nl, No, Pc, Pd, Ps, Pe, Pi, Pf, Po,
97816
9999d9194509 (Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 96501
diff changeset
1110 Sm, Sc, Sk, So, Zs, Zl, Zp, Cc, Cf, Cs, Co, Cn
9999d9194509 (Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 96501
diff changeset
1111 See The Unicode Standard for the meaning of those values. */);
9999d9194509 (Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 96501
diff changeset
1112 /* The correct char-table is setup in characters.el. */
9999d9194509 (Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 96501
diff changeset
1113 Vunicode_category_table = Qnil;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1114 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1115
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1116 #endif /* emacs */
89911
cce857c68ba2 Add arch taglines
Miles Bader <miles@gnu.org>
parents: 89888
diff changeset
1117