1.1 --- a/yatexprc.el	Wed Dec 31 23:00:01 2014 +0900
     1.2 +++ b/yatexprc.el	Sun Jan 04 00:39:44 2015 +0900
     1.3 @@ -1,7 +1,7 @@
     1.4  ;;; yatexprc.el --- YaTeX process handler
     1.5  ;;; 
     1.6  ;;; (c)1993-2014 by HIROSE Yuuji.[yuuji@yatex.org]
     1.7 -;;; Last modified Wed Dec 31 22:42:56 2014 on sdr
     1.8 +;;; Last modified Sat Jan  3 23:37:49 2015 on firestorm
     1.9  ;;; $Id$
    1.10  
    1.11  ;;; Code:
    1.12 @@ -404,8 +404,10 @@
    1.13        (put 'dvi2-command 'file buffer)
    1.14        (put 'dvi2-command 'offset lineinfo))))
    1.15  
    1.16 -(defvar YaTeX-use-image-preview t
    1.17 -  "*Use or else view graphic preview image via [prefix] t e.")
    1.18 +(defvar YaTeX-use-image-preview "jpg"
    1.19 +  "*Nil means not using image preview by [prefix] t e.
    1.20 +Acceptable value is one of \"jpg\" or \"png\", which specifies
    1.21 +format of preview image.")
    1.22  (defvar YaTeX-preview-image-mode-map nil
    1.23    "Keymap used in YaTeX-preview-image-mode")
    1.24  (defun YaTeX-preview-image-mode ()
    1.25 @@ -436,7 +438,8 @@
    1.26  
    1.27  (defvar YaTeX-typeset-dvi2image-chain
    1.28    (cond
    1.29 -   ((YaTeX-executable-find "dvipng")
    1.30 +   ((and (equal YaTeX-use-image-preview "png")
    1.31 +	 (YaTeX-executable-find "dvipng"))
    1.32      (list "dvipng %b.dvi"))
    1.33     ((YaTeX-executable-find YaTeX-cmd-dvips)
    1.34      (list
    1.35 @@ -460,7 +463,8 @@
    1.36  (defun YaTeX-typeset-conv2image-chain ()
    1.37    (let*((proc (or YaTeX-typeset-process YaTeX-typeset-conv2image-process))
    1.38  	(prevname (process-name proc))
    1.39 -	(texput "texput") (format "jpg")
    1.40 +	(texput "texput")
    1.41 +	(format YaTeX-use-image-preview)
    1.42  	(target (concat texput "." format))
    1.43  	(math (get 'YaTeX-typeset-conv2image-chain 'math))
    1.44  	(srctype (or (get 'YaTeX-typeset-conv2image-chain 'srctype)
    1.45 @@ -571,7 +575,7 @@
    1.46       ;; If condition changed from last call, do it
    1.47       ((and (/= p (preceding-char))
    1.48  	   (/= q (char-after (- (point) 1)))
    1.49 -	   (not (string= st (YaTeX-buffer-substring s e))))
    1.50 +	   (not (string= st (YaTeX-buffer-substring s (min e (point-max))))))
    1.51        (YaTeX-typeset-environment)))))
    1.52  
    1.53  (defun YaTeX-typeset-environment ()
    1.54 @@ -600,7 +604,15 @@
    1.55  		       (YaTeX-buffer-substring b e)
    1.56  		       (current-time)))
    1.57  	    (YaTeX-typeset-region 'YaTeX-typeset-conv2image-chain)
    1.58 -	    (if usetimer (YaTeX-typeset-environment-auto)))
    1.59 +	    (if usetimer
    1.60 +		(progn
    1.61 +		  (if YaTeX-on-the-fly-overlay
    1.62 +		      (move-overlay YaTeX-on-the-fly-overlay b e)
    1.63 +		    (overlay-put
    1.64 +		     (setq YaTeX-on-the-fly-overlay (make-overlay b e))
    1.65 +		     'face 'YaTeX-on-the-fly-activated-face))
    1.66 +		  (YaTeX-typeset-environment-auto)
    1.67 +		  )))
    1.68  	(YaTeX-typeset-region)))))
    1.69  
    1.70  (defvar YaTeX-on-the-fly-preview-image (string-to-number "0.1")
    1.71 @@ -628,6 +640,7 @@
    1.72    (interactive)
    1.73    (cancel-timer YaTeX-typeset-environment-timer)
    1.74    (setq YaTeX-typeset-environment-timer nil)
    1.75 +  (delete-overlay YaTeX-on-the-fly-overlay)
    1.76    (message "Auto-preview canceled"))
    1.77  
    1.78