summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-11-19 23:18:38 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-11-19 23:18:38 +0100
commite257da172c60cfbc6ac371117ef13d0c54280c7b (patch)
treeb7d73d3a394b68c821ed6d7b8e6f3e11a524569d
parentdb0377ddc68e9cd1835becefa61da4bbb2407ea4 (diff)
parent1319a3be441e5b0d53c4e000d55bec7c62a9fb6c (diff)
downloadorg-mode-e257da172c60cfbc6ac371117ef13d0c54280c7b.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-html.el37
1 files changed, 18 insertions, 19 deletions
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 404b62f..63a8c84 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -1875,25 +1875,24 @@ INFO is a plist used as a communication channel."
(setq template (replace-match val t t template))))))))
(defun org-html-format-spec (info)
- "Return format specification for elements that can be
-used in the preamble or postamble."
- `((?t . ,(org-export-data (plist-get info :title) info))
- (?s . ,(org-export-data (plist-get info :subtitle) info))
- (?d . ,(org-export-data (org-export-get-date info) info))
- (?T . ,(format-time-string
- (plist-get info :html-metadata-timestamp-format)))
- (?a . ,(org-export-data (plist-get info :author) info))
- (?e . ,(mapconcat
- (lambda (e)
- (format "<a href=\"mailto:%s\">%s</a>" e e))
- (split-string (plist-get info :email) ",+ *")
- ", "))
- (?c . ,(plist-get info :creator))
- (?C . ,(let ((file (plist-get info :input-file)))
- (format-time-string
- (plist-get info :html-metadata-timestamp-format)
- (when file (nth 5 (file-attributes file))))))
- (?v . ,(or (plist-get info :html-validation-link) ""))))
+ "Return format specification for preamble and postamble.
+INFO is a plist used as a communication channel."
+ (let ((timestamp-format (plist-get info :html-metadata-timestamp-format)))
+ `((?t . ,(org-export-data (plist-get info :title) info))
+ (?s . ,(org-export-data (plist-get info :subtitle) info))
+ (?d . ,(org-export-data (org-export-get-date info timestamp-format)
+ info))
+ (?T . ,(format-time-string timestamp-format))
+ (?a . ,(org-export-data (plist-get info :author) info))
+ (?e . ,(mapconcat
+ (lambda (e) (format "<a href=\"mailto:%s\">%s</a>" e e))
+ (split-string (plist-get info :email) ",+ *")
+ ", "))
+ (?c . ,(plist-get info :creator))
+ (?C . ,(let ((file (plist-get info :input-file)))
+ (format-time-string timestamp-format
+ (and file (nth 5 (file-attributes file))))))
+ (?v . ,(or (plist-get info :html-validation-link) "")))))
(defun org-html--build-pre/postamble (type info)
"Return document preamble or postamble as a string, or nil.