summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Frankel <rick@rickster.com>2013-03-04 15:01:51 -0500
committerRick Frankel <rick@rickster.com>2013-03-04 15:01:51 -0500
commit3ab73c481638825361270f1b5beac027273fd9a7 (patch)
tree864566b0daf46c54dc2be616dc7307435f8b8f52
parentb3f04ec3d200110bd7541fd54d27f5bdd686ca16 (diff)
downloadorg-mode-3ab73c481638825361270f1b5beac027273fd9a7.tar.gz
Minor cleanup of backend options.
* contrib/lisp/ox-deck.el: Remove unnecessary overrides and rationalize name of in-buffer option for include-default-style. * contrib/lisp/ox-s5.el: Same as above. (org-s5--build-head): Renamed from org-s5--build-style for consistency with ox-html.
-rw-r--r--contrib/lisp/ox-deck.el4
-rw-r--r--contrib/lisp/ox-s5.el10
2 files changed, 5 insertions, 9 deletions
diff --git a/contrib/lisp/ox-deck.el b/contrib/lisp/ox-deck.el
index 72dc08d..0cc9f23 100644
--- a/contrib/lisp/ox-deck.el
+++ b/contrib/lisp/ox-deck.el
@@ -51,11 +51,9 @@
:options-alist
((:html-link-home "HTML_LINK_HOME" nil nil)
(:html-link-up "HTML_LINK_UP" nil nil)
- (:html-mathjax "HTML_MATHJAX" nil "" space)
(:html-postamble nil "html-postamble" nil t)
(:html-preamble nil "html-preamble" nil t)
- (:html-head-extra "HTML_HEAD" nil org-html-head-extra newline)
- (:html-head-include-default-style "HTML_INCLUDE_STYLE" nil nil)
+ (:html-head-include-default-style "HTML_INCLUDE_DEFAULT_STYLE" nil nil)
(:html-head-include-scripts "HTML_INCLUDE_SCRIPTS" nil nil)
(:deck-base-url "DECK_BASE_URL" nil org-deck-base-url)
(:deck-theme "DECK_THEME" nil org-deck-theme)
diff --git a/contrib/lisp/ox-s5.el b/contrib/lisp/ox-s5.el
index 3841417..ba1de93 100644
--- a/contrib/lisp/ox-s5.el
+++ b/contrib/lisp/ox-s5.el
@@ -60,12 +60,10 @@
:options-alist
((:html-link-home "HTML_LINK_HOME" nil nil)
(:html-link-up "HTML_LINK_UP" nil nil)
- (:html-mathjax "HTML_MATHJAX" nil "" space)
(:html-postamble nil "html-postamble" nil t)
(:html-preamble nil "html-preamble" nil t)
- (:html-head "HTML_HEAD" nil org-html-head newline)
- (:html-head-include-default-style "HTML_INCLUDE_STYLE" nil org-html-head-include-default-style newline)
- (:html-head-include-scripts "HTML_INCLUDE_SCRIPTS" nil org-html-head-include-scripts newline)
+ (:html-head-include-default-style "HTML_INCLUDE_DEFAULT_STYLE" nil nil)
+ (:html-head-include-scripts "HTML_INCLUDE_SCRIPTS" nil nil)
(:s5-version "S5_VERSION" nil org-s5-version)
(:s5-theme-file "S5_THEME_FILE" nil org-s5-theme-file)
(:s5-ui-url "S5_UI_URL" nil org-s5-ui-url)
@@ -185,7 +183,7 @@ INFO is a plist used as a communication channel."
"</div>\n"
"</div>\n"))))
-(defun org-s5--build-style (info)
+(defun org-s5--build-head (info)
(let* ((dir (plist-get info :s5-ui-url))
(theme (or (plist-get info :s5-theme-file) "default/slides.css")))
(mapconcat
@@ -277,7 +275,7 @@ holding export options."
(plist-get info :language) (plist-get info :language))
"<head>"
(org-s5--build-meta-info info)
- (org-s5--build-style info)
+ (org-s5--build-head info)
(org-html--build-head info)
(org-html--build-mathjax-config info)
"</head>"