1.1 --- a/yatexprc.el	Mon Dec 22 00:01:30 2014 +0900
     1.2 +++ b/yatexprc.el	Mon Dec 22 10:02:49 2014 +0900
     1.3 @@ -1,7 +1,7 @@
     1.4  ;;; yatexprc.el --- YaTeX process handler
     1.5  ;;; 
     1.6  ;;; (c)1993-2013 by HIROSE Yuuji.[yuuji@yatex.org]
     1.7 -;;; Last modified Mon Dec 22 00:00:27 2014 on firestorm
     1.8 +;;; Last modified Mon Dec 22 10:01:02 2014 on firestorm
     1.9  ;;; $Id$
    1.10  
    1.11  ;;; Code:
    1.12 @@ -397,15 +397,35 @@
    1.13        (put 'dvi2-command 'file buffer)
    1.14        (put 'dvi2-command 'offset lineinfo))))
    1.15  
    1.16 +(defvar YaTeX-preview-image-mode-map nil
    1.17 +  "Keymap used in YaTeX-preview-image-mode")
    1.18 +(defun YaTeX-preview-image-mode ()
    1.19 +  (interactive)
    1.20 +  (if YaTeX-preview-image-mode-map
    1.21 +      nil
    1.22 +    (let ((map (setq YaTeX-preview-image-mode-map (make-sparse-keymap))))
    1.23 +      (define-key map "q" (lambda()(interactive)
    1.24 +			    (kill-buffer)
    1.25 +			    (select-window
    1.26 +			     (or (get 'YaTeX-typeset-process 'win)
    1.27 +				 (selected-window)))))
    1.28 +      (define-key map "j" (lambda()(interactive) (scroll-up 1)))
    1.29 +      (define-key map "k" (lambda()(interactive) (scroll-up -1)))))
    1.30 +  (use-local-map YaTeX-preview-image-mode-map))
    1.31 +
    1.32  (defvar YaTeX-typeset-conv2image-process nil "Process of conv2image chain")
    1.33  (defun YaTeX-typeset-conv2image-chain ()
    1.34    (let*((proc (or YaTeX-typeset-process YaTeX-typeset-conv2image-process))
    1.35  	(prevname (process-name proc))
    1.36 -	(target "texput.jpg")
    1.37 +	(target "texput.png")
    1.38  	(math (get 'YaTeX-typeset-conv2image-chain 'math))
    1.39 -	(conv (format "convert -density %d - %s" (if math 250 100) target))
    1.40 -	(chain (list (format "dvips -E -o - texput|%s" conv)))
    1.41 +	;(conv (format "convert -density %d - %s" (if math 250 100) target))
    1.42 +	;(chain (list (format "dvips -E -o - texput|%s" conv)))
    1.43 +	(conv (format "convert -alpha off - %s"  target))
    1.44 +	(chain (list (format "dvips -x 3000 -E -o - texput|%s" conv)))
    1.45  	(curproc (member prevname chain))
    1.46 +	(w (get 'YaTeX-typeset-conv2image-chain 'win))
    1.47 +	(pwd default-directory)
    1.48  	img)
    1.49      (if (not (= (process-exit-status proc) 0))
    1.50  	(progn
    1.51 @@ -429,15 +449,18 @@
    1.52  			     'YaTeX-typeset-conv2image-chain)
    1.53  		       (get 'YaTeX-typeset-process 'ppcmd))))
    1.54  	;; After all chain executed, display image in current window
    1.55 +	(select-window w)
    1.56 +	(setq foo (selected-window))
    1.57  	(YaTeX-showup-buffer
    1.58  	 (get-buffer-create " *YaTeX-region-image*")
    1.59  	 'YaTeX-showup-buffer-bottom-most t)
    1.60  	(remove-images (point-min) (point-max))
    1.61  	(erase-buffer)
    1.62 -	;(put-image (create-image (expand-file-name target)) (point))
    1.63 +	(cd pwd)			;when reuse from other source
    1.64 +					;(put-image (create-image (expand-file-name target)) (point))
    1.65  	(insert-image-file target)
    1.66 -	(goto-char (point-min))
    1.67  	(setq img (plist-get (text-properties-at (point)) 'intangible))
    1.68 +	(YaTeX-preview-image-mode)
    1.69  	(if img
    1.70  	    (let ((height (cdr (image-size img))))
    1.71  	      (enlarge-window
    1.72 @@ -453,6 +476,7 @@
    1.73        (if (and (featurep 'image) window-system)
    1.74  	  (let ((YaTeX-typeset-buffer (concat "*bg:" YaTeX-typeset-buffer)))
    1.75  	    (put 'YaTeX-typeset-conv2image-chain 'math math)
    1.76 +	    (put 'YaTeX-typeset-conv2image-chain 'win (selected-window))
    1.77  	    (YaTeX-typeset-region 'YaTeX-typeset-conv2image-chain))
    1.78  	(YaTeX-typeset-region)))))
    1.79