X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ids.el;h=c793a24911b207761c017930dfc2c6ac72e958e3;hb=ac3808db631b02b9643ef0ecb8dec68647a210e0;hp=0a0565013e555f51a656e7f84c2404068e64b83b;hpb=da3377840b8df4892f8b3c812acddf863d5ba07c;p=chise%2Fids.git

diff --git a/ids.el b/ids.el
index 0a05650..c793a24 100644
--- a/ids.el
+++ b/ids.el
@@ -1,6 +1,6 @@
 ;;; ids.el --- Parser and utility for Ideographic Description Sequence.
 
-;; Copyright (C) 2001, 2002, 2003, 2005, 2020 MORIOKA Tomohiko
+;; Copyright (C) 2001, 2002, 2003, 2005, 2020, 2021 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: IDS, IDC, Ideographs, UCS, Unicode
@@ -46,8 +46,13 @@
 	     (ucs (encode-char chr '=ucs 'defined-only))
 	     big5)
 	(unless (or (and ucs (<= #x2FF0 ucs)(<= ucs #x2FFF))
+		    (memq (encode-char chr '=ucs-var-001)
+			  '(#x2FF0))
 		    (memq (encode-char chr '=ucs-itaiji-001)
-			  '(#x2FF9 #x2FF6)))
+			  '(#x2FF1 #x2FF9 #x2FF6 #x2FFB))
+		    (memq (encode-char chr '=ucs-itaiji-002)
+			  '(#x2FF1))
+		    )
 	  (if (and ucs (<= #xE000 ucs)(<= ucs #xF8FF)
 		   (setq big5 (encode-char chr 'chinese-big5)))
 	      (setq chr (decode-char '=big5-cdp big5)))
@@ -62,8 +67,13 @@
 		     (or (eq ucs #x2FF0)
 			 (eq ucs #x2FF1)
 			 (and (<= #x2FF4 ucs)(<= ucs #x2FFB))))
+		(memq (encode-char chr '=ucs-var-001)
+		      '(#x2FF0))
 		(memq (encode-char chr '=ucs-itaiji-001)
-		      '(#x2FF9 #x2FF6)))
+		      '(#x2FF1 #x2FF9 #x2FF6 #x2FFB))
+		(memq (encode-char chr '=ucs-itaiji-002)
+		      '(#x2FF1))
+		)
 	    (cons chr
 		  (substring string 1))))))