# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1423783212 -32400
# Node ID 9ab38ecfd3d1974dd4d86f663ee74be0af531547
# Parent  781604df4cbd082ea9688aad4850510e47a8baf0
Default previewer for PDF is taken from %#PDFVIEW instead of %#PREVIEW.

diff -r 781604df4cbd -r 9ab38ecfd3d1 docs/yatexe.tex
--- a/docs/yatexe.tex	Wed Feb 11 11:45:37 2015 +0900
+++ b/docs/yatexe.tex	Fri Feb 13 08:20:12 2015 +0900
@@ -8,7 +8,7 @@
 
 @iftex
 @c @syncodeindex fn cp
-@c Last modified Wed Feb 11 11:44:13 2015 on firestorm
+@c Last modified Fri Feb 13 08:15:26 2015 on firestorm
 @syncodeindex vr cp
 @end iftex
 
@@ -422,12 +422,20 @@
 La@TeX{} related process.
 
 @table @code
+ @item %#PREVIEW
+	@dots{} Command line for DVI viewing ([prefix] t p)
+ @item %#MAKEINDEX
+	@dots{} Command line for makeindex ([prefix] t i)
  @item %#BIBTEX
-	@dots{} Command line for makeindex ([prefix] t i)
- @item %#MAKEINDEX
 	@dots{} Command line for bibtex ([prefix] t b)
  @item %#DVIPDF
 	@dots{} Command line for dvipdf(mx) ([prefix] t b)
+ @item %#LPR
+	@dots{} Command line for printing out([prefix] t l)
+ @item %#PDFVIEW
+	@dots{} Command line for PDF viewing
+ @item %#IMAGEDPI
+	@dots{} DPI value for converting to on-the-fly prewview image
 @end table
 
 If you want to invoke ``makeidx hogehoge'' to update index,
diff -r 781604df4cbd -r 9ab38ecfd3d1 docs/yatexj.tex
--- a/docs/yatexj.tex	Wed Feb 11 11:45:37 2015 +0900
+++ b/docs/yatexj.tex	Fri Feb 13 08:20:12 2015 +0900
@@ -13,7 +13,7 @@
 @c ノードいじったら C-l C-u C-n 全部のノード更新 C-l C-u C-e
 @c メニュー増やしたら C-l C-u C-m 全部のメニュー更新 C-l C-u C-a
 @c フォーマットするときは C-l C-e C-b
-@c Last modified Wed Feb 11 11:42:41 2015 on firestorm
+@c Last modified Fri Feb 13 08:17:31 2015 on firestorm
 @syncodeindex vr cp
 @end iftex
 
@@ -534,12 +534,20 @@
 La@TeX{} 文書に関連するコマンドは以下の %# 記法で指定することができます。
 
 @table @code
+ @item %#PREVIEW
+	@dots{} Command line for DVI viewing ([prefix] t p)
  @item %#BIBTEX
 	@dots{} makeindexを行なうコマンドライン([prefix] t b)
  @item %#MAKEINDEX
 	@dots{} bibtexを行なうコマンドライン([prefix] t i)
  @item %#DVIPDF
 	@dots{} DVIからPDF変換を行なうコマンドライン([prefix] t d)
+ @item %#LPR
+	@dots{} 印刷用のコマンドライン([prefix] t l)
+ @item %#PDFVIEW
+	@dots{} PDFファイルを見るためのコマンドライン
+ @item %#IMAGEDPI
+	@dots{} 即時プレヴュー(on-the-fly preview)用の画像のDPI
 @end table
 
 行頭がこれらのキーワードで始まる行をLa@TeX{}文書の先頭付近に書いておけば、
diff -r 781604df4cbd -r 9ab38ecfd3d1 yatex.el
--- a/yatex.el	Wed Feb 11 11:45:37 2015 +0900
+++ b/yatex.el	Fri Feb 13 08:20:12 2015 +0900
@@ -1,6 +1,6 @@
 ;;; yatex.el --- Yet Another tex-mode for emacs //野鳥// -*- coding: sjis -*-
 ;;; (c)1991-2015 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Wed Feb 11 11:40:20 2015 on firestorm
+;;; Last modified Fri Feb 13 08:11:15 2015 on firestorm
 ;;; $Id$
 ;;; The latest version of this software is always available at;
 ;;; http://www.yatex.org/
@@ -1676,17 +1676,18 @@
   "Operate %# notation."
   ;;Do not use interactive"r" for the functions which require no mark
   (interactive)
-  (message "!)Edit-%%#! D)VIPDF B)EGIN-END-region P)review L)PR M)akeidx b)ibtex dp(I)")
+  (message "!)Edit-%%#! D)VIPDF B)EGIN-END P)review pdf(V)iew L)PR M)akeidx b)ibtex dp(I)")
   (let ((c (or char (read-char))) (string "") key
 	(b (make-marker)) (e (make-marker)))
     (save-excursion
       (cond
-       ((rindex "!plmibd" c)		;Edit %#xxx
+       ((rindex "!plmibdv" c)		;Edit %#xxx
 	(setq key (cdr (assq c '((?! . "!")
 				 (?p . "PREVIEW")
 				 (?l . "LPR")
 				 (?m . "MAKEINDEX")
 				 (?d . "DVIPDF")
+				 (?v . "PDFVIEW")
 				 (?i . "IMAGEDPI")
 				 (?b . "BIBTEX")))))
 	(YaTeX-getset-builtin key t))
diff -r 781604df4cbd -r 9ab38ecfd3d1 yatexprc.el
--- a/yatexprc.el	Wed Feb 11 11:45:37 2015 +0900
+++ b/yatexprc.el	Fri Feb 13 08:20:12 2015 +0900
@@ -1,7 +1,7 @@
 ;;; yatexprc.el --- YaTeX process handler -*- coding: sjis -*-
 ;;; 
 ;;; (c)1993-2015 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Mon Jan 19 08:35:39 2015 on firestorm
+;;; Last modified Fri Feb 13 08:07:20 2015 on firestorm
 ;;; $Id$
 
 ;;; Code:
@@ -959,14 +959,15 @@
 (defun YaTeX-preview-default-previewer ()
   "Return default previewer for this document"
   (YaTeX-replace-format
-		     (or (YaTeX-get-builtin "PREVIEW")
-			 (if (eq (get 'dvi2-command 'format) 'pdf)
-			     tex-pdfview-command
-			   dvi2-command))
-		     "p" (format (cond
-				  (YaTeX-dos "-y:%s")
-				  (t "-paper %s"))
-				 (YaTeX-get-paper-type))))
+   (if (eq (get 'dvi2-command 'format) 'pdf)
+       (or (YaTeX-get-builtin "PDFVIEW")
+	   tex-pdfview-command)
+     (or (YaTeX-get-builtin "PREVIEW")
+	 dvi2-command))
+   "p" (format (cond
+		(YaTeX-dos "-y:%s")
+		(t "-paper %s"))
+	       (YaTeX-get-paper-type))))
 (defun YaTeX-preview-default-main (command)
   "Return default preview target file"
   (if (get 'dvi2-command 'region)