1.1 --- a/yatexprc.el	Thu Jan 15 10:49:53 2015 +0900
     1.2 +++ b/yatexprc.el	Thu Jan 15 23:20:31 2015 +0900
     1.3 @@ -1,7 +1,7 @@
     1.4  ;;; yatexprc.el --- YaTeX process handler
     1.5  ;;; 
     1.6  ;;; (c)1993-2015 by HIROSE Yuuji.[yuuji@yatex.org]
     1.7 -;;; Last modified Wed Jan  7 09:06:54 2015 on firestorm
     1.8 +;;; Last modified Thu Jan 15 11:15:07 2015 on firestorm
     1.9  ;;; $Id$
    1.10  
    1.11  ;;; Code:
    1.12 @@ -412,7 +412,7 @@
    1.13    "*Nil means not using image preview by [prefix] t e.
    1.14  Acceptable value is one of \"jpg\" or \"png\", which specifies
    1.15  format of preview image.  NOTE that if your system has /usr/bin/sips
    1.16 -not having convert(ImageMagick), jpeg format is automatically taken
    1.17 +while not having convert(ImageMagick), jpeg format is automatically taken
    1.18  for conversion.")
    1.19  (defvar YaTeX-preview-image-mode-map nil
    1.20    "Keymap used in YaTeX-preview-image-mode")
    1.21 @@ -474,6 +474,7 @@
    1.22  	(format YaTeX-use-image-preview)
    1.23  	(target (concat texput "." format))
    1.24  	(math (get 'YaTeX-typeset-conv2image-chain 'math))
    1.25 +	(dpi  (get 'YaTeX-typeset-conv2image-chain 'dpi))
    1.26  	(srctype (or (get 'YaTeX-typeset-conv2image-chain 'srctype)
    1.27  		     (if (file-newer-than-file-p
    1.28  			  (concat texput ".pdf")
    1.29 @@ -503,7 +504,7 @@
    1.30  			  command
    1.31  			  (list (cons "b" "texput")
    1.32  				(cons "f" format)
    1.33 -				(cons "d" (if math "300" "200"))))))
    1.34 +				(cons "d" dpi)))))
    1.35  	    (insert (format "Calling `%s'...\n" cmdline))
    1.36  	    (set-process-sentinel
    1.37  	     (setq YaTeX-typeset-conv2image-process
    1.38 @@ -585,8 +586,30 @@
    1.39       ((not (string= st (YaTeX-buffer-substring s (overlay-end overlay))))
    1.40        (YaTeX-typeset-environment)))))
    1.41  
    1.42 +
    1.43 +(defun YaTeX-typeset-environment-by-lmp ()
    1.44 +  (save-excursion
    1.45 +    (let ((sw (selected-window)))
    1.46 +      (goto-char opoint)
    1.47 +      (latex-math-preview-expression)
    1.48 +      (select-window sw))))
    1.49 +
    1.50 +(defun YaTeX-typeset-environment-by-builtin ()
    1.51 +  (save-excursion
    1.52 +    (YaTeX-typeset-region 'YaTeX-typeset-conv2image-chain)))
    1.53 +
    1.54 +(defvar YaTeX-on-the-fly-math-preview-engine
    1.55 +  (if (fboundp 'latex-math-preview-expression)
    1.56 +      'YaTeX-typeset-environment-by-lmp
    1.57 +    'YaTeX-typeset-environment-by-builtin)
    1.58 +  "Function symbol to use math-preview.
    1.59 +'YaTeX-typeset-environment-by-lmp for using latex-math-preview,
    1.60 +'YaTeX-typeset-environment-by-builtin for using yatex-builtin.")
    1.61 +
    1.62  (defun YaTeX-typeset-environment-1 ()
    1.63 -  (let ((math (YaTeX-in-math-mode-p)) usetimer)
    1.64 +  (let*((math (YaTeX-in-math-mode-p))
    1.65 +	(dpi (or (YaTeX-get-builtin "PREVIEWDPI") (if math "300" "200")))
    1.66 +	(opoint (point))  usetimer)
    1.67      (cond
    1.68       ((and YaTeX-on-the-fly-overlay (overlayp YaTeX-on-the-fly-overlay)
    1.69  	   (member YaTeX-on-the-fly-overlay (overlays-at (point))))
    1.70 @@ -595,7 +618,7 @@
    1.71        (setq math (get 'YaTeX-typeset-conv2image-chain 'math))
    1.72        (push-mark (overlay-start YaTeX-on-the-fly-overlay))
    1.73        (goto-char (overlay-end YaTeX-on-the-fly-overlay)))
    1.74 -     ((and (fboundp 'region-active-p) (region-active-p))
    1.75 +     ((YaTeX-region-active-p)
    1.76        nil)				;if region is active, use it
    1.77       (math (setq usetimer t) (YaTeX-mark-environment))
    1.78       ((equal (or (YaTeX-inner-environment t) "document") "document")
    1.79 @@ -605,6 +628,7 @@
    1.80  	(let ((YaTeX-typeset-buffer (concat "*bg:" YaTeX-typeset-buffer))
    1.81  	      (b (region-beginning)) (e (region-end)))
    1.82  	  (put 'YaTeX-typeset-conv2image-chain 'math math)
    1.83 +	  (put 'YaTeX-typeset-conv2image-chain 'dpi dpi)
    1.84  	  (put 'YaTeX-typeset-conv2image-chain 'srctype nil)
    1.85  	  (put 'YaTeX-typeset-conv2image-chain 'win (selected-window))
    1.86  	  (put 'YaTeX-typeset-conv2image-chain 'start (current-time))
    1.87 @@ -613,7 +637,8 @@
    1.88  		     (char-after (- (point) 2))
    1.89  		     (YaTeX-buffer-substring b e)
    1.90  		     (current-time)))
    1.91 -	  (YaTeX-typeset-region 'YaTeX-typeset-conv2image-chain)
    1.92 +	  (if math (funcall YaTeX-on-the-fly-math-preview-engine)
    1.93 +	    (YaTeX-typeset-region 'YaTeX-typeset-conv2image-chain))
    1.94  	  (if usetimer
    1.95  	      (progn
    1.96  		(if YaTeX-on-the-fly-overlay