diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-03-05 18:39:22 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-03-05 18:39:22 +0100 |
commit | 5d4d672b592a1768a7e41c92ff6e3c567e750d90 (patch) | |
tree | d414ee2ca106287eeb7121e3640bd50a83ab116d /lisp/ox-confluence.el | |
parent | 52eb89b5c3fae6c6adf14811d526914f16332eb5 (diff) | |
parent | 1c910a9b0fbc8a8f0216d418f627d0c06079a947 (diff) |
Merge branch 'maint'
Diffstat (limited to 'lisp/ox-confluence.el')
-rw-r--r-- | lisp/ox-confluence.el | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/lisp/ox-confluence.el b/lisp/ox-confluence.el index 65b63d8..a9fac5e 100644 --- a/lisp/ox-confluence.el +++ b/lisp/ox-confluence.el @@ -58,6 +58,7 @@ (table-cell . org-confluence-table-cell) (table-row . org-confluence-table-row) (template . org-confluence-template) + (timestamp . org-confluence-timestamp) (underline . org-confluence-underline) (verbatim . org-confluence-verbatim))) @@ -106,14 +107,19 @@ (format "\{\{%s\}\}" (org-element-property :value code))) (defun org-confluence-headline (headline contents info) - (let ((low-level-rank (org-export-low-level-p headline info)) - (text (org-export-data (org-element-property :title headline) - info)) - (level (org-export-get-relative-level headline info))) + (let* ((low-level-rank (org-export-low-level-p headline info)) + (text (org-export-data (org-element-property :title headline) + info)) + (todo (org-export-data (org-element-property :todo-keyword headline) + info)) + (level (org-export-get-relative-level headline info)) + (todo-text (if (or (not (plist-get info :with-todo-keywords)) + (string= todo "")) + "" + (format "*{{%s}}* " todo)))) ;; Else: Standard headline. - (format "h%s. %s\n%s" level text - (if (org-string-nw-p contents) contents - "")))) + (format "h%s. %s%s\n%s" level todo-text text + (if (org-string-nw-p contents) contents "")))) (defun org-confluence-link (link desc info) (let ((raw-link (org-element-property :raw-link link))) @@ -165,14 +171,21 @@ a communication channel." (defun org-confluence-table-cell (table-cell contents info) (let ((table-row (org-export-get-parent table-cell))) (concat - (when (org-export-table-row-starts-header-p table-row info) - "|") - contents "|"))) + (and (org-export-table-row-starts-header-p table-row info) "|") + " " contents "|"))) (defun org-confluence-template (contents info) (let ((depth (plist-get info :with-toc))) (concat (when depth "\{toc\}\n\n") contents))) +(defun org-confluence-timestamp (timestamp _contents _info) + "Transcode a TIMESTAMP object from Org to Confluence. +CONTENTS and INFO are ignored." + (let ((translated (org-timestamp-translate timestamp))) + (if (string-prefix-p "[" translated) + (concat "(" (substring translated 1 -1) ")") + translated))) + (defun org-confluence-underline (underline contents info) (format "+%s+" contents)) |