Merge pull request #22 from livio/fix-paragrah-block

Fix paragrah block header issue

Author: jemerick

HISTORY.rst

@@ -2,6 +2,11 @@
 History
 =======
 
+0.2.6 (2019-06-12)
+------------------
+
+* Fix block paragraph rendering with title
+
 0.2.5 (2019-06-12)
 ------------------
 

docdown/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """Jason Emerick"""
 __email__ = 'jason@mobelux.com'
-__version__ = '0.2.5'
+__version__ = '0.2.6'

docdown/platform_section.py

@@ -20,6 +20,7 @@ class PlatformSectionPreprocessor(Preprocessor):
     PLATFORM_SECTION_RE = re.compile(r'''@!\[(?P<sections>[\w, ]+)\](?P<content>.*?)!@''', re.DOTALL | re.VERBOSE)
 
     STARTSWITH_WHITESPACE_RE = re.compile(r'^\W+(@!\[|\n)')
+    MULTI_NEWLINE_RE = re.compile(r'^(\n){2,}')
 
     def __init__(self, platform_section, **kwargs):
         self.platform_section = platform_section.lower().strip()
@@ -42,7 +43,10 @@ def process_platform_sections(self, text):
                 start = text[:m.start()]
                 end = text[m.end():]
                 if self.STARTSWITH_WHITESPACE_RE.match(end):
-                    end = end.lstrip()
+                    if self.MULTI_NEWLINE_RE.match(end):
+                        end = '\n' + end.lstrip()
+                    else:
+                        end = end.lstrip()
 
                 if self.platform_section in sections:
                     content = m.group('content')

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.5
+current_version = 0.2.6
 commit = True
 tag = True
 

setup.py

@@ -20,7 +20,7 @@
 
 setup(
     name='docdown',
-    version='0.2.5',
+    version='0.2.6',
     description="DocDown is a Markdown extension for source code documentation.",
     long_description=readme + '\n\n' + history,
     author="Jason Emerick, Justin Michalicek",

tests/test_platform_section_extension.py

@@ -160,7 +160,7 @@ def test_section_with_code_snippet(self):
             extensions=self.MARKDOWN_EXTENSIONS,
             output_format='html5'
         )
-        expected_output = '<p>some Android content shown</p>\n<p><code>java\nString java = "asdf";</code>\n</p>'
+        expected_output = '<p>some Android content shown</p>\n<p><code>java\nString java = "asdf";</code></p>'
         self.assertEqual(expected_output, html)
 
     def test_multiple_sections_with_code_snippet(self):
@@ -181,7 +181,7 @@ def test_multiple_sections_with_code_snippet(self):
             extensions=self.MARKDOWN_EXTENSIONS,
             output_format='html5'
         )
-        expected_output = '<p>some Android content shown</p>\n<p><code>java\nString java = "asdf";</code>\n</p>'
+        expected_output = '<p>some Android content shown</p>\n<p><code>java\nString java = "asdf";</code></p>'
         self.assertEqual(expected_output, html)
 
     def test_inline_platform_section(self):
@@ -307,3 +307,25 @@ def test_back_to_back_platform_section_tags(self):
         )
         expected_output = '<p>Back to back Android tags!</p>'
         self.assertEqual(expected_output, html)
+
+    def test_tag_end_paragraph_start_header(self):
+        text = 'You need to implement this. @![ios]In iOS, also this.!@\n\n## Next Header\nThe header above should be rendered.\n'
+
+        html = markdown.markdown(
+            text,
+            extension_configs=self.build_config_for_platform_section('iOS'),
+            extensions=['markdown.extensions.tables'] + self.MARKDOWN_EXTENSIONS,
+            output_format='html5'
+        )
+
+        expected_output = '<p>You need to implement this. In iOS, also this.</p>\n<h2>Next Header</h2>\n<p>The header above should be rendered.</p>'
+        self.assertEqual(expected_output, html)
+
+        html = markdown.markdown(
+            text,
+            extension_configs=self.build_config_for_platform_section('Android'),
+            extensions=['markdown.extensions.tables'] + self.MARKDOWN_EXTENSIONS,
+            output_format='html5'
+        )
+        expected_output = '<p>You need to implement this. </p>\n<h2>Next Header</h2>\n<p>The header above should be rendered.</p>'
+        self.assertEqual(expected_output, html)