diff options
Diffstat (limited to 'contrib/lisp/ox-s5.el')
| -rw-r--r-- | contrib/lisp/ox-s5.el | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/contrib/lisp/ox-s5.el b/contrib/lisp/ox-s5.el index 3ea77b2..d97a9b2 100644 --- a/contrib/lisp/ox-s5.el +++ b/contrib/lisp/ox-s5.el @@ -306,7 +306,7 @@ holding export options." (mapconcat 'identity (list - (plist-get info :html-doctype) + (org-html-doctype info) (format "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"%s\" xml:lang=\"%s\">" (plist-get info :language) (plist-get info :language)) "<head>" @@ -369,23 +369,8 @@ Export is done in a buffer named \"*Org S5 Export*\", which will be displayed when `org-export-show-temporary-export-buffer' is non-nil." (interactive) - (if async - (org-export-async-start - (lambda (output) - (with-current-buffer (get-buffer-create "*Org S5 Export*") - (erase-buffer) - (insert output) - (goto-char (point-min)) - (nxml-mode) - (org-export-add-to-stack (current-buffer) 's5))) - `(org-export-as 's5 ,subtreep ,visible-only ,body-only ',ext-plist)) - (let ((outbuf (org-export-to-buffer - 's5 "*Org S5 Export*" - subtreep visible-only body-only ext-plist))) - ;; Set major mode. - (with-current-buffer outbuf (nxml-mode)) - (when org-export-show-temporary-export-buffer - (switch-to-buffer-other-window outbuf))))) + (org-export-to-buffer 's5 "*Org S5 Export*" + async subtreep visible-only body-only ext-plist (lambda () (nxml-mode)))) (defun org-s5-export-to-html (&optional async subtreep visible-only body-only ext-plist) @@ -419,16 +404,8 @@ Return output file's name." (let* ((extension (concat "." org-html-extension)) (file (org-export-output-file-name extension subtreep)) (org-export-coding-system org-html-coding-system)) - (if async - (org-export-async-start - (lambda (f) (org-export-add-to-stack f 's5)) - (let ((org-export-coding-system org-html-coding-system)) - `(expand-file-name - (org-export-to-file - 's5 ,file ,subtreep ,visible-only ,body-only ',ext-plist)))) - (let ((org-export-coding-system org-html-coding-system)) - (org-export-to-file - 's5 file subtreep visible-only body-only ext-plist))))) + (org-export-to-file 's5 file + async subtreep visible-only body-only ext-plist))) (defun org-s5-publish-to-html (plist filename pub-dir) "Publish an org file to S5 HTML Presentation. |