summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-31 11:06:49 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-31 11:06:49 (GMT)
commitad9ca25d869f264f87e76932fc717f5e680de9c2 (patch)
treed34b9a64b0fb911a6090c5d74a2d7788df87dc37
parentbe1169fac7ad3a8b7b2ed1c38a5d8a0fe4944f7e (diff)
parent94d1b1169dc0c25548a8ccb4993ede298d30345c (diff)
downloadorg-mode-ad9ca25d869f264f87e76932fc717f5e680de9c2.zip
org-mode-ad9ca25d869f264f87e76932fc717f5e680de9c2.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-html.el11
1 files changed, 10 insertions, 1 deletions
diff --git a/lisp/org-html.el b/lisp/org-html.el
index 224a103..5d0e49d 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -464,6 +464,9 @@ precedence over this variable."
(defcustom org-export-html-preamble-format '(("en" ""))
"Alist of languages and format strings for the HTML preamble.
+To enable the HTML exporter to use these formats, you need to set
+`org-export-html-preamble' to `t'.
+
The first element of each list is the language code, as used for
the #+LANGUAGE keyword.
@@ -510,6 +513,9 @@ precedence over this variable."
"))
"Alist of languages and format strings for the HTML postamble.
+To enable the HTML exporter to use these formats, you need to set
+`org-export-html-postamble' to `t'.
+
The first element of each list is the language code, as used for
the #+LANGUAGE keyword.
@@ -1030,7 +1036,10 @@ OPT-PLIST is the export options list."
(if (string-match "^file:" desc)
(setq desc (substring desc (match-end 0)))))
(setq desc (org-add-props
- (concat "<img src=\"" desc "\" alt=\""
+ (concat "<img src=\"" desc "\" "
+ (when (save-match-data (string-match "width=" attr))
+ (prog1 (concat attr " ") (setq attr "")))
+ "alt=\""
(file-name-nondirectory desc) "\"/>")
'(org-protected t))))
(cond