Browse Source

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.
Rick Frankel 6 years ago
parent
commit
3ab73c4816
2 changed files with 5 additions and 9 deletions
  1. 1 3
      contrib/lisp/ox-deck.el
  2. 4 6
      contrib/lisp/ox-s5.el

+ 1 - 3
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)

+ 4 - 6
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>"