From: tomo <tomo>
Date: Thu, 4 Apr 2002 07:32:51 +0000 (+0000)
Subject: (ideographic-structure-convert-to-daikanwa): Try to replace converted
X-Git-Tag: ids-0_0~13
X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fids.git;a=commitdiff_plain;h=325060bf5f5f06be24c8d87e89f54a8f32dbf7f3

(ideographic-structure-convert-to-daikanwa): Try to replace converted
sub-tree with corresponding combined character.
---

diff --git a/ids-util.el b/ids-util.el
index 5259594..027ab0f 100644
--- a/ids-util.el
+++ b/ids-util.el
@@ -1,6 +1,6 @@
 ;;; ids-util.el --- Utilities about ideographic-structure -*- coding: utf-8 -*-
 
-;; Copyright (C) 2001 MORIOKA Tomohiko
+;; Copyright (C) 2001,2002 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: ideographic-structure, UTF-2000, database
@@ -132,7 +132,7 @@
 
 ;;;###autoload
 (defun ideographic-structure-convert-to-daikanwa (structure)
-  (let (dest cell morohashi ret)
+  (let (dest cell morohashi ret ret2 ret3)
     (while structure
       (setq cell (car structure))
       (setq dest
@@ -177,10 +177,14 @@
 			  (decode-char 'ideograph-daikanwa (car morohashi))
 			cell)))
 		   ((setq ret (assq 'ideographic-structure cell))
-		    (put-alist 'ideographic-structure
-			       (ideographic-structure-convert-to-daikanwa
-				(cdr ret))
-			       (copy-alist cell)))
+		    (setq ret2
+			  (ideographic-structure-convert-to-daikanwa
+			   (cdr ret)))
+		    (if (setq ret3 (ideographic-structure-find-char ret2))
+			ret3
+		      (put-alist 'ideographic-structure
+				 ret2
+				 (copy-alist cell))))
 		   (t cell))
 	     dest))
       (setq structure (cdr structure)))