From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Subject: Re: BIND org-html-style-include-* Date: Fri, 15 Feb 2013 22:35:08 +0100 Message-ID: <87zjz58dmb.fsf@bzg.ath.cx> References: <87r4kh7oc2.fsf@gmail.com> <87liapi8r2.fsf@lapcat.tftorrey.com> <87d2w19stq.fsf@bzg.ath.cx> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:53391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6Sw8-00046B-CM for emacs-orgmode@gnu.org; Fri, 15 Feb 2013 16:35:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U6Sw4-0003Xm-Me for emacs-orgmode@gnu.org; Fri, 15 Feb 2013 16:35:16 -0500 Received: from mail-wi0-x22a.google.com ([2a00:1450:400c:c05::22a]:47516) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6Sw4-0003Wp-G8 for emacs-orgmode@gnu.org; Fri, 15 Feb 2013 16:35:12 -0500 Received: by mail-wi0-f170.google.com with SMTP id hm11so1878770wib.5 for ; Fri, 15 Feb 2013 13:35:10 -0800 (PST) In-Reply-To: <87d2w19stq.fsf@bzg.ath.cx> (Bastien's message of "Fri, 15 Feb 2013 22:21:21 +0100") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: "T.F. Torrey" Cc: Nicolas Goaziou , emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Bastien 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, --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=org-html-head.patch 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. /*]]>*/--> " "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 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 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) --=-=-= Content-Type: text/plain -- Bastien --=-=-=--