projects
/
chise
/
ids.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/ids.git]
/
ids.el
diff --git
a/ids.el
b/ids.el
index
a69ce6b
..
c793a24
100644
(file)
--- a/
ids.el
+++ b/
ids.el
@@
-1,6
+1,6
@@
;;; ids.el --- Parser and utility for Ideographic Description Sequence.
;;; 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
;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
;; Keywords: IDS, IDC, Ideographs, UCS, Unicode
@@
-46,7
+46,13
@@
(ucs (encode-char chr '=ucs 'defined-only))
big5)
(unless (or (and ucs (<= #x2FF0 ucs)(<= ucs #x2FFF))
(ucs (encode-char chr '=ucs 'defined-only))
big5)
(unless (or (and ucs (<= #x2FF0 ucs)(<= ucs #x2FFF))
- (eq (encode-char chr '=ucs-itaiji-001) #x2FF9))
+ (memq (encode-char chr '=ucs-var-001)
+ '(#x2FF0))
+ (memq (encode-char chr '=ucs-itaiji-001)
+ '(#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)))
(if (and ucs (<= #xE000 ucs)(<= ucs #xF8FF)
(setq big5 (encode-char chr 'chinese-big5)))
(setq chr (decode-char '=big5-cdp big5)))
@@
-61,7
+67,13
@@
(or (eq ucs #x2FF0)
(eq ucs #x2FF1)
(and (<= #x2FF4 ucs)(<= ucs #x2FFB))))
(or (eq ucs #x2FF0)
(eq ucs #x2FF1)
(and (<= #x2FF4 ucs)(<= ucs #x2FFB))))
- (eq (encode-char chr '=ucs-itaiji-001) #x2FF9))
+ (memq (encode-char chr '=ucs-var-001)
+ '(#x2FF0))
+ (memq (encode-char chr '=ucs-itaiji-001)
+ '(#x2FF1 #x2FF9 #x2FF6 #x2FFB))
+ (memq (encode-char chr '=ucs-itaiji-002)
+ '(#x2FF1))
+ )
(cons chr
(substring string 1))))))
(cons chr
(substring string 1))))))