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.
This commit is contained in:
Bastien Guerry 2013-01-01 16:27:15 +01:00
parent 60b23bdeac
commit 4aaf1a4df2
3 changed files with 9 additions and 4 deletions

View File

@ -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)

View File

@ -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)))

View File

@ -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'