(U+20525-itaiji-002): New character; use `<-denotational' for

[chise/xemacs-chise.git] / lisp / utf-2000 / chise-subr.el

diff --git a/lisp/utf-2000/chise-subr.el b/lisp/utf-2000/chise-subr.el
index 361662c..f0e65de 100644 (file)
--- a/lisp/utf-2000/chise-subr.el
+++ b/lisp/utf-2000/chise-subr.el
@@ -1,7 +1,7 @@
 ;;; chise-subr.el --- basic lisp subroutines for XEmacs CHISE
 
 ;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009,
-;;   2010, 2011, 2012, 2013, 2014 MORIOKA Tomohiko.
+;;   2010, 2011, 2012, 2013, 2014, 2015, 2020, 2021 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -38,9 +38,9 @@
   ;;           (unless (memq domain dest)
   ;;             (push domain dest))))))
   ;;   (sort dest #'string<))
-  '(ucs ucs/compat daikanwa cns gt jis jis/alt jis/a jis/b
-       jis-x0212 jis-x0213 cdp shinjigen
-       r030 r140 misc unknown))
+  '(ucs ucs/compat daikanwa cns gt jis jis/a jis/b
+       jis-x0212 jis-x0213 cdp shinjigen mj
+       r030 r053 r055 r140 misc unknown))
 
 (defconst charset-id-=adobe-japan1-0 (charset-id '=adobe-japan1-0))
 (defconst charset-id-=adobe-japan1-6 (charset-id '=adobe-japan1-6))
@@ -167,11 +167,17 @@
                 (t nil))
              (cond
               ((eq ka '=mj)
-               t)
+               (not (eq kb '=mj))
+               )
               ((eq ka '==mj)
-               t)
+               (not (or (eq kb '=mj)
+                        (eq kb '=>>mj)
+                        (eq kb '==mj)))
+               )
               ((eq ka '=>>mj)
-               t)
+               (not (or (eq kb '=mj)
+                        (eq kb '=>>mj)))
+               )
               ((and (setq a-id (charset-id ka))
                     (charset-id-adobe-japan1-p a-id))
                (cond
@@ -189,9 +195,14 @@
               ((eq kb '=mj)
                nil)
               ((eq kb '==mj)
-               nil)
+               (or (eq ka '=mj)
+                   (eq ka '=>>mj)
+                   (eq ka '==mj))
+               )
               ((eq kb '=>>mj)
-               nil)
+               (or (eq ka '=mj)
+                   (eq ka '=>>mj))
+               )
               ((and (setq b-id (charset-id kb))
                     (charset-id-adobe-japan1-p b-id))
                nil)
@@ -217,6 +228,7 @@
 (defun char-ucs (char)
   "Return code-point of UCS."
   (or (encode-char char '=ucs 'defined-only)
+      (char-feature char '=ucs)
       (char-feature char '=>ucs)))
 
 ;;;###autoload