update.

[chise/ids.git] / ids.el

diff --git a/ids.el b/ids.el
index 8214e83..0a05650 100644 (file)
--- a/ids.el
+++ b/ids.el
@@ -1,11 +1,11 @@
 ;;; ids.el --- Parser and utility for Ideographic Description Sequence.
 
-;; Copyright (C) 2001,2002,2003,2005 MORIOKA Tomohiko
+;; Copyright (C) 2001, 2002, 2003, 2005, 2020 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: IDS, IDC, Ideographs, UCS, Unicode
 
-;; This file is a part of Tomoyo-Tools.
+;; This file is a part of CHISE-IDS.
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -30,19 +30,24 @@
 ;;; Code:
 
 (require 'ideograph-util)
+(require 'ids-find)
 
 (defun ideographic-structure-find-char (structure)
-  (dolist (product (char-feature (nth 1 structure) 'ideographic-products))
-    (if (equal structure
-              (char-feature product 'ideographic-structure))
-       (return product))))
+  (car (ideographic-structure-find-chars structure))
+  ;; (dolist (product (char-feature (nth 1 structure) 'ideographic-products))
+  ;;   (if (equal structure
+  ;;              (char-feature product 'ideographic-structure))
+  ;;       (return product)))
+  )
 
 (defun ids-parse-terminal (string)
   (if (>= (length string) 1)
       (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-itaiji-001)
+                         '(#x2FF9 #x2FF6)))
          (if (and ucs (<= #xE000 ucs)(<= ucs #xF8FF)
                   (setq big5 (encode-char chr 'chinese-big5)))
              (setq chr (decode-char '=big5-cdp big5)))
@@ -53,9 +58,12 @@
   (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-itaiji-001)
+                     '(#x2FF9 #x2FF6)))
            (cons chr
                  (substring string 1))))))