From 97c50971465ff7f49ef2f57b3c09060939778727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= Date: Tue, 25 Aug 2015 12:27:35 +0200 Subject: Imported Upstream version 8.3.1 --- contrib/lisp/ox-deck.el | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'contrib/lisp/ox-deck.el') diff --git a/contrib/lisp/ox-deck.el b/contrib/lisp/ox-deck.el index 9d84b03..427c7d7 100644 --- a/contrib/lisp/ox-deck.el +++ b/contrib/lisp/ox-deck.el @@ -38,6 +38,12 @@ ;; See ox.el and ox-html.el for more details on how this exporter ;; works (it is derived from ox-html.) +;; TODOs +;; ------ +;; The title page is formatted using format-spec. This is error prone +;; when details are missing and may insert empty tags, like

, +;; for missing values. + (require 'ox-html) (eval-when-compile (require 'cl)) @@ -51,11 +57,13 @@ (if a (org-deck-export-to-html t s v b) (org-open-file (org-deck-export-to-html nil s v b))))))) :options-alist - '((:html-link-home "HTML_LINK_HOME" nil nil) + '((:description "DESCRIPTION" nil nil newline) + (:keywords "KEYWORDS" nil nil space) + (:html-link-home "HTML_LINK_HOME" nil nil) (:html-link-up "HTML_LINK_UP" nil nil) (:deck-postamble "DECK_POSTAMBLE" nil org-deck-postamble newline) (:deck-preamble "DECK_PREAMBLE" nil org-deck-preamble newline) - (:html-head-include-default-style "HTML_INCLUDE_DEFAULT_STYLE" nil nil) + (:html-head-include-default-style "HTML_INCLUDE_DEFAULT_STYLE" "html-style" 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) @@ -259,6 +267,7 @@ Defaults to styles for the title page." (defcustom org-deck-title-slide-template "

%t

+

%s

%a

%e

%d

" @@ -319,7 +328,7 @@ and have the id \"title-slide\"." (include (plist-get info :deck-include-extensions)) (exclude (plist-get info :deck-exclude-extensions)) (scripts '()) (sheets '()) (snippets '())) - (add-to-list 'scripts (concat prefix "jquery-1.7.2.min.js")) + (add-to-list 'scripts (concat prefix "jquery.min.js")) (add-to-list 'scripts (concat prefix "core/deck.core.js")) (add-to-list 'scripts (concat prefix "modernizr.custom.js")) (add-to-list 'sheets (concat prefix "core/deck.core.css")) @@ -368,12 +377,14 @@ holding export options." "Transcode an ITEM element from Org to HTML. CONTENTS holds the contents of the item. INFO is a plist holding contextual information. -If the containing headline has the property :slide, then +If the containing headline has the property :STEP, then the \"slide\" class will be added to the to the list element, which will make the list into a \"build\"." (let ((text (org-html-item item contents info))) (if (org-export-get-node-property :STEP item t) - (replace-regexp-in-string "^
  • " "
  • " text) + (progn + (replace-regexp-in-string "^
  • " "
  • " text) + (replace-regexp-in-string "^
  • " "
  • " text)) text))) (defun org-deck-link (link desc info) -- cgit v1.2.3