;; Copyright (C) 1998,1999,2000,2001,2002,2003 MORIOKA Tomohiko.
;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
-;; Keywords: UTF-2000, ISO/IEC 10646, Unicode, UCS-4, MULE.
+;; Keywords: CHISE, Character Database, ISO/IEC 10646, Unicode, UCS-4, MULE.
-;; This file is part of XEmacs UTF-2000.
+;; This file is part of XEmacs CHISE.
-;; XEmacs UTF-2000 is free software; you can redistribute it and/or
+;; XEmacs CHISE is free software; you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
;; published by the Free Software Foundation; either version 2, or (at
;; your option) any later version.
-;; XEmacs UTF-2000 is distributed in the hope that it will be useful,
+;; XEmacs CHISE is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;; General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with XEmacs UTF-2000; see the file COPYING. If not, write to
+;; along with XEmacs CHISE; see the file COPYING. If not, write to
;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
(setq i (1+ i)))
v))
+(defvar char-db-feature-domains
+ '(ucs daikanwa cns gt jis jis/alt jis/a jis/b misc unknown))
+
(defvar char-db-ignored-attributes nil)
(defun char-attribute-name< (ka kb)
((find-charset ka)
(cond
((find-charset kb)
- (cond
- ((= (charset-dimension ka)
- (charset-dimension kb))
- (cond ((= (charset-chars ka)(charset-chars kb))
- (if (charset-iso-final-char ka)
- (cond
- ((>= (charset-iso-final-char ka) ?@)
- (if (and (charset-iso-final-char kb)
- (>= (charset-iso-final-char kb) ?@))
- (< (charset-iso-final-char ka)
- (charset-iso-final-char kb))
- t))
- (t
- (if (charset-iso-final-char kb)
- (if (>= (charset-iso-final-char kb) ?@)
- nil
- (< (charset-iso-final-char ka)
- (charset-iso-final-char kb)))
- t)))
- (if (charset-iso-final-char kb)
- nil
- (< (charset-id ka)(charset-id kb)))))
- ((<= (charset-chars ka)(charset-chars kb)))))
- (t
- (< (charset-dimension ka)
- (charset-dimension kb))
- )))
+ (if (and (charset-iso-final-char ka)
+ (>= (charset-iso-final-char ka) ?@)
+ (charset-iso-final-char kb)
+ (>= (charset-iso-final-char kb) ?@))
+ (cond
+ ((= (charset-dimension ka)
+ (charset-dimension kb))
+ (< (charset-iso-final-char ka)
+ (charset-iso-final-char kb)))
+ (t
+ (> (charset-dimension ka)
+ (charset-dimension kb))
+ ))
+ (if (< (charset-id ka) 0)
+ (if (< (charset-id kb) 0)
+ (cond
+ ((= (charset-dimension ka)
+ (charset-dimension kb))
+ (> (charset-id ka)(charset-id kb)))
+ (t
+ (> (charset-dimension ka)
+ (charset-dimension kb))
+ ))
+ t)
+ (< (charset-id ka)(charset-id kb)))))
((symbolp kb)
nil)
(t
chinese-cns11643-5
chinese-cns11643-6
chinese-cns11643-7
+ =jis-x0208-1990
=jis-x0213-1-2000
=jis-x0213-2-2000
korean-ksc5601
chinese-isoir165
katakana-jisx0201
hebrew-iso8859-8
- =jis-x0208-1990
chinese-gb12345
latin-viscii
ethiopic-ucs
=gt
- =big5-cdp
- =gt-k
ideograph-daikanwa-2
ideograph-daikanwa
=cbeta
ideograph-hanziku-10
ideograph-hanziku-11
ideograph-hanziku-12
- =cbeta
- =jef-china3
+ =big5
=big5-eten
- =big5))
+ =big5-cdp
+ =gt-k
+ =jef-china3))
(defun char-db-make-char-spec (char)
(let (ret char-spec)
)
((setq ret
(catch 'tag
- (let ((rest char-db-coded-charset-priority-list))
+ (let ((rest char-db-coded-charset-priority-list)
+ ccs)
(while rest
+ (setq ccs (charset-name
+ (find-charset (car rest))))
(if (setq ret
- (get-char-attribute char (car rest)))
- (throw 'tag (cons (car rest) ret)))
+ (encode-char char ccs
+ 'defined-only))
+ (throw 'tag (cons ccs ret)))
(setq rest (cdr rest))))))
(setq char-spec (list ret))
(dolist (ccs (delq (car ret) (charset-list)))
=daikanwa-rev2
;; =gt-k
)))
- (setq ret (get-char-attribute char ccs)))
+ (setq ret (encode-char char ccs 'defined-only)))
(setq char-spec (cons (cons ccs ret) char-spec))))
(if (null char-spec)
(setq char-spec (split-char char)))
(defun char-db-insert-char-spec (char &optional readable column)
(unless column
(setq column (current-column)))
- (let (char-spec ret al cal key temp-char)
+ (let (char-spec al cal key temp-char)
(setq char-spec (char-db-make-char-spec char))
(unless (or (characterp char) ; char
(condition-case nil
(setq key (car (car char-spec)))
(unless (memq key char-db-ignored-attributes)
(if (find-charset key)
- (if (get-char-attribute char key)
+ (if (encode-char char key 'defined-only)
(setq cal (cons key cal)))
(setq al (cons key al))))
(setq char-spec (cdr char-spec)))
=gt-pj-10
=gt-pj-11))
(setq ret (decode-char ccs code-point))
- (setq ret (get-char-attribute ret '=gt)))
+ (setq ret (encode-char ret '=gt 'defined-only)))
(decode-builtin-char '=gt ret))
(t
(decode-builtin-char ccs code-point))))
(line-breaking
(concat "\n" (make-string (1+ column) ?\ )))
lbs cell separator ret
- key al cal)
+ key al cal
+ dest-ccss)
(insert "(")
(when (and (memq 'name attributes)
(setq value (get-char-attribute char 'name)))
name value (decode-char '=ucs value)
line-breaking))
(setq attributes (delq name attributes))))
- ;; (when (and (memq '=>ucs* attributes)
- ;; (setq value (get-char-attribute char '=>ucs*)))
- ;; (insert (format "(=>ucs*\t\t. #x%04X)\t; %c%s"
- ;; value (decode-char '=ucs value)
- ;; line-breaking))
- ;; (setq attributes (delq '=>ucs* attributes))
- ;; )
(dolist (name '(=>ucs@gb =>ucs@cns =>ucs@jis =>ucs@ks =>ucs@big5))
(when (and (memq name attributes)
(setq value (get-char-attribute char name)))
value)
line-breaking))
(setq attributes (delq name attributes))))
- ;; (when (and (memq '=>ucs-gb attributes)
- ;; (setq value (get-char-attribute char '=>ucs-gb)))
- ;; (insert (format "(=>ucs@gb\t\t. #x%04X)\t; %c%s"
- ;; value (decode-char '=ucs@gb value)
- ;; line-breaking))
- ;; (setq attributes (delq '=>ucs-gb attributes))
- ;; )
- ;; (when (and (memq '=>ucs-cns attributes)
- ;; (setq value (get-char-attribute char '=>ucs-cns)))
- ;; (insert (format "(=>ucs@cns\t\t. #x%04X)\t; %c%s"
- ;; value (decode-char '=ucs@cns value)
- ;; line-breaking))
- ;; (setq attributes (delq '=>ucs-cns attributes))
- ;; )
- ;; (when (and (memq '=>ucs-big5 attributes)
- ;; (setq value (get-char-attribute char '=>ucs-big5)))
- ;; (insert (format "(=>ucs-big5\t\t. #x%04X)\t; %c%s"
- ;; value (decode-char 'ucs-big5 value)
- ;; line-breaking))
- ;; (setq attributes (delq '=>ucs-big5 attributes))
- ;; )
- ;; (when (and (memq '=>ucs-jis attributes)
- ;; (setq value (get-char-attribute char '=>ucs-jis)))
- ;; (insert (format "(=>ucs@jis\t\t. #x%04X)\t; %c%s"
- ;; value (decode-char '=ucs@jis value)
- ;; line-breaking))
- ;; (setq attributes (delq '=>ucs-jis attributes))
- ;; )
- ;; (when (and (memq '=>ucs-ks attributes)
- ;; (setq value (get-char-attribute char '=>ucs-ks)))
- ;; (insert (format "(=>ucs-ks\t\t. #x%04X)\t; %c%s"
- ;; value (decode-char 'ucs-ks value)
- ;; line-breaking))
- ;; (setq attributes (delq '=>ucs-ks attributes))
- ;; )
(when (and (memq '->ucs attributes)
(setq value (get-char-attribute char '->ucs)))
(insert (format (if char-db-convert-obsolete-format
line-breaking))
(setq attributes (delq 'ideographic-radical attributes))
)
+ (let (key)
+ (dolist (domain char-db-feature-domains)
+ (setq key (intern (format "%s@%s" 'ideographic-radical domain)))
+ (when (and (memq key attributes)
+ (setq value (get-char-attribute char key)))
+ (setq radical value)
+ (insert (format "(%s . %S)\t; %c%s"
+ key
+ radical
+ (aref ideographic-radicals radical)
+ line-breaking))
+ (setq attributes (delq key attributes))
+ )
+ (setq key (intern (format "%s@%s" 'ideographic-strokes domain)))
+ (when (and (memq key attributes)
+ (setq value (get-char-attribute char key)))
+ (setq strokes value)
+ (insert (format "(%s . %S)%s"
+ key
+ strokes
+ line-breaking))
+ (setq attributes (delq key attributes))
+ )
+ (setq key (intern (format "%s@%s" 'total-strokes domain)))
+ (when (and (memq key attributes)
+ (setq value (get-char-attribute char key)))
+ (insert (format "(%s . %S)%s"
+ key
+ value
+ line-breaking))
+ (setq attributes (delq key attributes))
+ )
+ (dolist (feature '(ideographic-radical
+ ideographic-strokes
+ total-strokes))
+ (setq key (intern (format "%s@%s*sources" feature domain)))
+ (when (and (memq key attributes)
+ (setq value (get-char-attribute char key)))
+ (insert (format "(%s%s" key line-breaking))
+ (dolist (cell value)
+ (insert (format " %s" cell)))
+ (insert ")")
+ (insert line-breaking)
+ (setq attributes (delq key attributes))
+ ))
+ ))
(when (and (memq 'ideographic-strokes attributes)
(setq value (get-char-attribute char 'ideographic-strokes)))
(setq strokes value)
(setq attributes (delq 'hanyu-dazidian-char attributes))
)
(unless readable
- (when (memq '->ucs-variants attributes)
- (setq attributes (delq '->ucs-variants attributes))
+ (when (memq '->ucs-unified attributes)
+ (setq attributes (delq '->ucs-unified attributes))
)
(when (memq 'composition attributes)
(setq attributes (delq 'composition attributes))
))
(setq attributes (cdr attributes)))
(while ccs-attributes
- (setq name (car ccs-attributes))
- (if (and (eq name (charset-name name))
- (setq value (get-char-attribute char name)))
+ (setq name (charset-name (car ccs-attributes)))
+ (if (and (not (memq name dest-ccss))
+ (prog1
+ (setq value (get-char-attribute char name))
+ (setq dest-ccss (cons name dest-ccss))))
(insert
(format
- (cond ((memq name '(ideograph-daikanwa
- =daikanwa-rev1
- =daikanwa-rev2
+ (cond ((memq name '(=daikanwa
+ =daikanwa-rev1 =daikanwa-rev2
=gt =gt-k =cbeta))
(if has-long-ccs-name
"(%-26s . %05d)\t; %c%s"
))
(defun insert-char-data-with-variant (char &optional printable
- no-ucs-variant
+ no-ucs-unified
script excluded-script)
(insert-char-data char printable)
(let ((variants (or (char-variants char)
(or (null excluded-script)
(null (setq vs (get-char-attribute variant 'script)))
(not (memq excluded-script vs))))
- (or (and no-ucs-variant (get-char-attribute variant '=ucs))
+ (or (and no-ucs-unified (get-char-attribute variant '=ucs))
(insert-char-data variant printable)))
(setq variants (cdr variants))
)))
(while (<= code max)
(setq char (decode-char '=ucs code))
(if (encode-char char '=ucs 'defined-only)
- (insert-char-data-with-variant char nil 'no-ucs-variant
+ (insert-char-data-with-variant char nil 'no-ucs-unified
script excluded-script))
(setq code (1+ code)))))
(defun write-char-range-data-to-file (min max file
&optional script excluded-script)
- (let ((coding-system-for-write 'utf-8))
+ (let ((coding-system-for-write 'utf-8-mcs))
(with-temp-buffer
+ (insert ";; -*- coding: utf-8-mcs -*-\n")
(insert-char-range-data min max script excluded-script)
(write-region (point-min)(point-max) file))))
projects / chise / xemacs-chise.git.1 / blobdiff