;;; mule-category.el --- category functions for XEmacs/Mule.
;; Copyright (C) 1992,93,94,95 Free Software Foundation, Inc.
-;; Copyright (C) 1995, 1997, 1999 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
;; Copyright (C) 1995 Amdahl Corporation.
;; Copyright (C) 1995 Sun Microsystems.
;; General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the
+;; along with XEmacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
;; type of char table. Some function names / arguments should be
;; parallel with syntax tables.
-;; Written by Ben Wing <ben@xemacs.org>. The initialization code
+;; Written by Ben Wing <wing@666.com>. The initialization code
;; at the end of this file comes from Mule.
;; Some bugfixes by Jareth Hein <jhod@po.iijnet.or.jp>
;;; Code:
-(defvar defined-category-hashtable (make-hash-table :size 50))
+(defvar defined-category-hashtable (make-hashtable 50))
(defun define-category (designator doc-string)
"Make a new category whose designator is DESIGNATOR.
"Return an undefined category designator, or nil if there are none."
(let ((a 32) found)
(while (and (< a 127) (not found))
- (unless (gethash a defined-category-hashtable)
- (setq found (make-char 'ascii a)))
+ (if (gethash a defined-category-hashtable)
+ (setq found a))
(setq a (1+ a)))
found))
(check-argument-type 'defined-category-p designator)
(gethash designator defined-category-hashtable))
-(defun modify-category-entry (char-range designator &optional category-table reset)
+(defun modify-category-entry (char-range designator &optional table reset)
"Add a category to the categories associated with CHAR-RANGE.
CHAR-RANGE is a single character or a range of characters,
as per `put-char-table'.
The category is given by a designator character.
-The changes are made in CATEGORY-TABLE, which defaults to the current
- buffer's category table.
+The changes are made in TABLE, which defaults to the current buffer's
+ category table.
If optional fourth argument RESET is non-nil, previous categories associated
with CHAR-RANGE are removed before adding the specified category."
- (or category-table (setq category-table (category-table)))
- (check-argument-type 'category-table-p category-table)
+ (or table (setq table (category-table)))
+ (check-argument-type 'category-table-p table)
(check-argument-type 'defined-category-p designator)
(if reset
;; clear all existing stuff.
- (put-char-table char-range nil category-table))
+ (put-char-table char-range nil table))
(map-char-table
#'(lambda (key value)
;; make sure that this range has a bit-vector assigned to it
;; set the appropriate bit in that vector.
(aset value (- designator 32) 1)
;; put the vector back, thus assuring we have a unique setting for this range
- (put-char-table key value category-table))
- category-table char-range))
+ (put-char-table key value table))
+ table char-range))
-(defun char-category-list (character &optional category-table)
- "Return a list of the categories that CHARACTER is in.
-CATEGORY-TABLE defaults to the current buffer's category table.
+(defun char-category-list (char &optional table)
+ "Return a list of the categories that CHAR is in.
+TABLE defaults to the current buffer's category table.
The categories are given by their designators."
- (or category-table (setq category-table (category-table)))
- (check-argument-type 'category-table-p category-table)
- (let ((vec (get-char-table character category-table)))
+ (or table (setq table (category-table)))
+ (check-argument-type 'category-table-p table)
+ (let ((vec (get-char-table char table)))
(if (null vec) nil
(let ((a 32) list)
(while (< a 127)
(if (= 1 (aref vec (- a 32)))
- (setq list (cons (make-char 'ascii a) list)))
+ (setq list (cons a list)))
(setq a (1+ a)))
(nreverse list)))))
-;; implemented in C, file chartab.c (97/3/14 jhod@po.iijnet.or.jp)
+;; implimented in c, file chartab.c (97/3/14 jhod@po.iijnet.or.jp)
;(defun char-in-category-p (char category &optional table)
; "Return non-nil if CHAR is in CATEGORY.
;TABLE defaults to the current buffer's category table.
"Describe the category specifications in the category table.
The descriptions are inserted in a buffer, which is then displayed."
(interactive)
- (with-displaying-help-buffer
- (lambda ()
- (describe-category-table (category-table) standard-output))))
+ (with-output-to-temp-buffer "*Help*"
+ (describe-category-table (category-table) standard-output)))
(defun describe-category-table (table stream)
(let (first-char
(let (i l)
(define-category ?a "ASCII character set.")
- (define-category ?l "Latin-1 through Latin-5 character set")
(setq i 32)
(while (< i 127)
(modify-category-entry i ?a)
- (modify-category-entry i ?l)
(setq i (1+ i)))
(setq l predefined-category-list)
(while l
(modify-category-entry (car (car l)) (nth 1 (car l)))
(setq l (cdr l))))
-;;; Setting word boundary.
-
-(setq word-combining-categories
- '((?l . ?l)))
-
-(setq word-separating-categories ; (2-byte character sets)
- '((?A . ?K) ; Alpha numeric - Katakana
- (?A . ?C) ; Alpha numeric - Chinese
- (?H . ?A) ; Hiragana - Alpha numeric
- (?H . ?K) ; Hiragana - Katakana
- (?H . ?C) ; Hiragana - Chinese
- (?K . ?A) ; Katakana - Alpha numeric
- (?K . ?C) ; Katakana - Chinese
- (?C . ?A) ; Chinese - Alpha numeric
- (?C . ?K) ; Chinese - Katakana
- ))
-
;;; At the present, I know Japanese and Chinese text can
;;; break line at any point under a restriction of 'kinsoku'.
(defvar word-across-newline "\\(\\cj\\|\\cc\\|\\ct\\)"
projects / chise / xemacs-chise.git.1 / blobdiff