X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchise-subr.el;h=8f8eab5ec1fdeb672e0b81c5274493c322fe099d;hb=c851b953fa8361ad1961c7e71cbfcb4ce267bd95;hp=87c0577662b1fb90b2ae8f43e0cc32a80c6005c0;hpb=9d7e9d226126e99f2215df5370e8e33896c03cae;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/chise-subr.el b/lisp/utf-2000/chise-subr.el
index 87c0577..8f8eab5 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, 2014, 2015, 2020 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.
@@ -40,7 +40,7 @@
   ;;   (sort dest #'string<))
   '(ucs ucs/compat daikanwa cns gt jis jis/a jis/b
 	jis-x0212 jis-x0213 cdp shinjigen mj
-	r030 r053 r055 r140 misc unknown))
+	r030 r053 r055 r074 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)