X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fideograph-util.el;h=8207d3c2708faf9bee8b0042e950ce8d65ea9a4c;hb=8ef9e06c8b4b7ddf3359c17434fc0a7985a533d9;hp=8c59833f03d81def7fbebfaaef347cf615ae53c3;hpb=a7101749196aa721b543fbf4544baeda56e51fc9;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 8c59833..8207d3c 100644
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -1,7 +1,7 @@
 ;;; ideograph-util.el --- Ideographic Character Database utility
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
-;;   2009, 2010, 2012 MORIOKA Tomohiko.
+;;   2009, 2010, 2012, 2014 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Chaon model, ISO/IEC 10646, Unicode, UCS-4, MULE.
@@ -270,6 +270,12 @@
 	      testers (cdr testers)
 	      defaulters (cdr defaulters))))))
 
+(defun char-daikanwa-radical (char &optional radical ignore-sisters)
+  (or (and (encode-char char '=daikanwa@rev2 'defined-only)
+	   (or (get-char-attribute char 'ideographic-radical@daikanwa)
+	       (get-char-attribute char 'ideographic-radical)))
+      (char-ideographic-radical char radical ignore-sisters)))
+
 (defun char-daikanwa-strokes (char &optional radical)
   (unless radical
     (setq radical ideographic-radical))
@@ -287,7 +293,7 @@
     (setq radical ideographic-radical))
   (if (or (null radical)
           (eq (or (get-char-attribute char 'ideographic-radical)
-                  (char-ideographic-radical char radical t))
+                  (char-daikanwa-radical char radical t))
               radical))
       (let ((ret (or (encode-char char '=daikanwa@rev2 'defined-only)
                      ;; (encode-char char '=daikanwa 'defined-only)