From: MORIOKA Tomohiko Date: Thu, 20 Feb 2014 20:32:49 +0000 (+0900) Subject: (char-attribute-name<): Prefer MJ to Adobe-Japan1. X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9f869fb8a091a618a4e3a6f3474a8d5f41f8f8a7;p=chise%2Fxemacs-chise.git (char-attribute-name<): Prefer MJ to Adobe-Japan1. --- diff --git a/lisp/utf-2000/chise-subr.el b/lisp/utf-2000/chise-subr.el index 3f00569..361662c 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 MORIOKA Tomohiko. ;; Author: MORIOKA Tomohiko ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE. @@ -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,43 @@ (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) + t) + ((eq ka '==mj) + t) + ((eq ka '=>>mj) + t) ((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) + nil) + ((eq kb '=>>mj) + nil) ((and (setq b-id (charset-id kb)) (charset-id-adobe-japan1-p b-id)) nil)