Merge pull request #475 from aidantwoods/loose-lists

Loose lists
erusev · Feb 28, 2018 · 5057e50 · 5057e50
2 parents 6678d59 + 722b776
commit 5057e50
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 4 deletions.
diff --git a/Parsedown.php b/Parsedown.php
@@ -569,6 +569,8 @@ protected function blockListContinue($Line, array $Block)
             {
                 $Block['li']['text'] []= '';
 
+                $Block['loose'] = true;
+
                 unset($Block['interrupted']);
             }
 
@@ -617,6 +619,22 @@ protected function blockListContinue($Line, array $Block)
         }
     }
 
+    protected function blockListComplete(array $Block)
+    {
+        if (isset($Block['loose']))
+        {
+            foreach ($Block['element']['text'] as &$li)
+            {
+                if (end($li['text']) !== '')
+                {
+                    $li['text'] []= '';
+                }
+            }
+        }
+
+        return $Block;
+    }
+
     #
     # Quote
 

diff --git a/test/data/multiline_lists.html b/test/data/multiline_lists.html
@@ -0,0 +1,10 @@
+<ol>
+<li>
+<p>One
+First body copy</p>
+</li>
+<li>
+<p>Two
+Last body copy</p>
+</li>
+</ol>
diff --git a/test/data/multiline_lists.md b/test/data/multiline_lists.md
@@ -0,0 +1,5 @@
+1. One
+   First body copy
+
+2. Two
+   Last body copy
diff --git a/test/data/paragraph_list.html b/test/data/paragraph_list.html
@@ -8,5 +8,7 @@
 <li>
 <p>li</p>
 </li>
-<li>li</li>
+<li>
+<p>li</p>
+</li>
 </ul>
diff --git a/test/data/sparse_dense_list.html b/test/data/sparse_dense_list.html
@@ -2,6 +2,10 @@
 <li>
 <p>li</p>
 </li>
-<li>li</li>
-<li>li</li>
+<li>
+<p>li</p>
+</li>
+<li>
+<p>li</p>
+</li>
 </ul>
diff --git a/test/data/sparse_list.html b/test/data/sparse_list.html
@@ -2,7 +2,9 @@
 <li>
 <p>li</p>
 </li>
-<li>li</li>
+<li>
+<p>li</p>
+</li>
 </ul>
 <hr />
 <ul>