X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fids.git;a=blobdiff_plain;f=ids-read.el;h=ff05c189c4c915370256fe8b9aa4b270c9f5975f;hp=16bd7e86f54fe90c57e6b205e47098081155a494;hb=HEAD;hpb=b197b9e1468a404c8d6a5cfdf1a40ebf40e917aa

diff --git a/ids-read.el b/ids-read.el
index 16bd7e8..1693763 100644
--- a/ids-read.el
+++ b/ids-read.el
@@ -1,6 +1,6 @@
 ;;; ids-read.el --- Reader for IDS-* files
 
-;; Copyright (C) 2002 MORIOKA Tomohiko
+;; Copyright (C) 2002, 2003, 2004, 2020, 2021 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: IDS, IDC, Ideographs, UCS, Unicode
@@ -27,12 +27,12 @@
 (require 'ids)
 
 ;;;###autoload
-(defun ids-read-buffer (buffer &optional simplify)
+(defun ids-read-buffer (buffer &optional simplify soft)
   (interactive "bBuffer = \nP")
   (save-excursion
     (set-buffer buffer)
     (goto-char (point-min))
-    (let (line chs ids code char structure)
+    (let (line chs ids apparent-ids code char u-char structure)
       (while (not (eobp))
 	(unless (looking-at ";")
 	  (setq line
@@ -40,12 +40,41 @@
 		 (buffer-substring (point-at-bol)(point-at-eol))
 		 "\t"))
 	  (setq chs (car line)
-		ids (nth 2 line))
+		ids (nth 2 line)
+		apparent-ids (nth 3 line)
+		u-char nil)
+	  (setq apparent-ids
+		(if (and apparent-ids
+			 (string-match "^@apparent=" apparent-ids))
+		    (substring apparent-ids (match-end 0))))
 	  (setq char
 		(cond
 		 ((string-match "U[-+]\\([0-9A-F]+\\)" chs)
-		  (decode-char 'ucs
+		  (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
 			       (string-to-int (match-string 1 chs) 16)))
+		 ((string-match
+		   "C\\([1-7]\\)-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)"
+		   chs)
+		  (decode-char
+		   (intern
+		    (concat "chinese-cns11643-" (match-string 1 chs)))
+		   (string-to-int (match-string 2 chs) 16)))
+		 ((string-match "CDP-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)"
+				chs)
+		  (decode-char '=big5-cdp
+			       (string-to-int (match-string 1 chs) 16)))
+		 ((string-match
+		   "HZK\\([0-9][0-9]\\)-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)"
+		   chs)
+		  (decode-char (intern
+				(format "=hanziku-%d"
+					(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)))
 		  (map-char-attribute
@@ -79,24 +108,50 @@
 		 ((string-match "CB\\([0-9]+\\)" chs)
 		  (decode-char 'ideograph-cbeta
 			       (string-to-int (match-string 1 chs))))
+		 ((string-match "SW-JIGUGE-\\([0-9]+\\)" chs)
+		  (decode-char '=shuowen-jiguge
+			       (string-to-int (match-string 1 chs))))
 		 ))
-	  (when (and char
-		     (>= (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 char
+	    (when (and (>= (length ids) 3)
+		       (not (string-match "\\?" ids))
+		       (consp (setq structure (ids-parse-string ids simplify))))
+	      (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))))
+	    (when (and (>= (length apparent-ids) 3)
+		       (consp (setq structure
+				    (ids-parse-string apparent-ids simplify))))
+	      (when (or (not soft)
+			(null
+			 (get-char-attribute char 'ideographic-structure@apparent)))
+		(put-char-attribute char
+				    'ideographic-structure@apparent
+				    (cdr (car structure)))))
+	    )
 	  )
 	(forward-line)
 	))))
 
 ;;;###autoload
-(defun ids-read-file (file &optional simplify)
+(defun ids-read-file (file &optional simplify soft)
   (interactive "fIDS file = \nP")
   (with-temp-buffer
     (insert-file-contents file)
-    (ids-read-buffer (current-buffer) simplify)))
+    (ids-read-buffer (current-buffer) simplify soft)))
 
 
 ;;; @ End.