[elpa] elpa 6eb95e6 14/51: Integrate viewer support between tex.el and tex-jp.el

[Tassilo Horn]

branch: elpa
commit 6eb95e66962c446aae4f81a993bcd2d6c560f3c7
Author: Ikumi Keita <address@hidden>
Commit: Mosè Giordano <address@hidden>

    Integrate viewer support between tex.el and tex-jp.el
    
    * tex.el (TeX-view-program-list-builtin): Integrate viewer support
      between tex.el and tex-jp.el.
    * tex-jp.el : Ditto.
    
    Signed-off-by: Mosè Giordano <address@hidden>
---
 tex-jp.el |   44 +++++++++++---------------------------------
 tex.el    |   16 +++++++++++++++-
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/tex-jp.el b/tex-jp.el
index 3d4dc03..75b49b2 100644
--- a/tex-jp.el
+++ b/tex-jp.el
@@ -1,6 +1,6 @@
 ;;; tex-jp.el --- Support for Japanese TeX.  -*- coding: iso-2022-jp-unix; -*-
 
-;; Copyright (C) 2002-2007, 2012  Free Software Foundation, Inc.
+;; Copyright (C) 2002-2007, 2012, 2016  Free Software Foundation, Inc.
 ;; Copyright (C) 1999, 2001 Hidenobu Nabetani <address@hidden>
 
 ;; Author:     KOBAYASHI Shinji <address@hidden>
@@ -194,41 +194,19 @@ For detail, see `TeX-command-list', to which this list is 
appended."
         ;; http://oku.edu.mie-u.ac.jp/~okumura/texwiki/?AUCTeX
         ;; $B$r;29M$K$7$F$_$?!#(B
         ((eq system-type 'windows-nt)
-         '(("Dviout" ("dviout -1 "
-                      ((paper-a4 paper-portrait) " -y=A4 ")
-                      ((paper-a4 paper-landscape) " -y=A4L ")
-                      ((paper-a5 paper-portrait) " -y=A5 ")
-                      ((paper-a5 paper-landscape) " -y=A5L ")
-                      ((paper-b5 paper-portrait) " -y=E5 ")
-                      ((paper-b5 paper-landscape) " -y=E5L ")
-                      ((paper-b4jis paper-portrait) " -y=B4 ")
-                      ((paper-b4jis paper-landscape) " -y=B4L ")
-                      ((paper-b5jis paper-portrait) " -y=B5 ")
-                      ((paper-b5jis paper-landscape) " -y=B5L ")
-                      (paper-legal " -y=Legal ")
-                      (paper-letter " -y=Letter ")
-                      (paper-executive " -y=Exective ")
-                      "%o" (mode-io-correlate " \"# %n '%b'\"")))
-           ("TeXworks" "TeXworks %o")
-           ("SumatraPDF" "SumatraPDF -reuse-instance %o"
-            (mode-io-correlate " -forward-search \"%b\" %n"))
-           ("MuPDF" "mupdf %o")))
+         '(("TeXworks" "TeXworks %o" "texworks")
+           ("MuPDF" "mupdf %o" "mupdf")))
         ;; $B$3$l$G$$$$$N$+$I$&$+$OIT0B!#(B
         ((eq system-type 'darwin)
-         '(("Preview" "open -a Preview.app %o")
-           ("TeXShop" "open -a TeXShop.app %o")
-           ("TeXworks" "open -a TeXworks.app %o")
-           ("Skim" "open -a Skim.app %o")
-           ("displayline" "displayline %n %o %b")
-           ("PictPrinter" "open -a PictPrinter.app %d")
-           ("Mxdvi" "open -a Mxdvi.app %d")
-           ("open" "open %o")))
+         '(("TeXShop" "open -a TeXShop.app %o" "open")
+           ("TeXworks" "open -a TeXworks.app %o" "open")
+           ("PictPrinter" "open -a PictPrinter.app %d" "open")
+           ("Mxdvi" "open -a Mxdvi.app %d" "open")))
         (t
          (setcar (cadr (assoc "xdvi" TeX-view-program-list-builtin))
                  "%(xdvi) -unique")
-         '(("TeXworks" "texworks %o")
-           ("zathura" "zathura %o")
-           ("MuPDF" "mupdf %o"))))))
+         '(("TeXworks" "texworks %o" "texworks")
+           ("MuPDF" "mupdf %o" "mupdf"))))))
 
 ;; $B$3$l$O(B tex.el $B$K<h$jF~$l$F$b$i$&$N$OFq$7$$$+!)(B
 ;; tex-jp.el $B$,address@hidden"(Bdvi viewer $B$N%G%U%)%k%H$,(B dviout 
$B$K(B
@@ -238,10 +216,10 @@ For detail, see `TeX-command-list', to which this list is 
appended."
        (append
         (cond
          ((eq system-type 'windows-nt)
-          '((output-dvi "Dviout")
+          '((output-dvi "dviout")
             (output-pdf "TeXworks")))
          ((eq system-type 'darwin)
-          '((output-pdf "Preview")))
+          '((output-pdf "Preview.app")))
          (t
           nil))
         TeX-view-program-selection)))
diff --git a/tex.el b/tex.el
index 7449659..f7b5bc4 100644
--- a/tex.el
+++ b/tex.el
@@ -1341,7 +1341,21 @@ DE is the name of the desktop environment, either 
\"gnome\" or
   (cond
    ((eq system-type 'windows-nt)
     '(("Yap" ("yap -1" (mode-io-correlate " -s %n%b") " %o") "yap")
-      ("dviout" ("dviout -1 %d" (mode-io-correlate "\"# %n %b\"")) "dviout")
+      ("dviout" ("dviout -1 "
+                ((paper-a4 paper-portrait) "-y=A4 ")
+                ((paper-a4 paper-landscape) "-y=A4L ")
+                ((paper-a5 paper-portrait) "-y=A5 ")
+                ((paper-a5 paper-landscape) "-y=A5L ")
+                ((paper-b5 paper-portrait) "-y=E5 ")
+                ((paper-b5 paper-landscape) "-y=E5L ")
+                ((paper-b4jis paper-portrait) "-y=B4 ")
+                ((paper-b4jis paper-landscape) "-y=B4L ")
+                ((paper-b5jis paper-portrait) "-y=B5 ")
+                ((paper-b5jis paper-landscape) "-y=B5L ")
+                (paper-legal "-y=Legal ")
+                (paper-letter "-y=Letter ")
+                (paper-executive "-y=Executive ")
+                "%d" (mode-io-correlate " \"# %n '%b'\"")) "dviout")
       ("SumatraPDF"
        ("SumatraPDF -reuse-instance"
        (mode-io-correlate " -forward-search \"%b\" %n") " %o")