From: Bastien <bzg@altern.org>
To: "T.F. Torrey" <tftorrey@tftorrey.com>
Cc: Nicolas Goaziou <n.goaziou@gmail.com>, emacs-orgmode@gnu.org
Subject: Re: BIND org-html-style-include-*
Date: Fri, 15 Feb 2013 22:35:08 +0100 [thread overview]
Message-ID: <87zjz58dmb.fsf@bzg.ath.cx> (raw)
In-Reply-To: <87d2w19stq.fsf@bzg.ath.cx> (Bastien's message of "Fri, 15 Feb 2013 22:21:21 +0100")
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
Bastien <bzg@altern.org> 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,
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: org-html-head.patch --]
[-- Type: text/x-patch, Size: 2787 bytes --]
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)
[-- Attachment #3: Type: text/plain, Size: 14 bytes --]
--
Bastien
next prev parent reply other threads:[~2013-02-15 21:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-12 10:16 BIND org-html-style-include-* T.F. Torrey
2013-02-12 19:27 ` Nicolas Goaziou
2013-02-12 21:19 ` T.F. Torrey
2013-02-15 12:29 ` Nicolas Goaziou
2013-02-15 14:12 ` Bastien
2013-02-15 14:18 ` Nicolas Goaziou
2013-02-15 14:53 ` Bastien
2013-02-15 15:13 ` Nicolas Goaziou
2013-02-15 15:42 ` Bastien
2013-02-15 21:10 ` T.F. Torrey
2013-02-15 21:12 ` Sebastien Vauban
2013-02-15 21:21 ` Bastien
2013-02-15 21:35 ` Bastien [this message]
2013-02-15 23:22 ` T.F. Torrey
2013-02-18 17:07 ` Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zjz58dmb.fsf@bzg.ath.cx \
--to=bzg@altern.org \
--cc=emacs-orgmode@gnu.org \
--cc=n.goaziou@gmail.com \
--cc=tftorrey@tftorrey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).