X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fideograph-util.el;h=8c59833f03d81def7fbebfaaef347cf615ae53c3;hb=802def081c4df46101fd5319c4b7a2fcb90d387f;hp=8889ac33353a838de308a0ba0001f14f4fd69aa0;hpb=529d0316c83f606a02455dce6e48e0aa71cd3112;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 8889ac3..8c59833 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 MORIOKA Tomohiko.
+;;   2009, 2010, 2012 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Chaon model, ISO/IEC 10646, Unicode, UCS-4, MULE.
@@ -170,25 +170,35 @@
           (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))))
+      (let ((ret (or (encode-char char '=daikanwa@rev2 'defined-only)
+		     (encode-char char '=daikanwa/+p 'defined-only)
+                     (encode-char char '=daikanwa/+2p 'defined-only)
+                     (encode-char char '=daikanwa/ho '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))))
+		      (or (decode-char '=daikanwa@rev2 m-m 'defined-only)
+			  (decode-char '=daikanwa m-m))
+		    (or (cond ((eq m-m 'ho)
+			       (decode-char '=daikanwa/ho m-s))
+			      ((eq m-s 1)
+			       (decode-char '=daikanwa/+p m-m))
+			      ((eq m-s 2)
+			       (decode-char '=daikanwa/+2p m-m)))
+			(progn
+			  (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))
+		     (or (decode-char '=daikanwa@rev2 ret 'defined-only)
+			 (decode-char '=daikanwa ret))
 		   (map-char-attribute (lambda (c v)
 					 (if (equal ret v)
 					     char))
@@ -279,9 +289,17 @@
           (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)
+      (let ((ret (or (encode-char char '=daikanwa@rev2 'defined-only)
+                     ;; (encode-char char '=daikanwa 'defined-only)
                      (get-char-attribute char 'morohashi-daikanwa))))
+	(unless ret
+	  (cond
+	   ((setq ret (encode-char char '=daikanwa/+p 'defined-only))
+	    (setq ret (list ret 1)))
+	   ((setq ret (encode-char char '=daikanwa/+2p 'defined-only))
+	    (setq ret (list ret 2)))
+	   ((setq ret (encode-char char '=daikanwa/ho 'defined-only))
+	    (setq ret (list 'ho ret)))))
         (or (if ret
 		(if depth
 		    (if (integerp ret)