Mercurial > hg > xemacs-beta
annotate lisp/mule/mule-category.el @ 4981:4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_lo_import):
* postgresql/postgresql.c (Fpq_lo_export):
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* ldap/eldap.c (Fldap_add):
* ldap/eldap.c (Fldap_modify):
* ldap/eldap.c (Fldap_delete):
* canna/canna_api.c (Fcanna_initialize):
* canna/canna_api.c (Fcanna_store_yomi):
* canna/canna_api.c (Fcanna_parse):
* canna/canna_api.c (Fcanna_henkan_begin):
EXTERNAL_TO_C_STRING returns its argument instead of storing it
in a parameter, and is renamed to EXTERNAL_TO_ITEXT. Similar
things happen to related macros. See entry in src/ChangeLog.
More Mule-izing of postgresql.c. Extract out common code
between `pq-connectdb' and `pq-connect-start'. Fix places
that signal an error string using a formatted string to instead
follow the standard and have a fixed reason followed by the
particular error message stored as one of the frobs.
src/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.c (Fmswindows_message_box):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* console.c:
* database.c (dbm_get):
* database.c (dbm_put):
* database.c (dbm_remove):
* database.c (berkdb_get):
* database.c (berkdb_put):
* database.c (berkdb_remove):
* database.c (Fopen_database):
* device-gtk.c (gtk_init_device):
* device-msw.c (msprinter_init_device_internal):
* device-msw.c (msprinter_default_printer):
* device-msw.c (msprinter_init_device):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (Fmsprinter_select_settings):
* device-x.c (sanity_check_geometry_resource):
* device-x.c (Dynarr_add_validified_lisp_string):
* device-x.c (x_init_device):
* device-x.c (Fx_put_resource):
* device-x.c (Fx_valid_keysym_name_p):
* device-x.c (Fx_set_font_path):
* dialog-msw.c (push_lisp_string_as_unicode):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-x.c (dbox_descriptor_to_widget_value):
* editfns.c (Fformat_time_string):
* editfns.c (Fencode_time):
* editfns.c (Fset_time_zone_rule):
* emacs.c (make_argc_argv):
* emacs.c (Fdump_emacs):
* emodules.c (emodules_load):
* eval.c:
* eval.c (maybe_signal_error_1):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* fileio.c (report_error_with_errno):
* fileio.c (Fsysnetunam):
* fileio.c (Fdo_auto_save):
* font-mgr.c (extract_fcapi_string):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_filename):
* frame-gtk.c (gtk_set_frame_text_value):
* frame-gtk.c (gtk_create_widgets):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_title_from_ibyte):
* frame-msw.c (msprinter_init_frame_3):
* frame-x.c (x_set_frame_text_value):
* frame-x.c (x_set_frame_properties):
* frame-x.c (start_drag_internal_1):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (x_create_widgets):
* glyphs-eimage.c (my_jpeg_output_message):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (gif_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (xbm_instantiate_1):
* glyphs-gtk.c (gtk_xbm_instantiate):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.c (gtk_xface_instantiate):
* glyphs-gtk.c (cursor_font_instantiate):
* glyphs-gtk.c (gtk_redisplay_widget):
* glyphs-gtk.c (gtk_widget_instantiate_1):
* glyphs-gtk.c (gtk_add_tab_item):
* glyphs-msw.c (mswindows_xpm_instantiate):
* glyphs-msw.c (bmp_instantiate):
* glyphs-msw.c (mswindows_resource_instantiate):
* glyphs-msw.c (xbm_instantiate_1):
* glyphs-msw.c (mswindows_xbm_instantiate):
* glyphs-msw.c (mswindows_xface_instantiate):
* glyphs-msw.c (mswindows_redisplay_widget):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-msw.c (add_tree_item):
* glyphs-msw.c (add_tab_item):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-msw.c (mswindows_widget_query_string_geometry):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (xbm_instantiate_1):
* glyphs-x.c (x_xbm_instantiate):
* glyphs-x.c (extract_xpm_color_names):
* glyphs-x.c (x_xpm_instantiate):
* glyphs-x.c (x_xface_instantiate):
* glyphs-x.c (autodetect_instantiate):
* glyphs-x.c (safe_XLoadFont):
* glyphs-x.c (cursor_font_instantiate):
* glyphs-x.c (x_redisplay_widget):
* glyphs-x.c (Fchange_subwindow_property):
* glyphs-x.c (x_widget_instantiate):
* glyphs-x.c (x_tab_control_redisplay):
* glyphs.c (pixmap_to_lisp_data):
* gui-x.c (menu_separator_style_and_to_external):
* gui-x.c (add_accel_and_to_external):
* gui-x.c (button_item_to_widget_value):
* hpplay.c (player_error_internal):
* hpplay.c (play_sound_file):
* hpplay.c (play_sound_data):
* intl.c (Fset_current_locale):
* lisp.h:
* menubar-gtk.c (gtk_xemacs_set_accel_keys):
* menubar-msw.c (populate_menu_add_item):
* menubar-msw.c (populate_or_checksum_helper):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* nt.c (init_user_info):
* nt.c (get_long_basename):
* nt.c (nt_get_resource):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_readdir):
* nt.c (read_unc_volume):
* nt.c (mswindows_stat):
* nt.c (mswindows_getdcwd):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* ntplay.c (nt_play_sound_file):
* objects-gtk.c:
* objects-gtk.c (gtk_valid_color_name_p):
* objects-gtk.c (gtk_initialize_font_instance):
* objects-gtk.c (gtk_font_list):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (parse_font_spec):
* objects-x.c (x_parse_nearest_color):
* objects-x.c (x_valid_color_name_p):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_list):
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-nt.c (nt_open_network_stream):
* process-unix.c:
* process-unix.c (allocate_pty):
* process-unix.c (get_internet_address):
* process-unix.c (unix_canonicalize_host_name):
* process-unix.c (unix_open_network_stream):
* realpath.c:
* select-common.h (lisp_data_to_selection_data):
* select-gtk.c (symbol_to_gtk_atom):
* select-gtk.c (atom_to_symbol):
* select-msw.c (symbol_to_ms_cf):
* select-msw.c (mswindows_register_selection_data_type):
* select-x.c (symbol_to_x_atom):
* select-x.c (x_atom_to_symbol):
* select-x.c (hack_motif_clipboard_selection):
* select-x.c (Fx_store_cutbuffer_internal):
* sound.c (Fplay_sound_file):
* sound.c (Fplay_sound):
* sound.h (sound_perror):
* sysdep.c:
* sysdep.c (qxe_allocating_getcwd):
* sysdep.c (qxe_execve):
* sysdep.c (copy_in_passwd):
* sysdep.c (qxe_getpwnam):
* sysdep.c (qxe_ctime):
* sysdll.c (dll_open):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (search_linked_libs):
* sysdll.c (dll_error):
* sysfile.h:
* sysfile.h (PATHNAME_CONVERT_OUT_TSTR):
* sysfile.h (PATHNAME_CONVERT_OUT_UTF_8):
* sysfile.h (PATHNAME_CONVERT_OUT):
* sysfile.h (LISP_PATHNAME_CONVERT_OUT):
* syswindows.h (ITEXT_TO_TSTR):
* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
* syswindows.h (TSTR_TO_LOCAL_FILE_FORMAT):
* syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN):
* syswindows.h (LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR):
* text.h:
* text.h (eicpy_ext_len):
* text.h (enum new_dfc_src_type):
* text.h (EXTERNAL_TO_ITEXT):
* text.h (GET_STRERROR):
* tooltalk.c (check_status):
* tooltalk.c (Fadd_tooltalk_message_arg):
* tooltalk.c (Fadd_tooltalk_pattern_attribute):
* tooltalk.c (Fadd_tooltalk_pattern_arg):
* win32.c (tstr_to_local_file_format):
* win32.c (mswindows_lisp_error_1):
* win32.c (mswindows_report_process_error):
* win32.c (Fmswindows_shell_execute):
* win32.c (mswindows_read_link_1):
Changes involving external/internal format conversion,
mostly code cleanup and renaming.
1. Eliminate the previous macros like LISP_STRING_TO_EXTERNAL
that stored its result in a parameter. The new version of
LISP_STRING_TO_EXTERNAL returns its result through the
return value, same as the previous NEW_LISP_STRING_TO_EXTERNAL.
Use the new-style macros throughout the code.
2. Rename C_STRING_TO_EXTERNAL and friends to ITEXT_TO_EXTERNAL,
in keeping with overall naming rationalization involving
Itext and related types.
Macros involved in previous two:
EXTERNAL_TO_C_STRING -> EXTERNAL_TO_ITEXT
EXTERNAL_TO_C_STRING_MALLOC -> EXTERNAL_TO_ITEXT_MALLOC
SIZED_EXTERNAL_TO_C_STRING -> SIZED_EXTERNAL_TO_ITEXT
SIZED_EXTERNAL_TO_C_STRING_MALLOC -> SIZED_EXTERNAL_TO_ITEXT_MALLOC
C_STRING_TO_EXTERNAL -> ITEXT_TO_EXTERNAL
C_STRING_TO_EXTERNAL_MALLOC -> ITEXT_TO_EXTERNAL_MALLOC
LISP_STRING_TO_EXTERNAL
LISP_STRING_TO_EXTERNAL_MALLOC
LISP_STRING_TO_TSTR
C_STRING_TO_TSTR -> ITEXT_TO_TSTR
TSTR_TO_C_STRING -> TSTR_TO_ITEXT
The following four still return their values through parameters,
since they have more than one value to return:
C_STRING_TO_SIZED_EXTERNAL -> ITEXT_TO_SIZED_EXTERNAL
LISP_STRING_TO_SIZED_EXTERNAL
C_STRING_TO_SIZED_EXTERNAL_MALLOC -> ITEXT_TO_SIZED_EXTERNAL_MALLOC
LISP_STRING_TO_SIZED_EXTERNAL_MALLOC
Sometimes additional casts had to be inserted, since the old
macros played strange games and completely defeated the type system
of the store params.
3. Rewrite many places where direct calls to TO_EXTERNAL_FORMAT
occurred with calls to one of the convenience macros listed above,
or to make_extstring().
4. Eliminate SIZED_C_STRING macros (they were hardly used, anyway)
and use a direct call to TO_EXTERNAL_FORMAT or TO_INTERNAL_FORMAT.
4. Use LISP_PATHNAME_CONVERT_OUT in many places instead of something
like LISP_STRING_TO_EXTERNAL(..., Qfile_name).
5. Eliminate some temporary variables that are no longer necessary
now that we return a value rather than storing it into a variable.
6. Some Mule-izing in database.c.
7. Error functions:
-- A bit of code cleanup in maybe_signal_error_1.
-- Eliminate report_file_type_error; it's just an alias for
signal_error_2 with params in a different order.
-- Fix some places in the hostname-handling code that directly
inserted externally-retrieved error strings into the
supposed ASCII "reason" param instead of doing the right thing
and sticking text descriptive of what was going on in "reason"
and putting the external message in a frob.
8. Use Ascbyte instead of CIbyte in process-unix.c and maybe one
or two other places.
9. Some code cleanup in copy_in_passwd() in sysdep.c.
10. Fix a real bug due to accidental variable shadowing in
tstr_to_local_file_format() in win32.c.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 11:02:24 -0600 |
| parents | 980575c76541 |
| children | 311f6817efc2 308d34e9f07d |
| rev | line source |
|---|---|
| 502 | 1 ;;; mule-category.el --- category functions for XEmacs/Mule. -*- coding: iso-2022-7bit; -*- |
| 428 | 2 |
| 3 ;; Copyright (C) 1992,93,94,95 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995, 1997, 1999 Electrotechnical Laboratory, JAPAN. | |
| 5 ;; Licensed to the Free Software Foundation. | |
| 6 ;; Copyright (C) 1995 Amdahl Corporation. | |
| 7 ;; Copyright (C) 1995 Sun Microsystems. | |
| 8 | |
| 9 ;; This file is part of XEmacs. | |
| 10 | |
| 11 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 12 ;; under the terms of the GNU General Public License as published by | |
| 13 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 14 ;; any later version. | |
| 15 | |
| 16 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 19 ;; General Public License for more details. | |
| 20 | |
| 21 ;; You should have received a copy of the GNU General Public License | |
| 444 | 22 ;; along with XEmacs; see the file COPYING. If not, write to the |
| 428 | 23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
| 24 ;; Boston, MA 02111-1307, USA. | |
| 25 | |
| 26 ;;; Commentary: | |
| 27 | |
| 28 ;; Functions for working with category tables, which are a particular | |
| 29 ;; type of char table. Some function names / arguments should be | |
| 30 ;; parallel with syntax tables. | |
| 31 | |
| 32 ;; Written by Ben Wing <ben@xemacs.org>. The initialization code | |
| 33 ;; at the end of this file comes from Mule. | |
| 34 ;; Some bugfixes by Jareth Hein <jhod@po.iijnet.or.jp> | |
| 35 | |
| 36 ;;; Code: | |
| 37 | |
| 442 | 38 (defvar defined-category-hashtable (make-hash-table :size 50)) |
| 428 | 39 |
| 3970 | 40 (defun define-category (designator doc-string &optional table) |
| 428 | 41 "Make a new category whose designator is DESIGNATOR. |
| 42 DESIGNATOR should be a visible letter of ' ' thru '~'. | |
| 3970 | 43 DOC-STRING is a doc string for the category. |
| 44 Letters of 'a' thru 'z' are already used or kept for the system. | |
| 45 The category should be defined only in category table TABLE, which defaults | |
| 46 to the current buffer's category table, but this is not implemented. " | |
| 47 ;; #### Implement the limiting of the definition. | |
| 428 | 48 (check-argument-type 'category-designator-p designator) |
| 49 (check-argument-type 'stringp doc-string) | |
| 3970 | 50 (setq table (or table (category-table))) |
| 51 (check-argument-type 'category-table-p table) | |
| 428 | 52 (puthash designator doc-string defined-category-hashtable)) |
| 53 | |
| 54 (defun undefine-category (designator) | |
| 55 "Undefine DESIGNATOR as a designator for a category." | |
| 56 (check-argument-type 'category-designator-p designator) | |
| 57 (remhash designator defined-category-hashtable)) | |
| 58 | |
| 59 (defun defined-category-p (designator) | |
| 60 "Return non-nil if DESIGNATOR is a designator for a defined category." | |
| 61 (and (category-designator-p designator) | |
| 62 (gethash designator defined-category-hashtable))) | |
| 63 | |
| 64 (defun defined-category-list () | |
| 65 "Return a list of the currently defined categories. | |
| 66 Categories are given by their designators." | |
| 67 (let (list) | |
| 68 (maphash #'(lambda (key value) | |
| 69 (setq list (cons key list))) | |
| 70 defined-category-hashtable) | |
| 71 (nreverse list))) | |
| 72 | |
| 73 (defun undefined-category-designator () | |
| 74 "Return an undefined category designator, or nil if there are none." | |
| 75 (let ((a 32) found) | |
| 76 (while (and (< a 127) (not found)) | |
| 434 | 77 (unless (gethash a defined-category-hashtable) |
| 78 (setq found (make-char 'ascii a))) | |
| 428 | 79 (setq a (1+ a))) |
| 80 found)) | |
| 81 | |
| 82 (defun category-doc-string (designator) | |
| 83 "Return the doc-string for the category denoted by DESIGNATOR." | |
| 84 (check-argument-type 'defined-category-p designator) | |
| 85 (gethash designator defined-category-hashtable)) | |
| 86 | |
| 444 | 87 (defun modify-category-entry (char-range designator &optional category-table reset) |
| 428 | 88 "Add a category to the categories associated with CHAR-RANGE. |
| 89 CHAR-RANGE is a single character or a range of characters, | |
| 90 as per `put-char-table'. | |
| 91 The category is given by a designator character. | |
| 444 | 92 The changes are made in CATEGORY-TABLE, which defaults to the current |
| 93 buffer's category table. | |
| 428 | 94 If optional fourth argument RESET is non-nil, previous categories associated |
| 95 with CHAR-RANGE are removed before adding the specified category." | |
| 444 | 96 (or category-table (setq category-table (category-table))) |
| 97 (check-argument-type 'category-table-p category-table) | |
| 428 | 98 (check-argument-type 'defined-category-p designator) |
| 99 (if reset | |
| 100 ;; clear all existing stuff. | |
| 444 | 101 (put-char-table char-range nil category-table)) |
| 428 | 102 (map-char-table |
| 103 #'(lambda (key value) | |
| 104 ;; make sure that this range has a bit-vector assigned to it | |
| 105 (if (not (bit-vector-p value)) | |
| 106 (setq value (make-bit-vector 95 0)) | |
| 107 (setq value (copy-sequence value))) | |
| 108 ;; set the appropriate bit in that vector. | |
| 109 (aset value (- designator 32) 1) | |
| 110 ;; put the vector back, thus assuring we have a unique setting for this range | |
| 444 | 111 (put-char-table key value category-table)) |
| 112 category-table char-range)) | |
| 428 | 113 |
| 444 | 114 (defun char-category-list (character &optional category-table) |
| 115 "Return a list of the categories that CHARACTER is in. | |
| 116 CATEGORY-TABLE defaults to the current buffer's category table. | |
| 428 | 117 The categories are given by their designators." |
| 444 | 118 (or category-table (setq category-table (category-table))) |
| 119 (check-argument-type 'category-table-p category-table) | |
| 120 (let ((vec (get-char-table character category-table))) | |
| 428 | 121 (if (null vec) nil |
| 122 (let ((a 32) list) | |
| 123 (while (< a 127) | |
| 124 (if (= 1 (aref vec (- a 32))) | |
| 434 | 125 (setq list (cons (make-char 'ascii a) list))) |
| 428 | 126 (setq a (1+ a))) |
| 127 (nreverse list))))) | |
| 128 | |
| 444 | 129 ;; implemented in C, file chartab.c (97/3/14 jhod@po.iijnet.or.jp) |
| 428 | 130 ;(defun char-in-category-p (char category &optional table) |
| 131 ; "Return non-nil if CHAR is in CATEGORY. | |
| 132 ;TABLE defaults to the current buffer's category table. | |
| 133 ;Categories are specified by their designators." | |
| 134 ; (or table (setq table (category-table))) | |
| 135 ; (check-argument-type 'category-table-p table) | |
| 136 ; (check-argument-type 'category-designator-p category) | |
| 137 ; (let ((vec (get-char-table char table))) | |
| 138 ; (if (null vec) nil | |
| 139 ; (= 1 (aref vec (- category 32)))))) | |
| 140 | |
| 788 | 141 (put 'with-category-table 'lisp-indent-function 1) |
| 142 | |
| 143 (defmacro with-category-table (category-table &rest body) | |
| 144 `(let ((current-category-table (category-table))) | |
| 145 (set-category-table ,category-table) | |
| 146 (unwind-protect | |
| 147 (progn ,@body) | |
| 148 (set-category-table current-category-table)))) | |
| 149 | |
| 3970 | 150 (defun make-category-table () |
| 151 "Construct a new and empty category table and return it." | |
| 152 (make-char-table 'category)) | |
| 153 | |
| 428 | 154 (defun describe-category () |
| 155 "Describe the category specifications in the category table. | |
| 156 The descriptions are inserted in a buffer, which is then displayed." | |
| 157 (interactive) | |
| 434 | 158 (with-displaying-help-buffer |
| 159 (lambda () | |
| 160 (describe-category-table (category-table) standard-output)))) | |
| 428 | 161 |
| 162 (defun describe-category-table (table stream) | |
| 163 (let (first-char | |
| 164 last-char | |
| 165 prev-val | |
| 166 (describe-one | |
| 167 (lambda (first last value stream) | |
| 168 (if (and (bit-vector-p value) | |
| 169 (> (reduce '+ value) 0)) | |
| 170 (progn | |
| 171 (if (equal first last) | |
| 172 (cond ((vectorp first) | |
| 173 (princ (format "%s, row %d" | |
| 174 (charset-name | |
| 175 (aref first 0)) | |
| 176 (aref first 1)) | |
| 177 stream)) | |
| 178 ((charsetp first) | |
| 179 (princ (charset-name first) stream)) | |
| 180 (t (princ first stream))) | |
| 181 (cond ((vectorp first) | |
| 182 (princ (format "%s, rows %d .. %d" | |
| 183 (charset-name | |
| 184 (aref first 0)) | |
| 185 (aref first 1) | |
| 186 (aref last 1)) | |
| 187 stream)) | |
| 188 (t | |
| 189 (princ (format "%s .. %s" first last) | |
| 190 stream)))) | |
| 191 (describe-category-code value stream)))))) | |
| 192 (map-char-table | |
| 193 (lambda (range value) | |
| 194 (if (and (or | |
| 195 (and (characterp range) | |
| 196 (characterp first-char) | |
| 197 (eq (char-charset range) (char-charset first-char)) | |
| 198 (= (char-to-int last-char) (1- (char-to-int range)))) | |
| 199 (and (vectorp range) | |
| 200 (vectorp first-char) | |
| 201 (eq (aref range 0) (aref first-char 0)) | |
| 202 (= (aref last-char 1) (1- (aref range 1)))) | |
| 203 (equal value prev-val))) | |
| 204 (setq last-char range) | |
| 205 (if first-char | |
| 206 (progn | |
| 207 (funcall describe-one first-char last-char prev-val stream) | |
| 208 (setq first-char nil))) | |
| 209 (funcall describe-one range range value stream)) | |
| 210 nil) | |
| 211 table) | |
| 212 (if first-char | |
| 213 (funcall describe-one first-char last-char prev-val stream)))) | |
| 214 | |
| 215 (defun describe-category-code (code stream) | |
| 216 (let ((standard-output (or stream standard-output))) | |
| 217 (princ "\tin categories: ") | |
| 218 (if (not (bit-vector-p code)) | |
| 219 (princ "(none)") | |
| 220 (let ((i 0) | |
| 221 already-matched) | |
| 222 (while (< i 95) | |
| 223 (if (= 1 (aref code i)) | |
| 224 (progn | |
| 225 (if (not already-matched) | |
| 226 (setq already-matched t) | |
| 227 (princ " ")) | |
| 228 (princ (int-to-char (+ 32 i))))) | |
| 229 (setq i (1+ i))) | |
| 230 (if (not already-matched) | |
| 231 (princ "(none)"))) | |
| 232 (let ((i 0)) | |
| 233 (while (< i 95) | |
| 234 (if (= 1 (aref code i)) | |
| 235 (princ (format "\n\t\tmeaning: %s" | |
| 236 (category-doc-string (int-to-char (+ 32 i)))))) | |
| 237 (setq i (1+ i))))) | |
| 238 (terpri))) | |
| 239 | |
| 240 (defconst predefined-category-list | |
| 241 '((latin-iso8859-1 ?l "Latin-1 through Latin-5 character set") | |
| 242 (latin-iso8859-2 ?l) | |
| 243 (latin-iso8859-3 ?l) | |
| 244 (latin-iso8859-4 ?l) | |
| 245 (latin-iso8859-9 ?l) | |
| 246 (cyrillic-iso8859-5 ?y "Cyrillic character set") | |
|
4805
980575c76541
Move the arabic-iso8859-6 character set back to C, otherwise X11 lookup fails.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4491
diff
changeset
|
247 (arabic-iso8859-6 ?b "Arabic character set") |
| 428 | 248 (greek-iso8859-7 ?g "Greek character set") |
| 249 (hebrew-iso8859-8 ?w "Hebrew character set") | |
| 250 (katakana-jisx0201 ?k "Japanese 1-byte Katakana character set") | |
| 251 (latin-jisx0201 ?r "Japanese 1-byte Roman character set") | |
| 252 (japanese-jisx0208-1978 ?j "Japanese 2-byte character set (old)") | |
| 253 (japanese-jisx0208 ?j "Japanese 2-byte character set") | |
| 254 (japanese-jisx0212 ?j) | |
| 255 (chinese-gb2312 ?c "Chinese GB (China, PRC) 2-byte character set") | |
| 256 (chinese-cns11643-1 ?t "Chinese Taiwan (CNS or Big5) 2-byte character set") | |
| 257 (chinese-cns11643-2 ?t) | |
| 258 (chinese-big5-1 ?t) | |
| 259 (chinese-big5-2 ?t) | |
| 260 (korean-ksc5601 ?h "Hangul (Korean) 2-byte character set") | |
| 261 ) | |
| 262 "List of predefined categories. | |
| 263 Each element is a list of a charset, a designator, and maybe a doc string.") | |
| 264 | |
| 265 (let (i l) | |
| 266 (define-category ?a "ASCII character set.") | |
| 267 (define-category ?l "Latin-1 through Latin-5 character set") | |
| 268 (setq i 32) | |
| 269 (while (< i 127) | |
| 270 (modify-category-entry i ?a) | |
| 271 (modify-category-entry i ?l) | |
| 272 (setq i (1+ i))) | |
| 273 (setq l predefined-category-list) | |
| 274 (while l | |
| 275 (if (and (nth 2 (car l)) | |
| 276 (not (defined-category-p (nth 2 (car l))))) | |
| 277 (define-category (nth 1 (car l)) (nth 2 (car l)))) | |
| 952 | 278 (modify-category-entry (car (car l)) (nth 1 (car l)) nil t) |
| 428 | 279 (setq l (cdr l)))) |
| 280 | |
| 281 ;;; Setting word boundary. | |
| 282 | |
| 283 (setq word-combining-categories | |
| 284 '((?l . ?l))) | |
| 285 | |
| 286 (setq word-separating-categories ; (2-byte character sets) | |
| 287 '((?A . ?K) ; Alpha numeric - Katakana | |
| 288 (?A . ?C) ; Alpha numeric - Chinese | |
| 289 (?H . ?A) ; Hiragana - Alpha numeric | |
| 290 (?H . ?K) ; Hiragana - Katakana | |
| 291 (?H . ?C) ; Hiragana - Chinese | |
| 292 (?K . ?A) ; Katakana - Alpha numeric | |
| 293 (?K . ?C) ; Katakana - Chinese | |
| 294 (?C . ?A) ; Chinese - Alpha numeric | |
| 295 (?C . ?K) ; Chinese - Katakana | |
| 296 )) | |
| 297 | |
| 298 ;;; At the present, I know Japanese and Chinese text can | |
| 299 ;;; break line at any point under a restriction of 'kinsoku'. | |
| 450 | 300 ;;; #### SJT this needs to be set by language environments and probably should |
| 301 ;;; be buffer-local---strategy for dealing with this: check all $language.el | |
| 302 ;;; files and also mule-base/$language-utils.el files for variables set; | |
| 303 ;;; these should be made buffer local and some kind of a- or p-list of vars | |
| 304 ;;; to be set for a language environment created. | |
| 428 | 305 (defvar word-across-newline "\\(\\cj\\|\\cc\\|\\ct\\)" |
| 306 "Regular expression of such characters which can be a word across newline.") | |
| 307 | |
| 308 (defvar ascii-char "[\40-\176]") | |
| 309 (defvar ascii-space "[ \t]") | |
| 310 (defvar ascii-symbols "[\40-\57\72-\100\133-\140\173-\176]") | |
| 311 (defvar ascii-numeric "[\60-\71]") | |
| 312 (defvar ascii-English-Upper "[\101-\132]") | |
| 313 (defvar ascii-English-Lower "[\141-\172]") | |
| 314 (defvar ascii-alphanumeric "[\60-\71\101-\132\141-\172]") | |
| 315 | |
| 316 (defvar kanji-char "\\cj") | |
| 317 (defvar kanji-space "$B!!(B") | |
| 318 (defvar kanji-symbols "\\cS") | |
| 319 (defvar kanji-numeric "[$B#0(B-$B#9(B]") | |
| 320 (defvar kanji-English-Upper "[$B#A(B-$B#Z(B]") | |
| 321 (defvar kanji-English-Lower "[$B#a(B-$B#z(B]") | |
| 322 (defvar kanji-hiragana "\\cH") | |
| 323 (defvar kanji-katakana "\\cK") | |
| 324 (defvar kanji-Greek-Upper "[$B&!(B-$B&8(B]") | |
| 325 (defvar kanji-Greek-Lower "[$B&A(B-$B&X(B]") | |
| 326 (defvar kanji-Russian-Upper "[$B'!(B-$B'A(B]") | |
| 327 (defvar kanji-Russian-Lower "[$B'Q(B-$B'q(B]") | |
| 328 (defvar kanji-Kanji-1st-Level "[$B0!(B-$BOS(B]") | |
| 329 (defvar kanji-Kanji-2nd-Level "[$BP!(B-$Bt$(B]") | |
| 330 | |
| 331 (defvar kanji-kanji-char "\\(\\cH\\|\\cK\\|\\cC\\)") |