summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2010-08-06 19:20:17 +0200
committerBastien Guerry <bzg@altern.org>2010-08-06 19:20:17 +0200
commit5236e0ea313cb294a01e1a7538160cfa8b586928 (patch)
tree656eb8cc25462b3ccbcef0a03d0efac7d6e4b276
parent251a3ca7c3a84b65547f4d125d961fd5845add41 (diff)
downloadorg-mode-5236e0ea313cb294a01e1a7538160cfa8b586928.tar.gz
Revert: don't use :html-resolution in `org-create-formula-image'.
http://article.gmane.org/gmane.emacs.orgmode/28415 ,---- | From: Carsten Dominik <carsten.dominik@gmail.com> | Subject: Re: [Orgmode] Change resolution of LaTeX formulas in HTML output? | To: Bastien <bastien.guerry@wikimedia.fr> | Cc: amscopub-mail@yahoo.com, emacs-orgmode@gnu.org | Date: Fri, 6 Aug 2010 12:46:28 +0200 | | On Aug 5, 2010, at 12:32 AM, Bastien wrote: | | > amscopub-mail@yahoo.com writes: | > | >> Is there a way to control the resolution of PNG LaTeX formulas when | >> you export to HTML? | > | > I've implemented this. | | I would not think that we need this change, the :scale and :html-scale | parameters do this for in-buffer display and html formatting, | respectively. | | Please revert this change. | | - Carsten `----
-rw-r--r--lisp/org.el13
1 files changed, 3 insertions, 10 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 2ac2aef..6038428 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3088,8 +3088,8 @@ points to a file, `org-agenda-diary-entry' will be used instead."
(defcustom org-format-latex-options
'(:foreground default :background default :scale 1.0
- :html-foreground "Black" :html-background "Transparent" :html-scale 1.0
- :html-resolution 140 :matchers ("begin" "$1" "$" "$$" "\\(" "\\["))
+ :html-foreground "Black" :html-background "Transparent"
+ :html-scale 1.0 :matchers ("begin" "$1" "$" "$$" "\\(" "\\["))
"Options for creating images from LaTeX fragments.
This is a property list with the following properties:
:foreground the foreground color for images embedded in Emacs, e.g. \"Black\".
@@ -3097,14 +3097,8 @@ This is a property list with the following properties:
:background the background color, or \"Transparent\".
`default' means use the background of the default face.
:scale a scaling factor for the size of the images, to get more pixels
-
:html-foreground, :html-background, :html-scale
the same numbers for HTML export.
-<<<<<<< HEAD
-
-=======
-:html-resolution the resolution of images for HTML output
->>>>>>> 9330ad5b8106f0c6c0810c993db2f0def1741f63
:matchers a list indicating which matchers should be used to
find LaTeX fragments. Valid members of this list are:
\"begin\" find environments
@@ -16004,9 +15998,8 @@ Some of the options can be changed using the variable
(fnh (if (featurep 'xemacs)
(font-height (get-face-font 'default))
(face-attribute 'default :height nil)))
- (res (plist-get options :html-resolution))
(scale (or (plist-get options (if buffer :scale :html-scale)) 1.0))
- (dpi (number-to-string (* scale (floor (* 0.9 (if buffer fnh res))))))
+ (dpi (number-to-string (* scale (floor (* 0.9 (if buffer fnh 140.))))))
(fg (or (plist-get options (if buffer :foreground :html-foreground))
"Black"))
(bg (or (plist-get options (if buffer :background :html-background))