X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=ids.el;h=adfd7616715b5da95a0a3a09395c92c91faff942;hb=77808447dc5fa37c25b4e5f146130fcedca2563f;hp=3cc1e8eba8e6c124ed43e09927b59e640a47f3b3;hpb=f9475bf2c3c1f90651d3535f9dabbb349f49421c;p=chise%2Fids.git diff --git a/ids.el b/ids.el index 3cc1e8e..adfd761 100644 --- a/ids.el +++ b/ids.el @@ -45,7 +45,14 @@ (let* ((chr (aref string 0)) (ucs (encode-char chr '=ucs 'defined-only)) big5) - (unless (and ucs (<= #x2FF0 ucs)(<= ucs #x2FFF)) + (unless (or (and ucs (<= #x2FF0 ucs)(<= ucs #x2FFF)) + (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))) @@ -56,9 +63,17 @@ (if (>= (length string) 1) (let* ((chr (aref string 0)) (ucs (encode-char chr '=ucs 'defined-only))) - (if (or (eq ucs #x2FF0) - (eq ucs #x2FF1) - (and (<= #x2FF4 ucs)(<= ucs #x2FFB))) + (if (or (and ucs + (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) + '(#x2FF1 #x2FF9 #x2FF6 #x2FFB)) + (memq (encode-char chr '=ucs-itaiji-002) + '(#x2FF1)) + ) (cons chr (substring string 1))))))