X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fideograph-util.el;h=e378c11b52f696a8c13c77a1a396f6fb819ec854;hb=588b61dde1c13391103e68a277bf57944ef6c4bd;hp=5c9bcccdb42a32fd5e6da8ffe5356eb1c3984706;hpb=19f75020882c8d66e421827f3dacaf9792e8eac2;p=chise%2Fxemacs-chise.git.1 diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el index 5c9bccc..e378c11 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 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. @@ -32,6 +32,16 @@ (defun char-ideographic-radical (char &optional radical) (let (ret) (or (catch 'tag + (dolist (domain char-db-feature-domains) + (if (and (setq ret (get-char-attribute + 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) @@ -75,16 +85,42 @@ 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) (let (ret) - (or (catch 'tag + (catch 'tag + (dolist (domain domains) + (if (and (setq ret (or (get-char-attribute + char + (intern + (format "%s@%s" + 'ideographic-radical domain))) + (get-char-attribute + char 'ideographic-radical))) + (or (eq ret radical) + (null radical)) + (setq ret (get-char-attribute + char + (intern + (format "%s@%s" + 'ideographic-strokes domain))))) + (throw 'tag ret)))))) + +;;;###autoload +(defun char-ideographic-strokes (char &optional radical preferred-domains) + (let (ret) + (or (char-ideographic-strokes-from-domains + char preferred-domains radical) + (get-char-attribute char 'ideographic-strokes) + (char-ideographic-strokes-from-domains + char char-db-feature-domains radical) + (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))))) (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) @@ -99,9 +135,41 @@ strokes))))) ;;;###autoload +(defun char-total-strokes-from-domains (char domains) + (let (ret) + (catch 'tag + (dolist (domain domains) + (if (setq ret (get-char-attribute + 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) + (get-char-attribute 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 char-db-feature-domains) + (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) + (intern (format "%s@%s" 'ideographic-radical domain)))) (map-char-attribute (lambda (char radical) (when (and radical @@ -224,17 +292,16 @@ (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))) + (if (= (char-ideographic-radical drc radical) + (char-ideographic-radical char radical)) + (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 '=>daikanwa) (get-char-attribute char 'morohashi-daikanwa))) ;;;###autoload @@ -291,8 +358,9 @@ (format "Ideograph-R%03d-%s.el" radical name) file)))) (with-temp-buffer + (insert ";; -*- coding: utf-8-mcs -*-\n") (insert-ideograph-radical-char-data radical) - (let ((coding-system-for-write 'utf-8)) + (let ((coding-system-for-write 'utf-8-mcs)) (write-region (point-min)(point-max) file) ))) @@ -336,6 +404,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