X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fideograph-util.el;h=c00d5bff51a7751c4a2881a7a2b9062e1874174b;hb=9908025d22a0f0f2f528f04ebef279daa6e931c9;hp=adc7564ebd6389296b828c9cfed2fb881798c632;hpb=23a058dbaf577391ba3b8798834826ffd424dc98;p=chise%2Fxemacs-chise.git.1 diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el index adc7564..c00d5bf 100644 --- a/lisp/utf-2000/ideograph-util.el +++ b/lisp/utf-2000/ideograph-util.el @@ -1,24 +1,24 @@ ;;; ideograph-util.el --- Ideographic Character Database utility -;; Copyright (C) 1999,2000,2001,2002,2003 MORIOKA Tomohiko. +;; Copyright (C) 1999,2000,2001,2002,2003,2004,2005 MORIOKA Tomohiko. ;; Author: MORIOKA Tomohiko -;; Keywords: UTF-2000, ISO/IEC 10646, Unicode, UCS-4, MULE. +;; Keywords: CHISE, Chaon model, 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, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; 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. @@ -26,28 +26,85 @@ (require 'char-db-util) +;;;###autoload +(defun expand-char-feature-name (feature domain) + (if domain + (intern (format "%s@%s" feature domain)) + feature)) + +;;;###autoload +(defun map-char-family (function char &optional ignore-sisters) + (let ((rest (list char)) + ret checked) + (catch 'tag + (while rest + (unless (memq (car rest) checked) + (if (setq ret (funcall function (car rest))) + (throw 'tag ret)) + (setq checked (cons (car rest) checked) + rest (append rest + (get-char-attribute (car rest) '->subsumptive) + (get-char-attribute (car rest) '->denotational) + (get-char-attribute (car rest) '->identical))) + (unless ignore-sisters + (setq rest (append rest + (get-char-attribute (car rest) '<-subsumptive) + (get-char-attribute (car rest) '<-denotational))))) + (setq rest (cdr rest)))))) + +(defun get-char-feature-from-domains (char feature domains + &optional tester arg + ignore-sisters) + (map-char-family + (lambda (ch) + (let (ret) + (catch 'tag + (dolist (domain domains) + (if (and (or (null tester) + (equal (or (char-feature + ch (expand-char-feature-name + tester domain)) + (char-feature ch tester)) + arg)) + (setq ret (or (char-feature + ch (expand-char-feature-name + feature domain)) + (char-feature ch feature)))) + (throw 'tag ret)))))) + char ignore-sisters)) + + (defvar ideograph-radical-chars-vector (make-vector 215 nil)) -(defun char-ideographic-radical (char &optional radical) +(defun char-ideographic-radical (char &optional radical ignore-sisters) (let (ret) - (or (catch 'tag - (dolist (domain '(ucs daikanwa cns)) - (if (and (setq ret (get-char-attribute - char - (intern - (format "%s@%s" - 'ideographic-radical domain)))) - (or (eq ret radical) - (null radical))) - (throw 'tag ret)))) + (or (if radical + (get-char-feature-from-domains + char 'ideographic-radical (cons nil char-db-feature-domains) + 'ideographic-radical radical ignore-sisters) + (get-char-feature-from-domains + char 'ideographic-radical (cons nil char-db-feature-domains) + ignore-sisters)) + ;; (catch 'tag + ;; (dolist (domain char-db-feature-domains) + ;; (if (and (setq ret (char-feature + ;; char + ;; (intern + ;; (format "%s@%s" + ;; 'ideographic-radical domain)))) + ;; (or (eq ret radical) + ;; (null radical))) + ;; (throw 'tag ret)))) (catch 'tag (dolist (cell (get-char-attribute char 'ideographic-)) (if (and (setq ret (plist-get cell :radical)) (or (eq ret radical) (null radical))) (throw 'tag ret)))) - (get-char-attribute char 'ideographic-radical) + (get-char-feature-from-domains + char 'ideographic-radical (cons nil char-db-feature-domains)) + ;; (char-feature char 'ideographic-radical) (progn (setq ret (or (get-char-attribute char 'daikanwa-radical) @@ -85,31 +142,28 @@ 11 12 12 12 12 13 13 13 13 14 14 15 16 16 17]) -(defun char-ideographic-strokes (char &optional radical) +;;;###autoload +(defun char-ideographic-strokes-from-domains (char domains &optional radical) + (if radical + (get-char-feature-from-domains char 'ideographic-strokes domains + 'ideographic-radical radical) + (get-char-feature-from-domains char 'ideographic-strokes domains))) + +;;;###autoload +(defun char-ideographic-strokes (char &optional radical preferred-domains) (let (ret) (or (catch 'tag - (dolist (domain '(ucs daikanwa cns)) - (if (and (setq ret (get-char-attribute - char - (intern - (format "%s@%s" - 'ideographic-radical domain)))) - (or (eq ret radical) - (null radical))) - (throw 'tag - (get-char-attribute - char - (intern - (format "%s@%s" - 'ideographic-strokes domain))))))) - (catch 'tag (dolist (cell (get-char-attribute char 'ideographic-)) (if (and (setq ret (plist-get cell :radical)) (or (eq ret radical) (null radical))) (throw 'tag (plist-get cell :strokes))))) + (char-ideographic-strokes-from-domains + char (append preferred-domains + (cons nil + char-db-feature-domains)) + radical) (get-char-attribute char 'daikanwa-strokes) - (get-char-attribute char 'ideographic-strokes) (let ((strokes (or (get-char-attribute char 'kangxi-strokes) (get-char-attribute char 'japanese-strokes) @@ -124,36 +178,88 @@ strokes))))) ;;;###autoload +(defun char-total-strokes-from-domains (char domains) + (let (ret) + (catch 'tag + (dolist (domain domains) + (if (setq ret (char-feature + char + (intern + (format "%s@%s" + 'total-strokes domain)))) + (throw 'tag ret)))))) + +;;;###autoload +(defun char-total-strokes (char &optional preferred-domains) + (or (char-total-strokes-from-domains char preferred-domains) + (char-feature char 'total-strokes) + (char-total-strokes-from-domains char char-db-feature-domains))) + +;;;###autoload (defun update-ideograph-radical-table () (interactive) - (let (ret radical script) - (dolist (domain '(ucs daikanwa cns)) + (let (ret rret radical script dest) + (dolist (feature + (cons 'ideographic-radical + (progn + (dolist (feature (char-attribute-list)) + (if (string-match "^ideographic-radical@[^@*]+$" + (symbol-name feature)) + (setq dest (cons feature dest)))) + dest))) (map-char-attribute - (lambda (char radical) - (when (and radical - (or (null (setq script (get-char-attribute char 'script))) - (memq 'Ideograph script))) - (unless (memq char - (setq ret - (aref ideograph-radical-chars-vector radical))) - (char-ideographic-strokes char) - (aset ideograph-radical-chars-vector radical - (cons char ret)))) + (lambda (chr radical) + (dolist (char (append + (if (setq ret + (get-char-attribute chr '<-subsumptive)) + (progn + (setq dest nil) + (dolist (pc ret) + (unless (eq (get-char-attribute + pc 'ideographic-radical) + radical) + (if (setq rret + (get-char-attribute + pc '<-subsumptive)) + (setq ret (append ret rret)) + (setq dest (cons pc dest))))) + dest) + (list chr)) + (let ((rest (append + (get-char-attribute chr '<-identical) + (get-char-attribute chr '->denotational))) + pc) + (setq dest nil) + (while rest + (setq pc (car rest)) + (if (memq pc dest) + (setq rest (cdr rest)) + (setq dest (cons pc dest)) + (setq rest + (append (cdr rest) + (get-char-attribute + pc '<-identical) + (get-char-attribute + pc '->denotational))))) + dest))) + (when (and radical + (or (eq radical + (or (get-char-attribute + char 'ideographic-radical) + (char-ideographic-radical char radical))) + (null (char-ideographic-radical char))) + (or (null (setq script + (get-char-attribute char 'script))) + (memq 'Ideograph script))) + (unless (memq char + (setq ret + (aref ideograph-radical-chars-vector + radical))) + (char-ideographic-strokes char) + (aset ideograph-radical-chars-vector radical + (cons char ret))))) nil) - (intern (format "%s@%s" 'ideographic-radical domain)))) - (map-char-attribute - (lambda (char radical) - (when (and radical - (or (null (setq script (get-char-attribute char 'script))) - (memq 'Ideograph script))) - (unless (memq char - (setq ret - (aref ideograph-radical-chars-vector radical))) - (char-ideographic-strokes char) - (aset ideograph-radical-chars-vector radical - (cons char ret)))) - nil) - 'ideographic-radical) + feature)) (map-char-attribute (lambda (char data) (dolist (cell data) @@ -206,26 +312,76 @@ ;; ((null b) t) ;; (t (< a b)))) +(defvar ideographic-radical nil) + ;;;###autoload -(defun char-representative-of-daikanwa (char) - (if (or (encode-char char 'ideograph-daikanwa 'defined-only) - (encode-char char '=daikanwa-rev2 'defined-only)) - char - (let ((m (get-char-attribute char 'morohashi-daikanwa)) - m-m m-s pat) - (or (when m - (setq m-m (pop m)) - (setq m-s (pop m)) - (if (= m-s 0) - (or (decode-char '=daikanwa-rev2 m-m 'defined-only) - (decode-char 'ideograph-daikanwa m-m)) - (when m - (setq pat (list m-m m-s)) - (map-char-attribute (lambda (c v) - (if (equal pat v) - c)) - 'morohashi-daikanwa)))) - char)))) +(defun char-representative-of-daikanwa (char &optional radical + ignore-default checked) + (unless radical + (setq radical ideographic-radical)) + (if (or (null radical) + (eq (or (get-char-attribute char 'ideographic-radical) + (char-ideographic-radical char radical t)) + radical)) + (let ((ret (or (encode-char char 'ideograph-daikanwa 'defined-only) + (encode-char char '=daikanwa-rev2 'defined-only)))) + (or (and ret char) + (if (setq ret (get-char-attribute char 'morohashi-daikanwa)) + (let ((m-m (car ret)) + (m-s (nth 1 ret)) + pat) + (if (= m-s 0) + (or (decode-char '=daikanwa-rev2 m-m 'defined-only) + (decode-char 'ideograph-daikanwa m-m)) + (setq pat (list m-m m-s)) + (map-char-attribute (lambda (c v) + (if (equal pat v) + c)) + 'morohashi-daikanwa)))) + (and (setq ret (get-char-attribute char '=>daikanwa)) + (if (numberp ret) + (or (decode-char '=daikanwa-rev2 ret 'defined-only) + (decode-char 'ideograph-daikanwa ret)) + (map-char-attribute (lambda (c v) + (if (equal ret v) + char)) + 'morohashi-daikanwa))) + (unless (memq char checked) + (catch 'tag + (let ((rest + (append (get-char-attribute char '->subsumptive) + (get-char-attribute char '->denotational))) + (i 0) + sc) + (setq checked (cons char checked)) + (while rest + (setq sc (car rest)) + (if (setq ret (char-representative-of-daikanwa + sc radical t checked)) + (throw 'tag ret)) + (setq checked (cons sc checked) + rest (cdr rest) + i (1+ i))) + (setq rest (get-char-attribute char '->identical)) + (while rest + (setq sc (car rest)) + (when (setq ret (char-representative-of-daikanwa + sc radical t checked)) + (throw 'tag ret)) + (setq checked (cons sc checked) + rest (cdr rest))) + (setq rest + (append (get-char-attribute char '<-subsumptive) + (get-char-attribute char '<-denotational))) + (while rest + (setq sc (car rest)) + (when (setq ret (char-representative-of-daikanwa + sc radical t checked)) + (throw 'tag ret)) + (setq checked (cons sc checked) + rest (cdr rest)))))) + (unless ignore-default + char))))) (defun char-attributes-poly< (c1 c2 accessors testers defaulters) (catch 'tag @@ -257,29 +413,74 @@ testers (cdr testers) defaulters (cdr defaulters)))))) -(defvar ideographic-radical nil) - (defun char-daikanwa-strokes (char &optional radical) (unless radical (setq radical ideographic-radical)) - (let ((drc (char-representative-of-daikanwa char))) - (char-ideographic-strokes - (if (= (char-ideographic-radical drc radical) - (char-ideographic-radical char radical)) - drc - char) - radical))) + (let ((drc (char-representative-of-daikanwa char radical)) + (r (char-ideographic-radical char radical))) + (if (or (null r) + (= (char-ideographic-radical drc radical) r)) + (setq char drc))) + (char-ideographic-strokes char radical '(daikanwa))) ;;;###autoload -(defun char-daikanwa (char) - (or (encode-char char 'ideograph-daikanwa 'defined-only) - (encode-char char '=daikanwa-rev2 'defined-only) - (get-char-attribute char 'morohashi-daikanwa))) +(defun char-daikanwa (char &optional radical checked) + (unless radical + (setq radical ideographic-radical)) + (if (or (null radical) + (eq (or (get-char-attribute char 'ideographic-radical) + (char-ideographic-radical char radical t)) + radical)) + (let ((ret (or (encode-char char 'ideograph-daikanwa 'defined-only) + (encode-char char '=daikanwa-rev2 'defined-only) + (get-char-attribute char 'morohashi-daikanwa)))) + (or ret + (and (setq ret (get-char-attribute char '=>daikanwa)) + (if (numberp ret) + (list ret 0) + (append ret '(0)))) + (unless (memq char checked) + (catch 'tag + (let ((rest + (append (get-char-attribute char '->subsumptive) + (get-char-attribute char '->denotational))) + (i 0) + sc) + (setq checked (cons char checked)) + (while rest + (setq sc (car rest)) + (if (setq ret (char-daikanwa sc radical checked)) + (throw 'tag ret)) + (setq checked (cons sc checked) + rest (cdr rest) + i (1+ i))) + (setq rest (get-char-attribute char '->identical)) + (while rest + (setq sc (car rest)) + (when (setq ret (char-daikanwa sc radical checked)) + (throw 'tag + (if (numberp ret) + (list ret 0) + (append ret (list i))))) + (setq checked (cons sc checked) + rest (cdr rest))) + (setq rest + (append (get-char-attribute char '<-subsumptive) + (get-char-attribute char '<-denotational))) + (while rest + (setq sc (car rest)) + (when (setq ret (char-daikanwa sc radical checked)) + (throw 'tag + (if (numberp ret) + (list ret 0 i) + (append ret (list i))))) + (setq checked (cons sc checked) + rest (cdr rest)))))))))) ;;;###autoload (defun char-ucs (char) (or (encode-char char '=ucs 'defined-only) - (get-char-attribute char '=>ucs))) + (char-feature char '=>ucs))) (defun char-id (char) (logand (char-int char) #x3FFFFFFF)) @@ -298,27 +499,35 @@ (sort (copy-list (aref ideograph-radical-chars-vector radical)) (lambda (a b) (ideograph-char< a b radical)))) - attributes ccss) + attributes ; ccss + ) (dolist (name (char-attribute-list)) (unless (memq name char-db-ignored-attributes) - (if (find-charset name) - (push name ccss) - (push name attributes)))) + ;; (if (find-charset name) + ;; (push name ccss) + (push name attributes) + ;; ) + )) (setq attributes (sort attributes #'char-attribute-name<) - ccss (sort ccss #'char-attribute-name<)) + ;; ccss (sort ccss #'char-attribute-name<) + ) (aset ideograph-radical-chars-vector radical chars) (dolist (char chars) - (when (or (not (some (lambda (atr) - (get-char-attribute char atr)) - char-db-ignored-attributes)) - (some (lambda (ccs) - (encode-char char ccs 'defined-only)) - ccss)) - (insert-char-data char nil attributes ccss))))) + (when ;;(or + (not (some (lambda (atr) + (get-char-attribute char atr)) + char-db-ignored-attributes)) + ;; (some (lambda (ccs) + ;; (encode-char char ccs 'defined-only)) + ;; ccss) + ;;) + (insert-char-data char nil attributes ;ccss + ))))) (defun write-ideograph-radical-char-data (radical file) (if (file-directory-p file) - (let ((name (get-char-attribute (int-char (+ #x2EFF radical)) 'name))) + (let ((name (char-feature (decode-char 'ucs (+ #x2EFF radical)) + 'name))) (if (string-match "KANGXI RADICAL " name) (setq name (capitalize (substring name (match-end 0))))) (setq name (mapconcat (lambda (char) @@ -330,10 +539,11 @@ (format "Ideograph-R%03d-%s.el" radical name) file)))) (with-temp-buffer + (insert (format ";; -*- coding: %s -*-\n" + char-db-file-coding-system)) (insert-ideograph-radical-char-data radical) - (let ((coding-system-for-write 'utf-8)) - (write-region (point-min)(point-max) file) - ))) + (let ((coding-system-for-write char-db-file-coding-system)) + (write-region (point-min)(point-max) file)))) (defun ideographic-structure= (char1 char2) (if (char-ref-p char1) @@ -375,6 +585,40 @@ char))) 'ideographic-structure))) +;;;###autoload +(defun chise-string< (string1 string2 accessors) + (let ((len1 (length string1)) + (len2 (length string2)) + len + (i 0) + c1 c2 + rest func + v1 v2) + (setq len (min len1 len2)) + (catch 'tag + (while (< i len) + (setq c1 (aref string1 i) + c2 (aref string2 i)) + (setq rest accessors) + (while (and rest + (setq func (car rest)) + (setq v1 (funcall func c1) + v2 (funcall func c2)) + (eq v1 v2)) + (setq rest (cdr rest))) + (if v1 + (if v2 + (cond ((< v1 v2) + (throw 'tag t)) + ((> v1 v2) + (throw 'tag nil))) + (throw 'tag nil)) + (if v2 + (throw 'tag t))) + (setq i (1+ i))) + (< len1 len2)))) + + (provide 'ideograph-util) ;;; ideograph-util.el ends here