update.

[chise/ids.git] / ids.el

diff --git a/ids.el b/ids.el
index 1ae8464..c793a24 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 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
 
-;; 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
@@ -29,25 +29,51 @@
 
 ;;; Code:
 
+(require 'ideograph-util)
+(require 'ids-find)
+
+(defun ideographic-structure-find-char (structure)
+  (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 (get-char-attribute chr 'ucs))
+            (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 (get-char-attribute chr 'chinese-big5)))
-             (setq chr (decode-char 'chinese-big5-cdp big5)))
+                  (setq big5 (encode-char chr 'chinese-big5)))
+             (setq chr (decode-char '=big5-cdp big5)))
          (cons chr
                (substring string 1))))))
 
 (defun ids-parse-op-2 (string)
   (if (>= (length string) 1)
       (let* ((chr (aref string 0))
-            (ucs (get-char-attribute chr 'ucs)))
-       (if (or (eq ucs #x2FF0)
-               (eq ucs #x2FF1)
-               (and (<= #x2FF4 ucs)(<= ucs #x2FFB)))
+            (ucs (encode-char chr '=ucs 'defined-only)))
+       (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))))))
 
@@ -98,27 +124,29 @@
     (if (= (length (cdr ret)) 0)
        (car ret))))
 
-(defun ids-format-unit (ids-char)
-  (let (ret)
-    (cond ((characterp ids-char)
-          (char-to-string ids-char))
-         ((integerp ids-char)
-          (char-to-string (decode-char 'ucs ids-char)))
-         ((setq ret (find-char ids-char))
-          (char-to-string ret))
-         ((setq ret (assq 'ideographic-structure ids-char))
-          (ids-format-list (cdr ret))))))
-
-;;;###autoload
-(defun ids-format-list (ids-list)
-  "Format ideographic-structure IDS-LIST as an IDS-string."
-  (mapconcat (lambda (cell)
-              (ids-format-unit
-               (if (char-ref-p cell)
-                   (plist-get cell :char)
-                 cell)))
-            ids-list ""))
+;; (defun ids-format-unit (ids-char)
+;;   (let (ret)
+;;     (cond ((characterp ids-char)
+;;            (char-to-string ids-char))
+;;           ((integerp ids-char)
+;;            (char-to-string (decode-char 'ucs ids-char)))
+;;           ((setq ret (find-char ids-char))
+;;            (char-to-string ret))
+;;           ((setq ret (assq 'ideographic-structure ids-char))
+;;            (ids-format-list (cdr ret))))))
+
+;; ;;;###autoload
+;; (defun ids-format-list (ids-list)
+;;   "Format ideographic-structure IDS-LIST as an IDS-string."
+;;   (mapconcat (lambda (cell)
+;;                (ids-format-unit
+;;                 (if (char-ref-p cell)
+;;                     (plist-get cell :char)
+;;                   cell)))
+;;              ids-list ""))
                     
+(define-obsolete-function-alias
+  'ids-format-list 'ideographic-structure-to-ids)
 
 ;;; @ End.
 ;;;