summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-01 15:27:15 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-01 15:27:15 (GMT)
commit4aaf1a4df2c7a5e7c398c29fed121b049cccf78b (patch)
treee463631a6b09200e293e0c0fea24a5fb7cd64be6
parent60b23bdeac7a712e107f62af1183f8495bb1d74c (diff)
downloadorg-mode-4aaf1a4df2c7a5e7c398c29fed121b049cccf78b.zip
org-mode-4aaf1a4df2c7a5e7c398c29fed121b049cccf78b.tar.gz
Don't use `org-export-html-inline-images' to set the :inline-images property
* org-exp.el (org-export-plist-vars): Don't use `org-export-html-inline-images' to set the :inline-images property, use distinct properties for the various backends. * org-publish.el (org-publish-project-alist): Ditto. * org-latex.el (org-export-latex-links): Use :latex-inline-images instead of :inline-images.
-rw-r--r--lisp/org-exp.el5
-rw-r--r--lisp/org-latex.el3
-rw-r--r--lisp/org-publish.el5
3 files changed, 9 insertions, 4 deletions
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index f5abbe6..766325f 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -705,7 +705,10 @@ table.el tables."
(:style-extra nil org-export-html-style-extra)
(:agenda-style nil org-agenda-export-html-style)
(:convert-org-links nil org-export-html-link-org-files-as-html)
- (:inline-images nil org-export-html-inline-images)
+ (:html-inline-images nil org-export-html-inline-images)
+ (:latex-inline-images nil org-export-latex-inline-images)
+ (:odt-inline-images nil org-export-odt-inline-images)
+ (:docbook-inline-images nil org-export-docbook-inline-images)
(:html-extension nil org-export-html-extension)
(:html-preamble nil org-export-html-preamble)
(:html-postamble nil org-export-html-postamble)
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 490a49d..72236c7 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -2307,8 +2307,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
;; process with link inserting
(apply 'delete-region remove)
(setq caption (and caption (org-export-latex-fontify-headline caption)))
- (cond ((and imgp
- (plist-get org-export-latex-options-plist :inline-images))
+ (cond ((and imgp (plist-get org-export-latex-options-plist :latex-inline-images))
;; OK, we need to inline an image
(insert
(org-export-latex-format-image raw-path caption label attr shortn)))
diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index 4834443..908f3e3 100644
--- a/lisp/org-publish.el
+++ b/lisp/org-publish.el
@@ -151,7 +151,10 @@ learn more about their use and default values.
:table-auto-headline `org-export-highlight-first-table-line'
:style `org-export-html-style'
:convert-org-links `org-export-html-link-org-files-as-html'
- :inline-images `org-export-html-inline-images'
+ :html-inline-images `org-export-html-inline-images'
+ :latex-inline-images `org-export-latex-inline-images'
+ :odt-inline-images `org-export-odt-inline-images'
+ :docbook-inline-images `org-export-docbook-inline-images'
:expand-quoted-html `org-export-html-expand'
:timestamp `org-export-html-with-timestamp'
:publishing-directory `org-export-publishing-directory'