Skip to content

Instantly share code, notes, and snippets.

@inflation

inflation/retina.patch

Created June 12, 2018 00:03
Show Gist options
  • Save inflation/9d040efad1e144df6a458e4cf40cbece to your computer and use it in GitHub Desktop.
Save inflation/9d040efad1e144df6a458e4cf40cbece to your computer and use it in GitHub Desktop.
Download ZIP
Retina support for auctex of emacs-osx-port
Raw
retina.patch
*** preview.el.orig 2018-06-11 14:08:50.000000000 -0400
--- preview.el 2018-06-11 15:35:38.000000000 -0400
***************
*** 180,186 ****
(close preview-gs-close))
(tiff (open preview-gs-open)
(place preview-gs-place)
! (close preview-gs-close)))
"Define functions for generating images.
These functions get called in the process of generating inline
images of the specified type. The open function is called
--- 180,189 ----
(close preview-gs-close))
(tiff (open preview-gs-open)
(place preview-gs-place)
! (close preview-gs-close))
! (image-io (open preview-gs-open)
! (place preview-gs-place)
! (close preview-gs-close)))
"Define functions for generating images.
These functions get called in the process of generating inline
images of the specified type. The open function is called
***************
*** 210,226 ****
(dvipng png "-sDEVICE=png16m")
(jpeg jpeg "-sDEVICE=jpeg")
(pnm pbm "-sDEVICE=pnmraw")
! (tiff tiff "-sDEVICE=tiff12nc"))
"*Alist of image types and corresponding Ghostscript options.
The `dvipng' and `postscript' (don't use) entries really specify
a fallback device when images can't be processed by the requested
method, like when PDFTeX was used."
:group 'preview-gs
:type '(repeat (list :tag nil (symbol :tag "preview image-type")
! (symbol :tag "Emacs image-type")
(repeat :inline t :tag "Ghostscript options" string))))
! (defcustom preview-image-type 'png
"*Image type to be used in images."
:group 'preview-gs
:type (append '(choice)
--- 213,235 ----
(dvipng png "-sDEVICE=png16m")
(jpeg jpeg "-sDEVICE=jpeg")
(pnm pbm "-sDEVICE=pnmraw")
! (tiff tiff "-sDEVICE=tiff12nc")
! (image-io (image-io pdf t) "-sDEVICE=pdfwrite"))
"*Alist of image types and corresponding Ghostscript options.
The `dvipng' and `postscript' (don't use) entries really specify
a fallback device when images can't be processed by the requested
method, like when PDFTeX was used."
:group 'preview-gs
:type '(repeat (list :tag nil (symbol :tag "preview image-type")
! (choice (symbol :tag "Emacs image-type")
! (list :tag "Extended setting"
! (symbol :tag "Emacs image-type")
! (symbol :tag "File name extension")
! (boolean :tag "Produces vector output")))
(repeat :inline t :tag "Ghostscript options" string))))
! (defcustom preview-image-type
! (if (preview-supports-image-type 'image-io) 'image-io 'png)
"*Image type to be used in images."
:group 'preview-gs
:type (append '(choice)
***************
*** 364,369 ****
--- 373,385 ----
:group 'preview-gs
:type '(repeat string))
+ (defcustom preview-gs-vector-options '("-q" "-dDELAYSAFER" "-dNOPAUSE"
+ "-DNOPLATFONTS" "-dPrinted")
+ "*Like `preview-gs-options', but used when gs produces vector outputs.
+ See also `preview-gs-command'."
+ :group 'preview-gs
+ :type '(repeat string))
+
(defvar preview-gs-queue nil
"List of overlays to convert using gs.
Buffer-local to the appropriate TeX process buffer.")
***************
*** 398,403 ****
--- 414,427 ----
"Image type for gs produced images.")
(make-variable-buffer-local 'preview-gs-image-type)
+ (defvar preview-gs-image-extension nil
+ "Image file name extension for gs produced images.")
+ (make-variable-buffer-local 'preview-gs-image-extension)
+
+ (defvar preview-gs-image-vector-p nil
+ "Non-nil if gs produces vector output images.")
+ (make-variable-buffer-local 'preview-gs-image-vector-p)
+
(defvar preview-gs-sequence nil
"Pair of sequence numbers for gs produced images.")
(make-variable-buffer-local 'preview-gs-sequence)
***************
*** 688,694 ****
(format "%s/pr%d-%%d.%s"
(car TeX-active-tempdir)
(car preview-gs-sequence)
! preview-gs-image-type))))
(process
(apply #'start-process
"Preview-Ghostscript"
--- 712,718 ----
(format "%s/pr%d-%%d.%s"
(car TeX-active-tempdir)
(car preview-gs-sequence)
! preview-gs-image-extension))))
(process
(apply #'start-process
"Preview-Ghostscript"
***************
*** 718,731 ****
(defun preview-gs-open (&optional setup)
"Start a Ghostscript conversion pass.
SETUP may contain a parser setup function."
! (let ((image-info (assq preview-image-type preview-gs-image-type-alist)))
! (setq preview-gs-image-type (nth 1 image-info))
! (setq preview-gs-sequence nil)
! (setq preview-gs-command-line (append
! preview-gs-options
! (nthcdr 2 image-info))
! preview-gs-init-string
! (format "{DELAYSAFER{.setsafe}if}stopped pop\
/.preview-BP currentpagedevice/BeginPage get dup \
null eq{pop{pop}bind}if def\
<</BeginPage{currentpagedevice/PageSize get dup 0 get 1 ne exch 1 get 1 ne or\
--- 742,764 ----
(defun preview-gs-open (&optional setup)
"Start a Ghostscript conversion pass.
SETUP may contain a parser setup function."
! (let* ((image-info (assq preview-image-type preview-gs-image-type-alist))
! (image-type-info (nth 1 image-info)))
! (if (not (consp image-type-info))
! (setq preview-gs-image-type image-type-info
! preview-gs-image-extension image-type-info
! preview-gs-image-vector-p nil)
! (setq preview-gs-image-type (nth 0 image-type-info)
! preview-gs-image-extension (nth 1 image-type-info)
! preview-gs-image-vector-p (nth 2 image-type-info)))
! (setq preview-gs-sequence nil)
! (setq preview-gs-command-line (append
! (if (not preview-gs-image-vector-p)
! preview-gs-options
! preview-gs-vector-options)
! (nthcdr 2 image-info))
! preview-gs-init-string
! (format "{DELAYSAFER{.setsafe}if}stopped pop\
/.preview-BP currentpagedevice/BeginPage get dup \
null eq{pop{pop}bind}if def\
<</BeginPage{currentpagedevice/PageSize get dup 0 get 1 ne exch 1 get 1 ne or\
***************
*** 734,742 ****
{pop}{setpagedevice}{ifelse exec}\
stopped{handleerror quit}if \
.preview-ST aload pop restore}bind def "
! (preview-gs-color-string preview-colors)))
! (preview-gs-queue-empty)
! (preview-parse-messages (or setup #'preview-gs-dvips-process-setup))))
(defun preview-gs-color-value (value)
"Return string to be used as color value for an RGB component.
--- 767,775 ----
{pop}{setpagedevice}{ifelse exec}\
stopped{handleerror quit}if \
.preview-ST aload pop restore}bind def "
! (preview-gs-color-string preview-colors)))
! (preview-gs-queue-empty)
! (preview-parse-messages (or setup #'preview-gs-dvips-process-setup))))
(defun preview-gs-color-value (value)
"Return string to be used as color value for an RGB component.
***************
*** 825,831 ****
(let ((process (preview-start-dvips preview-fast-conversion)))
(setq TeX-sentinel-function #'preview-gs-dvips-sentinel)
(list process (current-buffer) TeX-active-tempdir preview-ps-file
! preview-gs-image-type))))
(defun preview-dvipng-process-setup ()
"Set up dvipng process for conversion."
--- 858,864 ----
(let ((process (preview-start-dvips preview-fast-conversion)))
(setq TeX-sentinel-function #'preview-gs-dvips-sentinel)
(list process (current-buffer) TeX-active-tempdir preview-ps-file
! preview-gs-image-extension))))
(defun preview-dvipng-process-setup ()
"Set up dvipng process for conversion."
***************
*** 853,859 ****
(let ((process (preview-start-pdf2dsc)))
(setq TeX-sentinel-function #'preview-pdf2dsc-sentinel)
(list process (current-buffer) TeX-active-tempdir preview-ps-file
! preview-gs-image-type)))
(defun preview-dvips-abort ()
"Abort a Dvips run."
--- 886,892 ----
(let ((process (preview-start-pdf2dsc)))
(setq TeX-sentinel-function #'preview-pdf2dsc-sentinel)
(list process (current-buffer) TeX-active-tempdir preview-ps-file
! preview-gs-image-extension)))
(defun preview-dvips-abort ()
"Abort a Dvips run."
***************
*** 1240,1250 ****
(overlay-put ov 'filenames (cdr filenames))
(preview-replace-active-icon
ov
! (preview-create-icon (car newfile)
! preview-gs-image-type
! (preview-ascent-from-bb
! bbox)
! (aref preview-colors 2))))
(overlay-put ov 'queued nil)))))
(while (and (< (length preview-gs-outstanding)
preview-gs-outstanding-limit)
--- 1273,1286 ----
(overlay-put ov 'filenames (cdr filenames))
(preview-replace-active-icon
ov
!
! (apply #'preview-create-icon
! (car newfile)
! preview-gs-image-type
! (preview-ascent-from-bb bbox)
! (aref preview-colors 2)
! (and preview-gs-image-vector-p
! (list (preview-size-from-bb bbox))))))
(overlay-put ov 'queued nil)))))
(while (and (< (length preview-gs-outstanding)
preview-gs-outstanding-limit)
***************
*** 1261,1267 ****
(format "pr%d-%d.%s"
(car preview-gs-sequence)
(cdr preview-gs-sequence)
! preview-gs-image-type)
TeX-active-tempdir))))))
(bbox (aset queued 0
(or (and preview-prefer-TeX-bb
--- 1297,1303 ----
(format "pr%d-%d.%s"
(car preview-gs-sequence)
(cdr preview-gs-sequence)
! preview-gs-image-extension)
TeX-active-tempdir))))))
(bbox (aset queued 0
(or (and preview-prefer-TeX-bb
***************
*** 1451,1456 ****
--- 1487,1510 ----
(round (* 100.0 (/ (- top 720.0) (- top bottom))))
100)))
+ (defun preview-size-from-bb (bb)
+ "This calculates the image pixel size from its bounding box.
+ When the ghostscript device produces vector outputs, the `-r'
+ option does not change the page size of the produced output, but
+ specifies the resolution for pattern fills and fonts that must be
+ converted to bitmaps. This function is used for calculating the
+ size in pixels from the value passed to the `-r' option and the
+ given bounding box."
+ (let ((res '(72.0 . 72.0)))
+ (dolist (option preview-gs-command-line)
+ (if (string-match "\\`-r\\([0-9.]+\\)x\\([0-9.]+\\)\\'" option)
+ (setq res (cons (string-to-number (match-string 1 option))
+ (string-to-number (match-string 2 option))))))
+ (cons (round (* (- (aref bb 2) (aref bb 0))
+ (/ (car res) 72.0)))
+ (round (* (- (aref bb 3) (aref bb 1))
+ (/ (cdr res) 72.0))))))
+
(defface preview-face '((((background dark))
(:background "dark slate gray"))
(t
***************
*** 3626,3631 ****
--- 3680,3686 ----
preview-pdf2dsc-command
preview-gs-command
preview-gs-options
+ preview-gs-vector-options
preview-gs-image-type-alist
preview-fast-conversion
preview-prefer-TeX-bb
*** prv-emacs.el.orig 2018-06-11 14:08:49.000000000 -0400
--- prv-emacs.el 2018-06-11 15:39:37.000000000 -0400
***************
*** 80,98 ****
(nth 1 preview-transparent-color)
'default)))))
! (defsubst preview-create-icon-1 (file type ascent border)
`(image
:file ,file
:type ,type
:ascent ,ascent
,@(and border
! '(:mask (heuristic t)))))
! (defun preview-create-icon (file type ascent border)
"Create an icon from FILE, image TYPE, ASCENT and BORDER."
! (list
! (preview-create-icon-1 file type ascent border)
! file type ascent border))
(put 'preview-filter-specs :type
#'(lambda (keyword value &rest args)
--- 80,100 ----
(nth 1 preview-transparent-color)
'default)))))
! (defsubst preview-create-icon-1 (file type ascent border &optional size)
`(image
:file ,file
:type ,type
:ascent ,ascent
,@(and border
! '(:mask (heuristic t)))
! ,@(and size
! `(:width ,(car size) :height ,(cdr size)))))
!
! (defun preview-create-icon (file type ascent border &optional size)
"Create an icon from FILE, image TYPE, ASCENT and BORDER."
! `(,(preview-create-icon-1 file type ascent border size)
! ,file ,type ,ascent ,border ,@(and size (list size))))
(put 'preview-filter-specs :type
#'(lambda (keyword value &rest args)
***************
*** 590,596 ****
(nth 2 image)
(if (< (length image) 4)
(preview-get-heuristic-mask)
! (nth 3 image))))))
(defsubst preview-supports-image-type (imagetype)
"Check if IMAGETYPE is supported."
--- 592,599 ----
(nth 2 image)
(if (< (length image) 4)
(preview-get-heuristic-mask)
! (nth 3 image))
! (nth 4 image)))))
(defsubst preview-supports-image-type (imagetype)
"Check if IMAGETYPE is supported."
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment