X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchise-subr.el;h=3f005692e91e9512eedc50c4c95402118a516c8d;hb=6adec6c7752465dc272cd7f730c0c2c6ded33f2b;hp=c62e042aebe45f6860d15ec4988e6c4c90d44642;hpb=bc677481b78427fc93a29f41236d32a51d929e14;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/chise-subr.el b/lisp/utf-2000/chise-subr.el
index c62e042..3f00569 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 MORIOKA Tomohiko.
+;;   2010, 2011, 2012, 2013 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -42,6 +42,26 @@
 	jis-x0212 jis-x0213 cdp shinjigen
 	r030 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))
+(defconst charset-id-==adobe-japan1-0 (charset-id '==adobe-japan1-0))
+(defconst charset-id-==adobe-japan1-6 (charset-id '==adobe-japan1-6))
+;; (defconst charset-id-=>>>adobe-japan1-0 (charset-id '=>>>adobe-japan1-0))
+;; (defconst charset-id-=>>>adobe-japan1-6 (charset-id '=>>>adobe-japan1-6))
+(defconst charset-id-=>>adobe-japan1-0 (charset-id '=>>adobe-japan1-0))
+(defconst charset-id-=>>adobe-japan1-6 (charset-id '=>>adobe-japan1-6))
+
+(defun charset-id-adobe-japan1-p (id)
+  (or (and (<= charset-id-=adobe-japan1-0 id)
+	   (<= id charset-id-=adobe-japan1-6))
+      (and (<= charset-id-==adobe-japan1-0 id)
+	   (<= id charset-id-==adobe-japan1-6))
+      ;; (and (<= charset-id-=>>>adobe-japan1-0 id)
+      ;;      (<= id charset-id-=>>>adobe-japan1-6))
+      (and (<= charset-id-=>>adobe-japan1-0 id)
+	   (<= id charset-id-=>>adobe-japan1-6))
+      ))
+
 
 ;;; @ feature name
 ;;;
@@ -56,6 +76,17 @@
 (defun char-attribute-name< (ka kb)
   "Return t if symbol KA is less than KB in feature-name sorting order."
   (cond
+   ((and (symbolp ka)
+	 (eq (aref (symbol-name ka) 0) ?*))
+    (cond ((and (symbolp kb)
+		(eq (aref (symbol-name kb) 0) ?*))
+	   (string< (symbol-name ka)
+		    (symbol-name kb))
+	   ))
+    )
+   ((and (symbolp kb)
+	 (eq (aref (symbol-name kb) 0) ?*))
+    t)
    ((eq '->denotational kb)
     t)
    ((eq '->subsumptive kb)
@@ -93,7 +124,7 @@
     )
    ((find-charset ka)
     (if (find-charset kb)
-	(let (a-ir b-ir)
+	(let (a-ir b-ir a-id b-id)
 	  (if (setq a-ir (charset-property ka 'iso-ir))
 	      (if (setq b-ir (charset-property kb 'iso-ir))
 		  (cond
@@ -107,10 +138,34 @@
 		   ((< a-ir
 		       b-ir)
 		    ))
-		t)
-	    (if (charset-property kb 'iso-ir)
-		nil
-	      (< (charset-id ka)(charset-id kb)))))
+		(cond
+		 ((= a-ir 177)
+		  t)
+		 ((and (setq b-id (charset-id kb))
+		       (charset-id-adobe-japan1-p b-id))
+		  nil)
+		 (t)))
+	    (if (setq b-ir (charset-property kb 'iso-ir))
+		(cond
+		 ((= b-ir 177)
+		  nil)
+		 ((and (setq a-id (charset-id ka))
+		       (charset-id-adobe-japan1-p a-id))
+		  t)
+		 (t nil))
+	      (cond
+	       ((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))
+	       ((and (setq b-id (charset-id kb))
+		     (charset-id-adobe-japan1-p b-id))
+		nil)
+	       (t
+		(< (charset-id ka)(charset-id kb))
+		)))))
       nil)
     )
    ((find-charset kb))