summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJensDiemer <git@jensdiemer.de>2020-01-19 10:07:48 +0100
committerJensDiemer <git@jensdiemer.de>2020-01-19 10:07:48 +0100
commit2aa93574572eeb85219dd2c9c23ed3c3754c0506 (patch)
tree32e257be778ffdaa1aefe69f1c38db4981ca5db8
parentae5e6a27ab9e536853e3d2780705eaa00810df4f (diff)
parent06bd422b92401f2feb6b4b9fcdfd9d6246068513 (diff)
downloadcreole-2aa93574572eeb85219dd2c9c23ed3c3754c0506.tar.gz
Merge https://github.com/jedie/python-creole/pull/27
-rw-r--r--creole/emitter/html2rest_emitter.py2
-rw-r--r--creole/tests/test_html2rest.py12
2 files changed, 14 insertions, 0 deletions
diff --git a/creole/emitter/html2rest_emitter.py b/creole/emitter/html2rest_emitter.py
index 41891fe..0e0b663 100644
--- a/creole/emitter/html2rest_emitter.py
+++ b/creole/emitter/html2rest_emitter.py
@@ -86,6 +86,8 @@ class ReStructuredTextEmitter(BaseEmitter):
result = self.emit_children(node)
if self._substitution_data:
# add rest at the end
+ if not result.endswith("\n\n"):
+ result += "\n\n"
result += "%s\n\n" % self._get_block_data()
return result
diff --git a/creole/tests/test_html2rest.py b/creole/tests/test_html2rest.py
index eb7de66..29d197a 100644
--- a/creole/tests/test_html2rest.py
+++ b/creole/tests/test_html2rest.py
@@ -71,6 +71,18 @@ class ReStTests(BaseCreoleTest):
"""
)
+ def test_substitution_image_without_p(self):
+ self.assert_html2rest(
+ rest_string="""
+ |image.png|
+
+ .. |image.png| image:: /url/to/image.png
+ """,
+ html_string="""
+ <img src="/url/to/image.png" />
+ """
+ )
+
def test_pre_code1(self):
self.assert_html2rest(
rest_string="""