tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

ox-html: Reorder output of meta data in head

Browse source 
* 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
This commit is contained in:
Arun Persaud 2015-06-08 21:48:26 -07:00 committed by Nicolas Goaziou
parent 145ac49faf
commit e453a261a7
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lisp/ox-html.el
View file

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