((>= (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)
attributes ccs-attributes
column)
(setq attributes
- (if attributes
- (if (consp attributes)
- (copy-sequence attributes))
- (sort (char-attribute-list) #'char-attribute-name<)))
+ (sort (if attributes
+ (if (consp attributes)
+ (copy-sequence attributes))
+ (char-attribute-list))
+ #'char-attribute-name<))
(setq ccs-attributes
- (if ccs-attributes
- (copy-sequence ccs-attributes)
- (sort (charset-list) #'char-attribute-name<)))
+ (sort (if ccs-attributes
+ (copy-sequence ccs-attributes)
+ (charset-list))
+ #'char-attribute-name<))
(unless column
(setq column (current-column)))
(let (name value has-long-ccs-name rest
((memq name '(ideograph=
original-ideograph-of
ancient-ideograph-of
- vulgar-ideograph-of))
+ vulgar-ideograph-of
+ wrong-ideograph-of
+ simplified-ideograph-of
+ ideographic-variants
+ ideographic-different-form-of))
(insert (format "(%-18s%s " name line-breaking))
(setq lbs (concat "\n" (make-string (current-column) ?\ ))
separator nil)
(if (setq value (get-char-attribute char name))
(insert
(format
- (if has-long-ccs-name
- (cond ((eq name 'ideograph-daikanwa)
+ (cond ((memq name '(ideograph-daikanwa ideograph-gt))
+ (if has-long-ccs-name
"(%-26s . %05d)\t; %c%s"
- )
- ((eq name 'mojikyo)
+ "(%-18s . %05d)\t; %c%s"))
+ ((eq name 'mojikyo)
+ (if has-long-ccs-name
"(%-26s . %06d)\t; %c%s"
- )
- (t
+ "(%-18s . %06d)\t; %c%s"))
+ (t
+ (if has-long-ccs-name
"(%-26s . #x%X)\t; %c%s"
- ))
- (cond ((eq name 'ideograph-daikanwa)
- "(%-18s . %05d)\t; %c%s"
- )
- ((eq name 'mojikyo)
- "(%-18s . %06d)\t; %c%s"
- )
- (t
- "(%-18s . #x%X)\t; %c%s"
- )))
+ "(%-18s . #x%X)\t; %c%s")))
name
(if (= (charset-iso-graphic-plane name) 1)
(logior value
#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 ")")))