X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=ids-read.el;h=ff05c189c4c915370256fe8b9aa4b270c9f5975f;hb=8efdaf9bc0655277dcedd3f6f86fdf2b58f64db2;hp=99ccc40f2e38ee3d227647ed2a2846994d586eb4;hpb=9af32ce25cc85be7b95a66b22bbed45af491e334;p=chise%2Fids.git

diff --git a/ids-read.el b/ids-read.el
index 99ccc40..ff05c18 100644
--- a/ids-read.el
+++ b/ids-read.el
@@ -1,6 +1,6 @@
 ;;; ids-read.el --- Reader for IDS-* files
 
-;; Copyright (C) 2002,2003 MORIOKA Tomohiko
+;; Copyright (C) 2002,2003,2004 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: IDS, IDC, Ideographs, UCS, Unicode
@@ -32,7 +32,7 @@
   (save-excursion
     (set-buffer buffer)
     (goto-char (point-min))
-    (let (line chs ids code char structure)
+    (let (line chs ids code char u-char structure)
       (while (not (eobp))
 	(unless (looking-at ";")
 	  (setq line
@@ -40,12 +40,14 @@
 		 (buffer-substring (point-at-bol)(point-at-eol))
 		 "\t"))
 	  (setq chs (car line)
-		ids (nth 2 line))
+		ids (nth 2 line)
+		u-char nil)
 	  (setq char
 		(cond
 		 ((string-match "U[-+]\\([0-9A-F]+\\)" chs)
-		  (decode-char 'ucs
-			       (string-to-int (match-string 1 chs) 16)))
+		  (setq code (string-to-int (match-string 1 chs) 16))
+		  (setq u-char (decode-char '=ucs@unicode code))
+		  (decode-char 'ucs code))
 		 ((string-match "J90-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)"
 				chs)
 		  (decode-char 'japanese-jisx0208-1990
@@ -66,7 +68,7 @@
 		   chs)
 		  (decode-char (intern
 				(format "=hanziku-%d"
-					(string-to-int (match-string 1))))
+					(string-to-int (match-string 1 chs))))
 			       (string-to-int (match-string 2 chs) 16)))
 		 ((string-match "M-\\([0-9]+\\)'" chs)
 		  (setq code (string-to-int (match-string 1 chs)))
@@ -103,15 +105,26 @@
 			       (string-to-int (match-string 1 chs))))
 		 ))
 	  (when (and char
-		     (or (not soft)
-			 (null
-			  (get-char-attribute char 'ideographic-structure)))
 		     (>= (length ids) 3)
 		     (not (string-match "\\?" ids))
 		     (consp (setq structure (ids-parse-string ids simplify))))
-	    (put-char-attribute char
-				'ideographic-structure
-				(cdr (car structure))))
+	    (when (or (not soft)
+		      (null
+		       (get-char-attribute char 'ideographic-structure)))
+	      (put-char-attribute char
+				  'ideographic-structure
+				  (cdr (car structure))))
+	    (when (and u-char
+		       (not (eq char u-char))
+		       (or (not soft)
+			   (null
+			    (get-char-attribute
+			     u-char 'ideographic-structure))))
+	      (put-char-attribute
+	       u-char 'ideographic-structure
+	       (ideographic-structure-convert-to-domain
+		(cdr (car structure)) 'unicode)))
+	    )
 	  )
 	(forward-line)
 	))))