From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Wed, 16 Oct 2013 13:30:43 +0000 (+0900)
Subject: (charset-id-==adobe-japan1-0): New constant.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=dcb1ec9814e4b3890a6c9ee39a74e3cf54dab5ec;p=chise%2Fxemacs-chise.git-

(charset-id-==adobe-japan1-0): New constant.
(charset-id-==adobe-japan1-6): New constant.
(charset-id-adobe-japan1-p): New function.
(char-attribute-name<): Use `charset-id-adobe-japan1-p'.
---

diff --git a/lisp/utf-2000/chise-subr.el b/lisp/utf-2000/chise-subr.el
index a9dce30..973ad79 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.
@@ -44,11 +44,24 @@
 
 (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
 ;;;
@@ -129,13 +142,7 @@
 		 ((= a-ir 177)
 		  t)
 		 ((and (setq b-id (charset-id kb))
-		       (or (and (<= charset-id-=adobe-japan1-0 b-id)
-				(<= b-id charset-id-=adobe-japan1-6))
-			   (and (<= charset-id-=>>>adobe-japan1-0 b-id)
-				(<= b-id charset-id-=>>>adobe-japan1-6))
-			   (and (<= charset-id-=>>adobe-japan1-0 b-id)
-				(<= b-id charset-id-=>>adobe-japan1-6))
-			   ))
+		       (charset-id-adobe-japan1-p b-id))
 		  nil)
 		 (t)))
 	    (if (setq b-ir (charset-property kb 'iso-ir))
@@ -143,42 +150,18 @@
 		 ((= b-ir 177)
 		  nil)
 		 ((and (setq a-id (charset-id ka))
-		       (or (and (<= charset-id-=adobe-japan1-0 a-id)
-				(<= a-id charset-id-=adobe-japan1-6))
-			   (and (<= charset-id-=>>>adobe-japan1-0 a-id)
-				(<= a-id charset-id-=>>>adobe-japan1-6))
-			   (and (<= charset-id-=>>adobe-japan1-0 a-id)
-				(<= a-id charset-id-=>>adobe-japan1-6))
-			   ))
+		       (charset-id-adobe-japan1-p a-id))
 		  t)
 		 (t nil))
 	      (cond
 	       ((and (setq a-id (charset-id ka))
-		     (or (and (<= charset-id-=adobe-japan1-0 a-id)
-			      (<= a-id charset-id-=adobe-japan1-6))
-			 (and (<= charset-id-=>>>adobe-japan1-0 a-id)
-			      (<= a-id charset-id-=>>>adobe-japan1-6))
-			 (and (<= charset-id-=>>adobe-japan1-0 a-id)
-			      (<= a-id charset-id-=>>adobe-japan1-6))
-			 ))
+		     (charset-id-adobe-japan1-p a-id))
 		(if (and (setq b-id (charset-id kb))
-			 (or (and (<= charset-id-=adobe-japan1-0 b-id)
-				  (<= b-id charset-id-=adobe-japan1-6))
-			     (and (<= charset-id-=>>>adobe-japan1-0 b-id)
-				  (<= b-id charset-id-=>>>adobe-japan1-6))
-			     (and (<= charset-id-=>>adobe-japan1-0 b-id)
-				  (<= b-id charset-id-=>>adobe-japan1-6))
-			     ))
+			 (charset-id-adobe-japan1-p b-id))
 		    (< a-id b-id)
 		  t))
 	       ((and (setq b-id (charset-id kb))
-		     (or (and (<= charset-id-=adobe-japan1-0 b-id)
-			      (<= b-id charset-id-=adobe-japan1-6))
-			 (and (<= charset-id-=>>>adobe-japan1-0 b-id)
-			      (<= b-id charset-id-=>>>adobe-japan1-6))
-			 (and (<= charset-id-=>>adobe-japan1-0 b-id)
-			      (<= b-id charset-id-=>>adobe-japan1-6))
-			 ))
+		     (charset-id-adobe-japan1-p b-id))
 		nil)
 	       (t
 		(< (charset-id ka)(charset-id kb))