X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchise-subr.el;h=72b3e4cecb38c58b7d424c497be56e5ed904d199;hb=e7ddc5e3051207b5315023c2182c680158fbebb0;hp=3f005692e91e9512eedc50c4c95402118a516c8d;hpb=ba55dbdf59ebd56638c196341eb1c7e5cb9a022e;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/chise-subr.el b/lisp/utf-2000/chise-subr.el
index 3f00569..72b3e4c 100644
--- 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 MORIOKA Tomohiko.
+;;   2010, 2011, 2012, 2013, 2014, 2015, 2020, 2021, 2022 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 r074 r130 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))
@@ -141,6 +141,12 @@
 		(cond
 		 ((= a-ir 177)
 		  t)
+		 ((eq kb '=mj)
+		  nil)
+		 ((eq kb '==mj)
+		  nil)
+		 ((eq kb '=>>mj)
+		  nil)
 		 ((and (setq b-id (charset-id kb))
 		       (charset-id-adobe-japan1-p b-id))
 		  nil)
@@ -149,17 +155,54 @@
 		(cond
 		 ((= b-ir 177)
 		  nil)
+		 ((eq ka '=mj)
+		  t)
+		 ((eq ka '==mj)
+		  t)
+		 ((eq ka '=>>mj)
+		  t)
 		 ((and (setq a-id (charset-id ka))
 		       (charset-id-adobe-japan1-p a-id))
 		  t)
 		 (t nil))
 	      (cond
+	       ((eq ka '=mj)
+		(not (eq kb '=mj))
+		)
+	       ((eq ka '==mj)
+		(not (or (eq kb '=mj)
+			 (eq kb '=>>mj)
+			 (eq kb '==mj)))
+		)
+	       ((eq ka '=>>mj)
+		(not (or (eq kb '=mj)
+			 (eq kb '=>>mj)))
+		)
 	       ((and (setq a-id (charset-id ka))
 		     (charset-id-adobe-japan1-p a-id))
-		(if (and (setq b-id (charset-id kb))
-			 (charset-id-adobe-japan1-p b-id))
-		    (< a-id b-id)
-		  t))
+		(cond
+		 ((eq kb '=mj)
+		  nil)
+		 ((eq kb '==mj)
+		  nil)
+		 ((eq kb '=>>mj)
+		  nil)
+		 ((and (setq b-id (charset-id kb))
+		       (charset-id-adobe-japan1-p b-id))
+		  (< a-id b-id))
+		 (t))
+		)
+	       ((eq kb '=mj)
+		nil)
+	       ((eq kb '==mj)
+		(or (eq ka '=mj)
+		    (eq ka '=>>mj)
+		    (eq ka '==mj))
+		)
+	       ((eq kb '=>>mj)
+		(or (eq ka '=mj)
+		    (eq ka '=>>mj))
+		)
 	       ((and (setq b-id (charset-id kb))
 		     (charset-id-adobe-japan1-p b-id))
 		nil)
@@ -185,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