>From daf83f8743cf512185e8ba2168571759bf51eac4 Mon Sep 17 00:00:00 2001 From: Rick Frankel
Date: Tue, 26 Feb 2013 14:26:27 -0500 Subject: [PATCH] Slideshow bugfixes and sync with ox-html function name changes. * contrib/lisp/ox-deck.el: Default org-deck-directories to "./deck.js". (org-deck-toc): Sync w/ ox-html name change (org-html--toc-text.) (org-deck-inner-template): Remove duplicate toc generation code. * contrib/lisp/ox-s5.el: Add inner template to fix duplicate content div error. (org-s5-toc): Sync w/ ox-html name change (org-html--toc-text) and make toc entries static since s5 doesn't support deep linking. --- contrib/lisp/ox-deck.el | 21 +++++++-------------- contrib/lisp/ox-s5.el | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/contrib/lisp/ox-deck.el b/contrib/lisp/ox-deck.el index a5327e9..5d25369 100644 --- a/contrib/lisp/ox-deck.el +++ b/contrib/lisp/ox-deck.el @@ -37,6 +37,7 @@ ;; works (it is derived from ox-html.) (require 'ox-html) +(eval-when-compile (require 'cl)) (org-export-define-derived-backend deck html :menu-entry @@ -62,9 +63,7 @@ (:deck-include-extensions "DECK_INCLUDE_EXTENSIONS" nil org-deck-include-extensions split) (:deck-exclude-extensions "DECK_EXCLUDE_EXTENSIONS" nil - org-deck-exclude-extensions split) - (:deck-directories "DECK_DIRECTORIES" nil - org-deck-directories split)) + org-deck-exclude-extensions split)) :translate-alist ((headline . org-deck-headline) (inner-template . org-deck-inner-template) @@ -76,7 +75,7 @@ :tag "Org Export DECK" :group 'org-export-html) -(defcustom org-deck-directories nil +(defcustom org-deck-directories '("./deck.js") "Directories to search for deck.js components (jquery, modernizr; core, extensions and themes directories.)" :group 'org-export-deck @@ -250,7 +249,7 @@ Note that the wrapper div must include the class \"slide\"." "