From ec84430cf4e09ba25ec675debdf802bc28111e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= Date: Mon, 7 Nov 2016 10:41:54 +0100 Subject: Imported Upstream version 9.0 --- contrib/lisp/ox-confluence.el | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'contrib/lisp/ox-confluence.el') diff --git a/contrib/lisp/ox-confluence.el b/contrib/lisp/ox-confluence.el index 9b96d5f..48bc5ea 100644 --- a/contrib/lisp/ox-confluence.el +++ b/contrib/lisp/ox-confluence.el @@ -47,6 +47,7 @@ (italic . org-confluence-italic) (item . org-confluence-item) (link . org-confluence-link) + (paragraph . org-confluence-paragraph) (property-drawer . org-confluence-property-drawer) (section . org-confluence-section) (src-block . org-confluence-src-block) @@ -57,6 +58,11 @@ (template . org-confluence-template) (underline . org-confluence-underline))) +(defcustom org-confluence-lang-alist + '(("sh" . "bash")) + "Map from org-babel language name to confluence wiki language name" + :type '(alist :key-type string :value-type string)) + ;; All the functions we use (defun org-confluence-bold (bold contents info) (format "*%s*" contents)) @@ -101,6 +107,12 @@ raw-link)) "]"))) +(defun org-confluence-paragraph (paragraph contents info) + "Transcode PARAGRAPH element for Confluence. +CONTENTS is the paragraph contents. INFO is a plist used as +a communication channel." + contents) + (defun org-confluence-property-drawer (property-drawer contents info) (and (org-string-nw-p contents) (format "\{\{%s\}\}" contents))) @@ -111,8 +123,7 @@ (defun org-confluence-src-block (src-block contents info) ;; FIXME: provide a user-controlled variable for theme (let* ((lang (org-element-property :language src-block)) - (language (if (string= lang "sh") "bash" ;; FIXME: provide a mapping of some sort - lang)) + (language (or (cdr (assoc lang org-confluence-lang-alist)) lang)) (content (org-export-format-code-default src-block info))) (org-confluence--block language "Emacs" content))) -- cgit v1.2.3