"C2-to-UCS.txt"
"C3-to-UCS.txt" "C4-to-UCS.txt"
"C5-to-UCS.txt" "C6-to-UCS.txt"
+ "C7-to-UCS.txt"
"B-to-UCS.txt" "JC3-to-UCS.txt"))
(mapping-table-read-file (expand-file-name file "../etc/char-data/")))
(jp-jouyou-read-file "../etc/char-data/jp-jouyou.txt")
(let ((ucs #xE000)
- big5 chr
- ret)
+ big5 chr)
(while (<= ucs #xF848)
(setq chr (decode-char 'ucs ucs))
(when (setq big5 (get-char-attribute chr '=big5-pua))
(setq ucs (1+ ucs))))
-(setq gt-pj-1-and-jis-x0208-1990-different-code-points
+(defconst gt-pj-1-and-jis-x0208-1990-different-code-points
'(#x5C37 #x5C52 #x3521 #x5D62 #x5F4A
#x5F5B #x6062 #x4849 #x6173 #x306B
#x6328 #x6352 #x6362 #x6471 #x6524
#x4043 #x6E56 #x6132 #x5C54 #x3557
#x5827 #x4C68 #x505B #x514A #x5D27
#x5563 #x5D7A #x4575 #x5F7C #x3B38
- #x3237))
+ #x3237 #x3B51 #x596E #x5B5B #x6640
+ #x6D75 #x4D2C #x737B #x7379 #x5E7A
+ #x3E7A #x3865 #x557B #x436B #x413B
+ #x562D #x4C28 #x562F #x5631 #x5632
+ #x5633 #x5635 #x463D #x362E #x3265
+ #x563B #x4A76 #x5638 #x5637 #x3A6A
+ #x5642 #x563D #x5647 #x5641 #x5644
+ #x5648 #x564A #x3A37 #x564F #x4568
+ #x5653 #x5652 #x5654 #x5655 #x5659
+ #x565C #x3474 #x562E #x5630 #x5639
+ #x3D54 #x5645 #x564E #x5651 #x564C
+ #x3460 #x565B #x5628 #x5726 #x5759
+ #x583E #x5833 #x5843 #x584E #x5860
+ #x585D #x4463 #x4C31 #x5351 #x6243
+ #x587A #x5921 #x4879 #x4530 #x4863
+ #x5932 #x3E35 #x4D5E #x5A2D #x4471
+ #x5939 #x3348 #x3969 #x594D #x3044
+ #x594B #x3027 #x3F36 #x405C #x5964
+ #x5962 #x5953 #x5977 #x3B35 #x4531
+ #x5A26 #x5A2B #x5A2F #x5A36 #x5A37
+ #x5A3B #x5A2C #x5A2A #x5A40 #x5A3F
+ #x5A41 #x327E #x384E #x5A43 #x5A47
+ #x5A45 #x4754 #x343A #x3B36 #x4658
+ #x3749 #x3F74 #x4528 #x4030 #x5A4C
+ #x507B #x507E #x5353 #x5A44 #x6E2B
+ #x5B30 #x4C40))
(map-char-attribute
(lambda (c v)
(unless (memq v gt-pj-1-and-jis-x0208-1990-different-code-points)
- (put-char-attribute (decode-char 'japanese-jisx0208-1990 v)
+ (put-char-attribute (decode-char '=jis-x0208@1990 v)
'=gt-pj-1 v))
nil)
'=gt-pj-1)
(put-char-attribute chr '=gt-k i)))
(setq i (1+ i))))
-(let (gt)
- (dolist (ccs '(=gt-pj-1
- =gt-pj-2
- =gt-pj-3
- =gt-pj-4
- =gt-pj-5
- =gt-pj-6
- =gt-pj-7
- =gt-pj-8
- =gt-pj-9
- =gt-pj-10
- =gt-pj-11))
- (map-char-attribute
- (lambda (c v)
- (when (setq gt (encode-char c '=gt))
- (put-char-attribute c '=gt gt)
- (put-char-attribute (decode-char ccs v) '=gt gt))
- nil)
- ccs)))
+;; (let (gt ret)
+;; (dolist (ccs '(=gt-pj-1
+;; =gt-pj-2
+;; =gt-pj-3
+;; =gt-pj-4
+;; =gt-pj-5
+;; =gt-pj-6
+;; =gt-pj-7
+;; =gt-pj-8
+;; =gt-pj-9
+;; =gt-pj-10
+;; =gt-pj-11))
+;; (map-char-attribute
+;; (lambda (c v)
+;; (when (setq gt (encode-char c '=gt))
+;; (put-char-attribute c '=gt gt)
+;; (put-char-attribute (decode-char ccs v) '=gt gt))
+;; nil)
+;; ccs)))
;; (let (ret)
;; (dolist (feature
(buffer-disable-undo)
(insert-file-contents "../etc/char-data/JX3-JX1-rep-diff.txt")
(goto-char (point-min))
- (let (ku ten char code ucs)
+ (let (ku ten char code ucs rep-char)
(while (re-search-forward "^1-\\([0-9]+\\)-\\([0-9]+\\)[ \t]+" nil t)
(setq ku (string-to-number (match-string 1))
ten (string-to-number (match-string 2)))
(setq char (make-char '=jis-x0213-1@2000 (+ ku 32)(+ ten 32)))
(setq code (encode-char char '=jis-x0213-1@2000))
- (put-char-attribute char '=jis-x0213-1@2000 code)
- (remove-char-attribute char '=jis-x0213-1)
- (remove-char-attribute char '=jis-x0213-1@2004)
(setq ucs (encode-char char '=ucs@jis/2000))
- (remove-char-attribute char '=ucs@jis)
- (remove-char-attribute char '=ucs@jis/2004)
- (when (setq char (decode-char '=jis-x0213-1@2004 code))
- (unless (eq (encode-char char '=ucs@jis/2004) ucs)
- (put-char-attribute char '=ucs@jis/2004 ucs)))
+ (setq rep-char (decode-char '==jis-x0213-1@2000 code))
+ (cond
+ ((or (eq char rep-char)
+ (null rep-char))
+ (put-char-attribute char '=jis-x0213-1@2000 code)
+ (remove-char-attribute char '=jis-x0213-1)
+ (remove-char-attribute char '=jis-x0213-1@2004)
+ (remove-char-attribute char '=ucs@jis)
+ (remove-char-attribute char '=ucs@jis/2004)
+ (when (setq char (decode-char '=jis-x0213-1@2004 code))
+ (unless (eq (encode-char char '=ucs@jis/2004) ucs)
+ (put-char-attribute char '=ucs@jis/2004 ucs)))
+ )
+ (rep-char
+ (put-char-attribute rep-char '==jis-x0213-1@2000 code)
+ (remove-char-attribute rep-char '==jis-x0213-1)
+ (remove-char-attribute rep-char '==jis-x0213-1@2004)
+ (setq ucs (or (encode-char rep-char '==ucs@jis/2000)
+ ucs))
+ (remove-char-attribute rep-char '==ucs@jis)
+ (remove-char-attribute rep-char '==ucs@jis/2004)
+ (when (setq rep-char (decode-char '==jis-x0213-1@2004 code))
+ (unless (eq (encode-char rep-char '==ucs@jis/2004) ucs)
+ (put-char-attribute rep-char '==ucs@jis/2004 ucs)))
+ ))
(unless (eq code #x332A)
(when (setq char (decode-char '=>jis-x0208@1997 code 'defined-only))
(unless (eq (encode-char char '=>>jis-x0208) code)
- (put-char-attribute char '=>jis-x0208 code)
- (remove-char-attribute char '=>jis-x0208@1997))))
+ (unless (eq (encode-char char '=+>jis-x0208) code)
+ (put-char-attribute char '=>jis-x0208 code)
+ (remove-char-attribute char '=>jis-x0208@1997)))))
)))
(map-char-attribute