aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Brautaset <stig@brautaset.org>2016-04-26 13:53:15 +0100
committerStig Brautaset <stig@brautaset.org>2016-04-26 13:53:15 +0100
commitc4b8fd30c3bc48621759c9d128644d2d386e591e (patch)
treebd5958b043ef75b290faf2ae53810b2f0de591e6
parentaaa607d7d0138bb3cc7b4f22dec644969ccae244 (diff)
parenta5b386a2dfa7bdf37d849bf4bf179da8991f244c (diff)
Merge pull request #23 from stig/feature/code-in-item-lists
Drop blank lines after code blocks in list items
-rw-r--r--ox-jira.el8
-rw-r--r--ox-jira.org8
-rw-r--r--test/ox-jira-test.org24
3 files changed, 32 insertions, 8 deletions
diff --git a/ox-jira.el b/ox-jira.el
index e11ca1e..459e032 100644
--- a/ox-jira.el
+++ b/ox-jira.el
@@ -117,13 +117,13 @@ TREE is the parse tree being exported. BACKEND is the export
back-end used. INFO is a plist used as a communication channel.
Assume BACKEND is `jira'."
- (org-element-map tree '(item paragraph)
+ (org-element-map tree '(item paragraph src-block)
(lambda (e)
(org-element-put-property
e :post-blank
- (cond ((eq (org-element-type e) 'item) 0)
- ((eq (org-element-type e) 'paragraph)
- (if (eq (org-element-type (org-element-property :parent e)) 'item) 0 1))))))
+ (if (or (eq (org-element-type e) 'item)
+ (eq (org-element-type (org-element-property :parent e)) 'item))
+ 0 1))))
;; Return updated tree.
tree)
diff --git a/ox-jira.org b/ox-jira.org
index 1d66afb..3d08804 100644
--- a/ox-jira.org
+++ b/ox-jira.org
@@ -222,13 +222,13 @@
back-end used. INFO is a plist used as a communication channel.
Assume BACKEND is `jira'."
- (org-element-map tree '(item paragraph)
+ (org-element-map tree '(item paragraph src-block)
(lambda (e)
(org-element-put-property
e :post-blank
- (cond ((eq (org-element-type e) 'item) 0)
- ((eq (org-element-type e) 'paragraph)
- (if (eq (org-element-type (org-element-property :parent e)) 'item) 0 1))))))
+ (if (or (eq (org-element-type e) 'item)
+ (eq (org-element-type (org-element-property :parent e)) 'item))
+ 0 1))))
;; Return updated tree.
tree)
#+END_SRC
diff --git a/test/ox-jira-test.org b/test/ox-jira-test.org
index 1778b80..aefb23a 100644
--- a/test/ox-jira-test.org
+++ b/test/ox-jira-test.org
@@ -261,6 +261,7 @@
fo
2. fa" 'jira)))
+
(should (equal "# fi
#* fifi
#* fofo
@@ -275,6 +276,29 @@
2. fa
3. fum" 'jira)))
+
+ (should (equal "# fi
+ #* {code:sql}SELECT 1;
+ {code}
+ {code:sql}SELECT 2;
+ {code}
+ #* fofo
+ # fa
+ " (org-export-string-as "1. fi
+
+ ,*
+ ,#+begin_src sql
+ SELECT 1;
+ ,#+end_src
+
+ ,#+begin_src sql
+ SELECT 2;
+ ,#+end_src
+
+ ,* fofo
+
+ 2. fa
+ " 'jira)))
)
#+END_SRC