summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-03-19 16:26:30 +0100
committerBastien Guerry <bzg@altern.org>2013-03-19 19:39:34 +0100
commit5c63007721841036e44cc6945676550861e28194 (patch)
treeb080357782f9664eab1a0a5f9e57802606247643
parenta13b19e384a992d5acdbc6c8ee94bac5faba4a6d (diff)
downloadorg-mode-5c63007721841036e44cc6945676550861e28194.tar.gz
contrib/lisp/*: Use `org-export-define-*backend' as defuns, not macros
* ox-taskjuggler.el (taskjuggler): * ox-s5.el (s5): * ox-rss.el (rss): * ox-koma-letter.el (koma-letter): * ox-groff.el (groff): * ox-freemind.el (freemind): * ox-deck.el (deck): * ox-confluence.el (confluence): Use `org-export-define-backend' or `org-export-define-derived-backend' as defuns, not macros.
-rw-r--r--contrib/lisp/ox-confluence.el34
-rw-r--r--contrib/lisp/ox-deck.el50
-rw-r--r--contrib/lisp/ox-freemind.el28
-rw-r--r--contrib/lisp/ox-groff.el118
-rw-r--r--contrib/lisp/ox-koma-letter.el40
-rw-r--r--contrib/lisp/ox-rss.el42
-rw-r--r--contrib/lisp/ox-s5.el48
-rw-r--r--contrib/lisp/ox-taskjuggler.el18
8 files changed, 189 insertions, 189 deletions
diff --git a/contrib/lisp/ox-confluence.el b/contrib/lisp/ox-confluence.el
index c488e62..021bbd9 100644
--- a/contrib/lisp/ox-confluence.el
+++ b/contrib/lisp/ox-confluence.el
@@ -37,23 +37,23 @@
(require 'ox-ascii)
;; Define the backend itself
-(org-export-define-derived-backend confluence ascii
- :translate-alist ((bold . org-confluence-bold)
- (example-block . org-confluence-example-block)
- (fixed-width . org-confluence-fixed-width)
- (footnote-definition . org-confluence-empty)
- (footnote-reference . org-confluence-empty)
- (headline . org-confluence-headline)
- (italic . org-confluence-italic)
- (link . org-confluence-link)
- (section . org-confluence-section)
- (src-block . org-confluence-src-block)
- (strike-through . org-confluence-strike-through)
- (table . org-confluence-table)
- (table-cell . org-confluence-table-cell)
- (table-row . org-confluence-table-row)
- (template . org-confluence-template)
- (underline . org-confluence-underline)))
+(org-export-define-derived-backend 'confluence 'ascii
+ :translate-alist '((bold . org-confluence-bold)
+ (example-block . org-confluence-example-block)
+ (fixed-width . org-confluence-fixed-width)
+ (footnote-definition . org-confluence-empty)
+ (footnote-reference . org-confluence-empty)
+ (headline . org-confluence-headline)
+ (italic . org-confluence-italic)
+ (link . org-confluence-link)
+ (section . org-confluence-section)
+ (src-block . org-confluence-src-block)
+ (strike-through . org-confluence-strike-through)
+ (table . org-confluence-table)
+ (table-cell . org-confluence-table-cell)
+ (table-row . org-confluence-table-row)
+ (template . org-confluence-template)
+ (underline . org-confluence-underline)))
;; All the functions we use
(defun org-confluence-bold (bold contents info)
diff --git a/contrib/lisp/ox-deck.el b/contrib/lisp/ox-deck.el
index d6cdd1c..3934955 100644
--- a/contrib/lisp/ox-deck.el
+++ b/contrib/lisp/ox-deck.el
@@ -41,34 +41,34 @@
(require 'ox-html)
(eval-when-compile (require 'cl))
-(org-export-define-derived-backend deck html
+(org-export-define-derived-backend 'deck 'html
:menu-entry
- (?d "Export to deck.js HTML Presentation"
- ((?H "To temporary buffer" org-deck-export-as-html)
- (?h "To file" org-deck-export-to-html)
- (?o "To file and open"
- (lambda (a s v b)
- (if a (org-deck-export-to-html t s v b)
- (org-open-file (org-deck-export-to-html nil s v b)))))))
+ '(?d "Export to deck.js HTML Presentation"
+ ((?H "To temporary buffer" org-deck-export-as-html)
+ (?h "To file" org-deck-export-to-html)
+ (?o "To file and open"
+ (lambda (a s v b)
+ (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)
- (: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-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)
- (:deck-transition "DECK_TRANSITION" nil org-deck-transition)
- (:deck-include-extensions "DECK_INCLUDE_EXTENSIONS" nil
- org-deck-include-extensions split)
- (:deck-exclude-extensions "DECK_EXCLUDE_EXTENSIONS" nil
- org-deck-exclude-extensions split))
+ '((: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-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)
+ (:deck-transition "DECK_TRANSITION" nil org-deck-transition)
+ (:deck-include-extensions "DECK_INCLUDE_EXTENSIONS" nil
+ org-deck-include-extensions split)
+ (:deck-exclude-extensions "DECK_EXCLUDE_EXTENSIONS" nil
+ org-deck-exclude-extensions split))
:translate-alist
- ((headline . org-deck-headline)
- (inner-template . org-deck-inner-template)
- (item . org-deck-item)
- (template . org-deck-template)))
+ '((headline . org-deck-headline)
+ (inner-template . org-deck-inner-template)
+ (item . org-deck-item)
+ (template . org-deck-template)))
(defgroup org-export-deck nil
"Options for exporting Org mode files to deck.js HTML Presentations."
diff --git a/contrib/lisp/ox-freemind.el b/contrib/lisp/ox-freemind.el
index 4012ee6..4e90eff 100644
--- a/contrib/lisp/ox-freemind.el
+++ b/contrib/lisp/ox-freemind.el
@@ -42,22 +42,22 @@
;;; Define Back-End
-(org-export-define-derived-backend freemind html
+(org-export-define-derived-backend 'freemind 'html
:export-block "FREEMIND"
:menu-entry
- (?f "Export to Freemind Mindmap"
- ((?f "As Freemind Mindmap file" org-freemind-export-to-freemind)
- (?o "As Freemind Mindmap file and open"
- (lambda (a s v b)
- (if a (org-freemind-export-to-freemind t s v b)
- (org-open-file (org-freemind-export-to-freemind nil s v b)))))))
- :translate-alist ((headline . org-freemind-headline)
- (template . org-freemind-template)
- (inner-template . org-freemind-inner-template)
- (section . org-freemind-section)
- (entity . org-freemind-entity))
- :filters-alist ((:filter-options . org-freemind-options-function)
- (:filter-final-output . org-freemind-final-function)))
+ '(?f "Export to Freemind Mindmap"
+ ((?f "As Freemind Mindmap file" org-freemind-export-to-freemind)
+ (?o "As Freemind Mindmap file and open"
+ (lambda (a s v b)
+ (if a (org-freemind-export-to-freemind t s v b)
+ (org-open-file (org-freemind-export-to-freemind nil s v b)))))))
+ :translate-alist '((headline . org-freemind-headline)
+ (template . org-freemind-template)
+ (inner-template . org-freemind-inner-template)
+ (section . org-freemind-section)
+ (entity . org-freemind-entity))
+ :filters-alist '((:filter-options . org-freemind-options-function)
+ (:filter-final-output . org-freemind-final-function)))
diff --git a/contrib/lisp/ox-groff.el b/contrib/lisp/ox-groff.el
index b22ef11..8fc0d3f 100644
--- a/contrib/lisp/ox-groff.el
+++ b/contrib/lisp/ox-groff.el
@@ -45,68 +45,68 @@
;;; Define Back-End
-(org-export-define-backend groff
- ((bold . org-groff-bold)
- (center-block . org-groff-center-block)
- (clock . org-groff-clock)
- (code . org-groff-code)
- (comment . (lambda (&rest args) ""))
- (comment-block . (lambda (&rest args) ""))
- (drawer . org-groff-drawer)
- (dynamic-block . org-groff-dynamic-block)
- (entity . org-groff-entity)
- (example-block . org-groff-example-block)
- (export-block . org-groff-export-block)
- (export-snippet . org-groff-export-snippet)
- (fixed-width . org-groff-fixed-width)
- (footnote-definition . org-groff-footnote-definition)
- (footnote-reference . org-groff-footnote-reference)
- (headline . org-groff-headline)
- (horizontal-rule . org-groff-horizontal-rule)
- (inline-src-block . org-groff-inline-src-block)
- (inlinetask . org-groff-inlinetask)
- (italic . org-groff-italic)
- (item . org-groff-item)
- (keyword . org-groff-keyword)
- (line-break . org-groff-line-break)
- (link . org-groff-link)
- (paragraph . org-groff-paragraph)
- (plain-list . org-groff-plain-list)
- (plain-text . org-groff-plain-text)
- (planning . org-groff-planning)
- (property-drawer . (lambda (&rest args) ""))
- (quote-block . org-groff-quote-block)
- (quote-section . org-groff-quote-section)
- (radio-target . org-groff-radio-target)
- (section . org-groff-section)
- (special-block . org-groff-special-block)
- (src-block . org-groff-src-block)
- (statistics-cookie . org-groff-statistics-cookie)
- (strike-through . org-groff-strike-through)
- (subscript . org-groff-subscript)
- (superscript . org-groff-superscript)
- (table . org-groff-table)
- (table-cell . org-groff-table-cell)
- (table-row . org-groff-table-row)
- (target . org-groff-target)
- (template . org-groff-template)
- (timestamp . org-groff-timestamp)
- (underline . org-groff-underline)
- (verbatim . org-groff-verbatim)
- (verse-block . org-groff-verse-block))
+(org-export-define-backend 'groff
+ '((bold . org-groff-bold)
+ (center-block . org-groff-center-block)
+ (clock . org-groff-clock)
+ (code . org-groff-code)
+ (comment . (lambda (&rest args) ""))
+ (comment-block . (lambda (&rest args) ""))
+ (drawer . org-groff-drawer)
+ (dynamic-block . org-groff-dynamic-block)
+ (entity . org-groff-entity)
+ (example-block . org-groff-example-block)
+ (export-block . org-groff-export-block)
+ (export-snippet . org-groff-export-snippet)
+ (fixed-width . org-groff-fixed-width)
+ (footnote-definition . org-groff-footnote-definition)
+ (footnote-reference . org-groff-footnote-reference)
+ (headline . org-groff-headline)
+ (horizontal-rule . org-groff-horizontal-rule)
+ (inline-src-block . org-groff-inline-src-block)
+ (inlinetask . org-groff-inlinetask)
+ (italic . org-groff-italic)
+ (item . org-groff-item)
+ (keyword . org-groff-keyword)
+ (line-break . org-groff-line-break)
+ (link . org-groff-link)
+ (paragraph . org-groff-paragraph)
+ (plain-list . org-groff-plain-list)
+ (plain-text . org-groff-plain-text)
+ (planning . org-groff-planning)
+ (property-drawer . (lambda (&rest args) ""))
+ (quote-block . org-groff-quote-block)
+ (quote-section . org-groff-quote-section)
+ (radio-target . org-groff-radio-target)
+ (section . org-groff-section)
+ (special-block . org-groff-special-block)
+ (src-block . org-groff-src-block)
+ (statistics-cookie . org-groff-statistics-cookie)
+ (strike-through . org-groff-strike-through)
+ (subscript . org-groff-subscript)
+ (superscript . org-groff-superscript)
+ (table . org-groff-table)
+ (table-cell . org-groff-table-cell)
+ (table-row . org-groff-table-row)
+ (target . org-groff-target)
+ (template . org-groff-template)
+ (timestamp . org-groff-timestamp)
+ (underline . org-groff-underline)
+ (verbatim . org-groff-verbatim)
+ (verse-block . org-groff-verse-block))
:export-block "GROFF"
:menu-entry
- (?g "Export to GROFF"
- ((?g "As GROFF file" org-groff-export-to-groff)
- (?p "As PDF file" org-groff-export-to-pdf)
- (?o "As PDF file and open"
- (lambda (a s v b)
- (if a (org-groff-export-to-pdf t s v b)
- (org-open-file (org-groff-export-to-pdf nil s v b)))))))
+ '(?g "Export to GROFF"
+ ((?g "As GROFF file" org-groff-export-to-groff)
+ (?p "As PDF file" org-groff-export-to-pdf)
+ (?o "As PDF file and open"
+ (lambda (a s v b)
+ (if a (org-groff-export-to-pdf t s v b)
+ (org-open-file (org-groff-export-to-pdf nil s v b)))))))
:options-alist
- ((:groff-class "GROFF_CLASS" nil org-groff-default-class t)
- (:groff-class-options "GROFF_CLASS_OPTIONS" nil nil t)
- (:groff-header-extra "GROFF_HEADER" nil nil newline)))
+ '((:groff-class "GROFF_CLASS" nil org-groff-default-class t)
+ (:groff-class-options "GROFF_CLASS_OPTIONS" nil nil t)
+ (:groff-header-extra "GROFF_HEADER" nil nil newline)))
diff --git a/contrib/lisp/ox-koma-letter.el b/contrib/lisp/ox-koma-letter.el
index f655f13..41bd6af 100644
--- a/contrib/lisp/ox-koma-letter.el
+++ b/contrib/lisp/ox-koma-letter.el
@@ -108,28 +108,28 @@
;;; Define Back-End
-(org-export-define-derived-backend koma-letter latex
+(org-export-define-derived-backend 'koma-letter 'latex
:options-alist
- ((:closing "CLOSING" nil org-koma-letter-closing)
- (:from-address "FROM_ADDRESS" nil org-koma-letter-from-address newline)
- (:lco "LCO" nil org-koma-letter-class-option-file)
- (:opening "OPENING" nil org-koma-letter-opening)
- (:phone-number "PHONE_NUMBER" nil org-koma-letter-phone-number)
- (:signature "SIGNATURE" nil nil newline)
- (:to-address "TO_ADDRESS" nil nil newline))
- :translate-alist ((export-block . org-koma-letter-export-block)
- (export-snippet . org-koma-letter-export-snippet)
- (keyword . org-koma-letter-keyword)
- (template . org-koma-letter-template))
+ '((:closing "CLOSING" nil org-koma-letter-closing)
+ (:from-address "FROM_ADDRESS" nil org-koma-letter-from-address newline)
+ (:lco "LCO" nil org-koma-letter-class-option-file)
+ (:opening "OPENING" nil org-koma-letter-opening)
+ (:phone-number "PHONE_NUMBER" nil org-koma-letter-phone-number)
+ (:signature "SIGNATURE" nil nil newline)
+ (:to-address "TO_ADDRESS" nil nil newline))
+ :translate-alist '((export-block . org-koma-letter-export-block)
+ (export-snippet . org-koma-letter-export-snippet)
+ (keyword . org-koma-letter-keyword)
+ (template . org-koma-letter-template))
:menu-entry
- (?k "Export with KOMA Scrlttr2"
- ((?K "As LaTeX buffer" org-koma-letter-export-as-latex)
- (?k "As LaTeX file" org-koma-letter-export-to-latex)
- (?p "As PDF file" org-koma-letter-export-to-pdf)
- (?O "As PDF file and open"
- (lambda (a s v b)
- (if a (org-koma-letter-export-to-pdf t s v b)
- (org-open-file (org-koma-letter-export-to-pdf nil s v b))))))))
+ '(?k "Export with KOMA Scrlttr2"
+ ((?K "As LaTeX buffer" org-koma-letter-export-as-latex)
+ (?k "As LaTeX file" org-koma-letter-export-to-latex)
+ (?p "As PDF file" org-koma-letter-export-to-pdf)
+ (?O "As PDF file and open"
+ (lambda (a s v b)
+ (if a (org-koma-letter-export-to-pdf t s v b)
+ (org-open-file (org-koma-letter-export-to-pdf nil s v b))))))))
;;; Transcode Functions
diff --git a/contrib/lisp/ox-rss.el b/contrib/lisp/ox-rss.el
index c5dbc8e..b50970c 100644
--- a/contrib/lisp/ox-rss.el
+++ b/contrib/lisp/ox-rss.el
@@ -101,29 +101,29 @@ When nil, Org will create ids using `org-icalendar-create-uid'."
;;; Define backend
-(org-export-define-derived-backend rss html
+(org-export-define-derived-backend 'rss 'html
:menu-entry
- (?r "Export to RSS"
- ((?R "As RSS buffer"
- (lambda (a s v b) (org-rss-export-as-rss a s v)))
- (?r "As RSS file" (lambda (a s v b) (org-rss-export-to-rss a s v)))
- (?o "As RSS file and open"
- (lambda (a s v b)
- (if a (org-rss-export-to-rss t s v)
- (org-open-file (org-rss-export-to-rss nil s v)))))))
+ '(?r "Export to RSS"
+ ((?R "As RSS buffer"
+ (lambda (a s v b) (org-rss-export-as-rss a s v)))
+ (?r "As RSS file" (lambda (a s v b) (org-rss-export-to-rss a s v)))
+ (?o "As RSS file and open"
+ (lambda (a s v b)
+ (if a (org-rss-export-to-rss t s v)
+ (org-open-file (org-rss-export-to-rss nil s v)))))))
:options-alist
- ((:with-toc nil nil nil) ;; Never include HTML's toc
- (:rss-extension "RSS_EXTENSION" nil org-rss-extension)
- (:rss-image-url "RSS_IMAGE_URL" nil org-rss-image-url)
- (:rss-categories nil nil org-rss-categories))
- :filters-alist ((:filter-final-output . org-rss-final-function))
- :translate-alist ((headline . org-rss-headline)
- (comment . (lambda (&rest args) ""))
- (comment-block . (lambda (&rest args) ""))
- (timestamp . (lambda (&rest args) ""))
- (plain-text . org-rss-plain-text)
- (section . org-rss-section)
- (template . org-rss-template)))
+ '((:with-toc nil nil nil) ;; Never include HTML's toc
+ (:rss-extension "RSS_EXTENSION" nil org-rss-extension)
+ (:rss-image-url "RSS_IMAGE_URL" nil org-rss-image-url)
+ (:rss-categories nil nil org-rss-categories))
+ :filters-alist '((:filter-final-output . org-rss-final-function))
+ :translate-alist '((headline . org-rss-headline)
+ (comment . (lambda (&rest args) ""))
+ (comment-block . (lambda (&rest args) ""))
+ (timestamp . (lambda (&rest args) ""))
+ (plain-text . org-rss-plain-text)
+ (section . org-rss-section)
+ (template . org-rss-template)))
;;; Export functions
diff --git a/contrib/lisp/ox-s5.el b/contrib/lisp/ox-s5.el
index ae7e6be..3ea77b2 100644
--- a/contrib/lisp/ox-s5.el
+++ b/contrib/lisp/ox-s5.el
@@ -50,33 +50,33 @@
(require 'ox-html)
-(org-export-define-derived-backend s5 html
+(org-export-define-derived-backend 's5 'html
:menu-entry
- (?s "Export to S5 HTML Presentation"
- ((?H "To temporary buffer" org-s5-export-as-html)
- (?h "To file" org-s5-export-to-html)
- (?o "To file and open"
- (lambda (a s v b)
- (if a (org-s5-export-to-html t s v b)
- (org-open-file (org-s5-export-to-html nil s v b)))))))
+ '(?s "Export to S5 HTML Presentation"
+ ((?H "To temporary buffer" org-s5-export-as-html)
+ (?h "To file" org-s5-export-to-html)
+ (?o "To file and open"
+ (lambda (a s v b)
+ (if a (org-s5-export-to-html t s v b)
+ (org-open-file (org-s5-export-to-html nil s v b)))))))
:options-alist
- ((:html-link-home "HTML_LINK_HOME" nil nil)
- (:html-link-up "HTML_LINK_UP" nil nil)
- (:s5-postamble "S5_POSTAMBLE" nil org-s5-postamble newline)
- (:s5-preamble "S5_PREAMBLE" nil org-s5-preamble 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)
- (:s5-default-view "S5_DEFAULT_VIEW" nil org-s5-default-view)
- (:s5-control-visibility "S5_CONTROL_VISIBILITY" nil
- org-s5-control-visibility))
+ '((:html-link-home "HTML_LINK_HOME" nil nil)
+ (:html-link-up "HTML_LINK_UP" nil nil)
+ (:s5-postamble "S5_POSTAMBLE" nil org-s5-postamble newline)
+ (:s5-preamble "S5_PREAMBLE" nil org-s5-preamble 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)
+ (:s5-default-view "S5_DEFAULT_VIEW" nil org-s5-default-view)
+ (:s5-control-visibility "S5_CONTROL_VISIBILITY" nil
+ org-s5-control-visibility))
:translate-alist
- ((headline . org-s5-headline)
- (plain-list . org-s5-plain-list)
- (inner-template . org-s5-inner-template)
- (template . org-s5-template)))
+ '((headline . org-s5-headline)
+ (plain-list . org-s5-plain-list)
+ (inner-template . org-s5-inner-template)
+ (template . org-s5-template)))
(defgroup org-export-s5 nil
"Options for exporting Org mode files to S5 HTML Presentations."
diff --git a/contrib/lisp/ox-taskjuggler.el b/contrib/lisp/ox-taskjuggler.el
index 4f160ea..cdc9195 100644
--- a/contrib/lisp/ox-taskjuggler.el
+++ b/contrib/lisp/ox-taskjuggler.el
@@ -292,18 +292,18 @@ This hook is run with the name of the file as argument.")
;;; Back-End Definition
-(org-export-define-backend taskjuggler
- ((template . org-taskjuggler-project-plan))
+(org-export-define-backend 'taskjuggler
+ '((template . org-taskjuggler-project-plan))
:menu-entry
- (?J "Export to TaskJuggler"
- ((?j "As TJP file" (lambda (a s v b) (org-taskjuggler-export a s v)))
- (?o "As TJP file and open"
- (lambda (a s v b)
- (if a (org-taskjuggler-export a s v)
- (org-taskjuggler-export-and-open s v))))))
+ '(?J "Export to TaskJuggler"
+ ((?j "As TJP file" (lambda (a s v b) (org-taskjuggler-export a s v)))
+ (?o "As TJP file and open"
+ (lambda (a s v b)
+ (if a (org-taskjuggler-export a s v)
+ (org-taskjuggler-export-and-open s v))))))
;; This property will be used to store unique ids in communication
;; channel. Ids will be retrieved with `org-taskjuggler-get-id'.
- :options-alist ((:taskjuggler-unique-ids nil nil nil)))
+ :options-alist '((:taskjuggler-unique-ids nil nil nil)))