Bastien <[email protected]> writes:
> For this one I agree completely. I will make this change.
I share the patch here to let people discuss this change a bit.
It will break again the configuration of those who take the time
to test the current HEAD (sic), so I'd rather make sure everyone
is fine with it.
Thanks,
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index e1b50f4..963a376 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -118,7 +118,7 @@
(:html-postamble nil "html-postamble" org-html-postamble)
(:html-preamble nil "html-preamble" org-html-preamble)
(:html-style nil nil org-html-style)
- (:html-style-extra "HTML_STYLE" nil org-html-style-extra newline)
+ (:html-head "HTML_HEAD" nil org-html-head newline)
(:html-style-include-default nil nil org-html-style-include-default)
(:html-style-include-scripts nil nil org-html-style-include-scripts)
(:html-table-tag nil nil org-html-table-tag)
@@ -242,9 +242,9 @@ for the JavaScript code in this tag.
/*]]>*/-->
</style>"
"The default style specification for exported HTML files.
-Please use the variables `org-html-style' and
-`org-html-style-extra' to add to this style. If you wish to not
-have the default style included, customize the variable
+Please use the variables `org-html-style' and `org-html-head' to
+add to this style. If you wish to not have the default style
+included, customize the variable
`org-html-style-include-default'.")
@@ -947,22 +947,20 @@ If you'd like to refer to an external style file, use something like
As the value of this option simply gets inserted into the HTML <head> header,
you can \"misuse\" it to add arbitrary text to the header.
-See also the variable `org-html-style-extra'."
+See also the variable `org-html-head'."
:group 'org-export-html
:type 'string)
;;;###autoload
(put 'org-html-style 'safe-local-variable 'stringp)
-(defcustom org-html-style-extra ""
- "Additional style information for HTML export.
-The value of this variable is inserted into the HTML buffer right after
-the value of `org-html-style'. Use this variable for per-file
-settings of style information, and do not forget to surround the style
-settings with <style>...</style> tags."
+(defcustom org-html-head ""
+ "Additional information for the header of the HTML export.
+The value of this variable is inserted into the HTML buffer right
+after the value of `org-html-style'."
:group 'org-export-html
:type 'string)
;;;###autoload
-(put 'org-html-style-extra 'safe-local-variable 'stringp)
+(put 'org-html-head 'safe-local-variable 'stringp)
;;;; Todos
@@ -1262,7 +1260,7 @@ INFO is a plist used as a communication channel."
(concat
(when (plist-get info :html-style-include-default) org-html-style-default)
(org-element-normalize-string (plist-get info :html-style))
- (org-element-normalize-string (plist-get info :html-style-extra))
+ (org-element-normalize-string (plist-get info :html-head))
(when (plist-get info :html-style-include-scripts) org-html-scripts))))
(defun org-html--build-mathjax-config (info)
--
Bastien
