[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 1a7b2bfaafd6ba17b93c77e9727cdad86181c967

[Ikumi Keita]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  1a7b2bfaafd6ba17b93c77e9727cdad86181c967 (commit)
      from  cff843b1753df62c75071c4cbdafd2c88547108d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1a7b2bfaafd6ba17b93c77e9727cdad86181c967
Author: Ikumi Keita <address@hidden>
Date:   Sun May 6 13:27:36 2018 +0900

    Adjust coding system for Japanese pTeX engine on w32
    
    Default coding system of Japanese pTeX engine in w32 TeXLive changed
    from SHIFT JIS to UTF-8 in 2018.  Make tex-jp.el to work with both
    TeXLive 2017 and 2018 on w32 platform, with higher priority on newer
    engine with regard to the behavior in non default case.
    
    * tex-jp.el (japanese-TeX-use-kanji-opt-flag): Set default value to t
    even on w32 platform.
    (japanese-TeX-set-process-coding-system): Change coding system for non
    default case from `shift_jis' to `utf-8' on w32 platform.
    (TeX-expand-list-builtin): Remove mule feature check.

diff --git a/tex-jp.el b/tex-jp.el
index a3e20fe..2bd2ff2 100644
--- a/tex-jp.el
+++ b/tex-jp.el
@@ -50,7 +50,7 @@
                 (const :tag "jTeX" jtex)
                 (const :tag "upTeX" uptex)))
 
-(defcustom japanese-TeX-use-kanji-opt-flag (not (eq system-type 'windows-nt))
+(defcustom japanese-TeX-use-kanji-opt-flag t
   "Add kanji option to Japanese pTeX family if non-nil.
 If `TeX-japanese-process-input-coding-system' or
 `TeX-japanese-process-output-coding-system' are non-nil, the process coding
@@ -96,12 +96,7 @@ systems are determined by their values regardless of the 
kanji option."
        '(
         ;; -kanji $B%*%W%7%g%s$NJ8;zNs$r:n$k!#(B
         ("%(kanjiopt)" (lambda ()
-                         (if (and
-                              ;; non-mule $B$J(B emacsen 
$B$O$=$b$=$bF|K\8l(B
-                              ;; $BJ8=q$r(B typeset 
$B$9$k$3$H$O9M$($J$/$F$b(B
-                              ;; address@hidden&!"$H$O;W$&$1$I0l1~!D!#(B
-                              (featurep 'mule)
-                              japanese-TeX-use-kanji-opt-flag)
+                         (if japanese-TeX-use-kanji-opt-flag
                              (let ((str (japanese-TeX-get-encoding-string)))
                                (if str (format " -kanji=%s " str) ""))
                            "")))
@@ -134,8 +129,7 @@ systems are determined by their values regardless of the 
kanji option."
                            (t "makeindex"))))
         ;; mendex $BMQF|K\8l%3!<%I%*%W%7%g%s!#(B
         ("%(mendexkopt)" (lambda ()
-                           (if (and (featurep 'mule)
-                                    japanese-TeX-use-kanji-opt-flag)
+                           (if japanese-TeX-use-kanji-opt-flag
                                (let ((str (japanese-TeX-get-encoding-string)))
                                  ;; $B#1J8;zL\$rBgJ8;z$K!#(B
                                  (if str (format " -%c " (upcase (aref str 0)))
@@ -313,12 +307,14 @@ See also a user custom option 
`TeX-japanese-process-input-coding-system'."
                   ;; ptex $B$J$i(B mac $B$O(B utf-8$B!#(B
                   ;; windows $B$G(B -kanji 
$B%*%W%7%g%s$"$j$N;~$O$=$NJ8;z%3!<%I!"(B
                   ;; $B$J$7$N;~$O(B sjis$B!#(B
+                  ;; texlive 2018 $B$+$i$O(B sjis $B$G$O$J$/(B utf-8 
$B$K$J$C$?$N$G(B
+                  ;; $B$=$A$i$K9g$o$;$k!#(B
                   ((eq TeX-engine 'ptex)
                    (cond ((eq system-type 'darwin)
                           'utf-8)
                          ((and japanese-TeX-use-kanji-opt-flag kanji)
                           kanji)
-                         (t 'shift_jis)))
+                         (t 'utf-8)))
                   ;; jtex $B$J$i(B sjis $B$K8GDj$9$k!#(B
                   ((eq TeX-engine 'jtex)
                    'shift_jis)
@@ -343,11 +339,12 @@ See also a user custom option 
`TeX-japanese-process-input-coding-system'."
           (enc (cond
                 ;; ptex $B$G(B -kanji 
$B%*%W%7%g%s$"$j$J$i!"$=$NJ8;z%3!<%I!#(B
                 ;; $B$J$7$J$i(B utf-8 $B$+(B sjis$B!#(B
+                ;; texlive 2018 $B$G(B w32 $B$G$b(B utf-8 
$B$,%G%U%)%k%H$K$J$C(B
+                ;; $B$?$h$&$J$N$G!"$=$l$K9g$o$;$k!#(B
                 ((eq TeX-engine 'ptex)
                  (if (and japanese-TeX-use-kanji-opt-flag kanji)
                      kanji
-                   (if (eq system-type 'windows-nt)
-                       'shift_jis 'utf-8)))
+                   'utf-8))
                 ;; jtex $B$J$i(B euc $B$+(B sjis $B$K8GDj$9$k!#(B
                 ((eq TeX-engine 'jtex)
                  (if (memq system-type '(windows-nt darwin))

-----------------------------------------------------------------------

Summary of changes:
 tex-jp.el | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX