X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=ids-find.el;h=8ac5f3d72b70aaa42e1b0952dca231ae9c86a72a;hb=78fe2b955e98d1e38234d0ecf9e29cd31728856a;hp=1126beaa61109b2d2b302fe981199b5156302ae1;hpb=b0a46071be58705a778be91c942f28d3f3db6bc9;p=chise%2Fids.git diff --git a/ids-find.el b/ids-find.el index 1126bea..8ac5f3d 100644 --- a/ids-find.el +++ b/ids-find.el @@ -1,6 +1,6 @@ ;;; ids-find.el --- search utility based on Ideographic-structures ;; -*- coding: utf-8-mcs-er -*- -;; Copyright (C) 2002, 2003, 2005, 2006, 2007, 2017, 2020, 2021 +;; Copyright (C) 2002, 2003, 2005, 2006, 2007, 2017, 2020, 2021, 2022 ;; MORIOKA Tomohiko ;; Author: MORIOKA Tomohiko @@ -31,7 +31,14 @@ (put-char-attribute component 'ideographic-products (cons product ret)) (when (setq ret (char-feature component 'ideographic-structure)) - (ids-index-store-structure product ret))) + (ids-index-store-structure product ret)) + (when (setq ret (char-feature component 'ideographic-structure@apparent)) + (ids-index-store-structure product ret)) + (when (setq ret (char-feature component 'ideographic-structure@apparent/leftmost)) + (ids-index-store-structure product ret)) + (when (setq ret (char-feature component 'ideographic-structure@apparent/rightmost)) + (ids-index-store-structure product ret)) + ) )) (defun ids-index-store-structure (product structure) @@ -43,6 +50,12 @@ (ids-index-store-char product cell)) ((setq ret (assq 'ideographic-structure cell)) (ids-index-store-structure product (cdr ret))) + ((setq ret (assq 'ideographic-structure@apparent cell)) + (ids-index-store-structure product (cdr ret))) + ((setq ret (assq 'ideographic-structure@apparent/leftmost cell)) + (ids-index-store-structure product (cdr ret))) + ((setq ret (assq 'ideographic-structure@apparent/rightmost cell)) + (ids-index-store-structure product (cdr ret))) ((setq ret (find-char cell)) (ids-index-store-char product ret)) )))) @@ -585,6 +598,9 @@ (ideographic-structure-equal str structure)) (and (setq str (get-char-attribute pc 'ideographic-structure@apparent/leftmost)) + (ideographic-structure-equal str structure)) + (and (setq str + (get-char-attribute pc 'ideographic-structure@apparent/rightmost)) (ideographic-structure-equal str structure))) (setq pl (cons pc pl)) )) @@ -1687,12 +1703,14 @@ COMPONENT can be a character or char-spec." (cond ((characterp enc) (or (get-char-attribute enc 'ideographic-structure) (get-char-attribute enc 'ideographic-structure@apparent) - (get-char-attribute enc 'ideographic-structure@apparent/leftmost)) + (get-char-attribute enc 'ideographic-structure@apparent/leftmost) + (get-char-attribute enc 'ideographic-structure@apparent/rightmost)) ) ((consp enc) (or (cdr (assq 'ideographic-structure enc)) (cdr (assq 'ideographic-structure@apparent enc)) - (cdr (assq 'ideographic-structure@apparent/leftmost enc))) + (cdr (assq 'ideographic-structure@apparent/leftmost enc)) + (cdr (assq 'ideographic-structure@apparent/rightmost enc))) ))) ;; (setq enc-str ;; (mapcar (lambda (cell)