summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Persaud <apersaud@lbl.gov>2015-06-08 21:48:26 -0700
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2015-06-09 21:06:49 +0200
commite453a261a73c04fbae759ccdd192d03c3978c960 (patch)
treeff3456dc6d0bd321f3eba2acff752e75a06675c1
parent145ac49faf50b4a2025c91263799f9fd11ce7438 (diff)
downloadorg-mode-e453a261a73c04fbae759ccdd192d03c3978c960.tar.gz
ox-html: Reorder output of meta data in head
* lisp/ox-html.el (org-html--build-meta-info): Charset and viewport meta data should come first in `head'. Only reordered output, no other code changes. See, for example: - https://code.google.com/p/doctype-mirror/wiki/MetaCharsetAttribute - http://getbootstrap.com/getting-started/#template TINYCHANGE
-rw-r--r--lisp/ox-html.el30
1 files changed, 15 insertions, 15 deletions
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 75c6993..d50ff5e 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -1701,7 +1701,6 @@ INFO is a plist used as a communication channel."
'mime-charset))
"iso-8859-1")))
(concat
- (format "<title>%s</title>\n" title)
(when (plist-get info :time-stamp-file)
(format-time-string
(concat "<!-- "
@@ -1714,6 +1713,20 @@ INFO is a plist used as a communication channel."
"meta" " http-equiv=\"Content-Type\" content=\"text/html;charset=%s\""
info))
charset) "\n"
+ (let ((viewport-options
+ (org-remove-if-not (lambda (cell) (org-string-nw-p (cadr cell)))
+ (plist-get info :html-viewport))))
+ (and viewport-options
+ (concat
+ (org-html-close-tag
+ "meta"
+ (format " name=\"viewport\" content=\"%s\""
+ (mapconcat
+ (lambda (elm) (format "%s=%s" (car elm) (cadr elm)))
+ viewport-options ", "))
+ info)
+ "\n")))
+ (format "<title>%s</title>\n" title)
(org-html-close-tag "meta" " name=\"generator\" content=\"Org-mode\"" info)
"\n"
(and (org-string-nw-p author)
@@ -1736,20 +1749,7 @@ INFO is a plist used as a communication channel."
(format " name=\"keywords\" content=\"%s\""
(funcall protect-string keywords))
info)
- "\n"))
- (let ((viewport-options
- (org-remove-if-not (lambda (cell) (org-string-nw-p (cadr cell)))
- (plist-get info :html-viewport))))
- (and viewport-options
- (concat
- (org-html-close-tag
- "meta"
- (format " name=\"viewport\" content=\"%s\""
- (mapconcat
- (lambda (elm) (format "%s=%s" (car elm) (cadr elm)))
- viewport-options ", "))
- info)
- "\n"))))))
+ "\n")))))
(defun org-html--build-head (info)
"Return information for the <head>..</head> of the HTML output.