(chise-tex-coded-charset-expression-alist): Use

`=ucs-bmp@{gb|jis|ks|cns}' instead of `=ucs@{gb|jis|ks|cns}'; don't
use UCSjis for `=ucs@jis/2000; use `GTpj{A|B|C|...|K}' instead of
`GTpj{1|2|3|...|11}' for `=gt-pj-{1|2|3|...|11}'.
(iso-2022-jp-tex-jis): Specify `ccs-priority-list'; don't setup
`input-charset-conversion'.

diff --git a/chise2otf/elisp/chise-tex.el b/chise2otf/elisp/chise-tex.el
index ab49ff9..2a63476 100644 (file)
--- a/chise2otf/elisp/chise-tex.el
+++ b/chise2otf/elisp/chise-tex.el
@@ -25,23 +25,21 @@
 ;;; Code:
 
 (defvar chise-tex-coded-charset-expression-alist
-  '((=ucs-hangul "UCShang"     4 X)
-    (=ucs@gb   "UCSgb"         4 X)
-    (=ucs@jis  "UCSjis"        4 X)
-    (=ucs@jis/2000 "UCSjis"    4 X)
-    (=ucs@ks   "UCSks"         4 X)
-    (=gt-pj-1  "GTpj1"         4 X)
-    (=gt-pj-2  "GTpj2"         4 X)
-    (=gt-pj-3  "GTpj3"         4 X)
-    (=gt-pj-4  "GTpj4"         4 X)
-    (=gt-pj-5  "GTpj5"         4 X)
-    (=gt-pj-6  "GTpj6"         4 X)
-    (=gt-pj-7  "GTpj7"         4 X)
-    (=gt-pj-8  "GTpj8"         4 X)
-    (=gt-pj-9  "GTpj9"         4 X)
-    (=gt-pj-10 "GTpj10"        4 X)
-    (=gt-pj-11 "GTpj11"        4 X)
-    (=ucs@cns  "UCScns"        4 X)))
+  '((=ucs-bmp@gb       "UCSgb"         4 X)
+    (=ucs-bmp@jis      "UCSjis"        4 X)
+    (=ucs-bmp@ks       "UCSks"         4 X)
+    (=gt-pj-1          "GTpjA"         4 X)
+    (=gt-pj-2          "GTpjB"         4 X)
+    (=gt-pj-3          "GTpjC"         4 X)
+    (=gt-pj-4          "GTpjD"         4 X)
+    (=gt-pj-5          "GTpjE"         4 X)
+    (=gt-pj-6          "GTpjF"         4 X)
+    (=gt-pj-7          "GTpjG"         4 X)
+    (=gt-pj-8          "GTpjH"         4 X)
+    (=gt-pj-9          "GTpjI"         4 X)
+    (=gt-pj-10         "GTpjJ"         4 X)
+    (=gt-pj-11         "GTpjK"         4 X)
+    (=ucs-bmp@cns      "UCScns"        4 X)))
 
 (defun chise-tex-encode-region-for-gb (start end)
   (interactive "r")
@@ -200,8 +198,9 @@
  '(charset-g0 ascii
    short t
    seven t
-   input-charset-conversion ((latin-jisx0201 ascii)
-                            (japanese-jisx0208-1978 japanese-jisx0208))
+   ccs-priority-list (ascii
+                     =jis-x0208@1983 =jis-x0208@1978
+                     latin-jisx0201)
    pre-write-conversion chise-tex-encode-region-for-jis
    post-read-conversion chise-tex-decode-region
    mnemonic "pTeX(JIS)/7bit"