X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=4266da8e7336332a94b4378dd70176d47f9baf04;hb=fe737536ad4a328e2781c2b2b74793d3d3e7d1f8;hp=3f5d1181799edf18b66f92f91e819bd9714bf662;hpb=d9bc0cb68536fc8ecfa571d16fdf993c77c354f8;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 3f5d118..4266da8 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -93,7 +93,10 @@
 		  ((>= (charset-iso-final-char kb) ?0)
 		   (< (charset-iso-final-char ka)
 		      (charset-iso-final-char kb)))
-		  (t)))))
+		  (t)))
+		(t (if (>= (charset-iso-final-char kb) ?0)
+		       nil
+		     (> (charset-id ka)(charset-id kb))))))
 	      ((<= (charset-chars ka)(charset-chars kb)))))
        (t
 	(< (charset-dimension ka)
@@ -623,7 +626,21 @@
 			       #x808080)
 			      (t 0)))
 	      value)
-	    (decode-builtin-char name value)
+	    (if (and (memq name '(ideograph-gt-pj-1
+				  ideograph-gt-pj-2
+				  ideograph-gt-pj-3
+				  ideograph-gt-pj-4
+				  ideograph-gt-pj-5
+				  ideograph-gt-pj-6
+				  ideograph-gt-pj-7
+				  ideograph-gt-pj-8
+				  ideograph-gt-pj-9
+				  ideograph-gt-pj-10
+				  ideograph-gt-pj-11))
+		     (setq ret (decode-char name value))
+		     (setq ret (get-char-attribute ret 'ideograph-gt)))
+		(decode-builtin-char 'ideograph-gt ret)
+	      (decode-builtin-char name value))
 	    line-breaking)))
       (setq ccs-attributes (cdr ccs-attributes)))
     (insert ")")))