From e92bc962a17d855706e7b41ce2eaef2c13feda29 Mon Sep 17 00:00:00 2001
From: ravenmaster001 <hayden.adam.jackson@gmail.com>
Date: Mon, 24 Apr 2017 13:12:25 +1200
Subject: [PATCH 1/5] Remove error causing None type.

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index c4c9933e..fbeb35b1 100644
--- a/README.rst
+++ b/README.rst
@@ -13,7 +13,7 @@ Verto allows for an author to quickly include images and content and display
 them in a panel (similar to a Bootstrap Collapsible Panel) with the following
 markdown:
 
-.. code-block:: None
+.. code-block::
 
   # Example Header
 
@@ -37,7 +37,7 @@ output to stdout:
   text = open('example.md', 'r')
   converter = Verto()
   result = converter.convert(text)
-  
+
   print(result.html_string)
 
 Documentation

From 963948bd4722dada535357be0b1c635d43ceb970 Mon Sep 17 00:00:00 2001
From: ravenmaster001 <hayden.adam.jackson@gmail.com>
Date: Mon, 24 Apr 2017 16:14:41 +1200
Subject: [PATCH 2/5] Support tags within lists.

---
 verto/VertoExtension.py                       |  6 +--
 verto/tests/ImageTest.py                      | 15 +++++++
 .../assets/image/image_in_numbered_list.md    | 11 ++++++
 .../image_in_numbered_list_expected.html      | 39 +++++++++++++++++++
 4 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 verto/tests/assets/image/image_in_numbered_list.md
 create mode 100644 verto/tests/assets/image/image_in_numbered_list_expected.html

diff --git a/verto/VertoExtension.py b/verto/VertoExtension.py
index 899c34d0..f8923c2e 100644
--- a/verto/VertoExtension.py
+++ b/verto/VertoExtension.py
@@ -167,9 +167,9 @@ def buildProcessors(self, md, md_globals):
             ['heading', HeadingBlockProcessor(self, md.parser), '<hashheader'],
             # Single line (in increasing complexity)
             ['interactive', InteractiveBlockProcessor(self, md.parser), '_begin'],
-            ['image', ImageBlockProcessor(self, md.parser), '_begin'],
-            ['video', VideoBlockProcessor(self, md.parser), '_begin'],
-            ['conditional', ConditionalProcessor(self, md.parser), '_begin'],
+            ['image', ImageBlockProcessor(self, md.parser), '<paragraph'],
+            ['video', VideoBlockProcessor(self, md.parser), '<paragraph'],
+            ['conditional', ConditionalProcessor(self, md.parser), '<paragraph'],
             # Multiline
         ]
         self.inlinepatterns = [  # A special treeprocessor
diff --git a/verto/tests/ImageTest.py b/verto/tests/ImageTest.py
index b1004feb..992dac19 100644
--- a/verto/tests/ImageTest.py
+++ b/verto/tests/ImageTest.py
@@ -306,6 +306,21 @@ def test_align_undefined_error(self):
 
         self.assertRaises(ArgumentValueError, lambda x: markdown.markdown(x, extensions=[self.verto_extension]), test_string)
 
+    def test_image_in_numbered_list(self):
+        '''Basic example of common usage.'''
+        test_string = self.read_test_file(self.processor_name, 'image_in_numbered_list.md')
+        blocks = self.to_blocks(test_string)
+
+        self.assertListEqual([False, False, False, True, False], [ImageBlockProcessor(self.ext, self.md.parser).test(blocks, block) for block in blocks], msg='"{}"'.format(test_string))
+
+        converted_test_string = markdown.markdown(test_string, extensions=[self.verto_extension])
+        expected_string = self.read_test_file(self.processor_name, 'image_in_numbered_list_expected.html', strip=True)
+        self.assertEqual(expected_string, converted_test_string)
+
+        images = self.verto_extension.required_files['images']
+        expected_images = set()
+        self.assertSetEqual(expected_images, images)
+
     #~
     # Doc Tests
     #~
diff --git a/verto/tests/assets/image/image_in_numbered_list.md b/verto/tests/assets/image/image_in_numbered_list.md
new file mode 100644
index 00000000..7c79cfab
--- /dev/null
+++ b/verto/tests/assets/image/image_in_numbered_list.md
@@ -0,0 +1,11 @@
+1.  Lipsum
+
+    *   Ichi
+    *   Ni
+    *   San
+
+2.  Lorem
+
+    {image file-path="http://placehold.it/350x150" caption="Placeholder image" source="https://placehold.it/" hover-text="This is hover text" alignment="left"}
+
+3.  Ipsem
diff --git a/verto/tests/assets/image/image_in_numbered_list_expected.html b/verto/tests/assets/image/image_in_numbered_list_expected.html
new file mode 100644
index 00000000..297994a4
--- /dev/null
+++ b/verto/tests/assets/image/image_in_numbered_list_expected.html
@@ -0,0 +1,39 @@
+<ol>
+ <li>
+  <p>
+   Lipsum
+  </p>
+  <ul>
+   <li>
+    Ichi
+   </li>
+   <li>
+    Ni
+   </li>
+   <li>
+    San
+   </li>
+  </ul>
+ </li>
+ <li>
+  <p>
+   Lorem
+  </p>
+  <div>
+   <img class="left-align" src="http://placehold.it/350x150" title="This is hover text"/>
+   <p>
+    Placeholder image
+   </p>
+   <p>
+    <a href="https://placehold.it/">
+     Source
+    </a>
+   </p>
+  </div>
+ </li>
+ <li>
+  <p>
+   Ipsem
+  </p>
+ </li>
+</ol>

From ec6139fe2d8e8863ae994e9be449e21fb0801849 Mon Sep 17 00:00:00 2001
From: ravenmaster001 <hayden.adam.jackson@gmail.com>
Date: Mon, 24 Apr 2017 16:17:33 +1200
Subject: [PATCH 3/5] Include interactive in list-able items.

---
 verto/VertoExtension.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/verto/VertoExtension.py b/verto/VertoExtension.py
index f8923c2e..3d594c3f 100644
--- a/verto/VertoExtension.py
+++ b/verto/VertoExtension.py
@@ -166,7 +166,7 @@ def buildProcessors(self, md, md_globals):
             # Markdown overrides
             ['heading', HeadingBlockProcessor(self, md.parser), '<hashheader'],
             # Single line (in increasing complexity)
-            ['interactive', InteractiveBlockProcessor(self, md.parser), '_begin'],
+            ['interactive', InteractiveBlockProcessor(self, md.parser), '<paragraph'],
             ['image', ImageBlockProcessor(self, md.parser), '<paragraph'],
             ['video', VideoBlockProcessor(self, md.parser), '<paragraph'],
             ['conditional', ConditionalProcessor(self, md.parser), '<paragraph'],

From 1d91e584afcfea11bcc9a61211f2af8d6fc5f3d4 Mon Sep 17 00:00:00 2001
From: ravenmaster001 <hayden.adam.jackson@gmail.com>
Date: Mon, 24 Apr 2017 16:25:41 +1200
Subject: [PATCH 4/5] Update custom tags with listing fix.

---
 verto/VertoExtension.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/verto/VertoExtension.py b/verto/VertoExtension.py
index 3d594c3f..7ab17f6e 100644
--- a/verto/VertoExtension.py
+++ b/verto/VertoExtension.py
@@ -194,10 +194,10 @@ def buildGenericProcessors(self, md, md_globals):
             processor_class = processor_info.get('class', None)
             if processor_class == 'generic_tag':
                 processor_object = GenericTagBlockProcessor(processor, self, md.parser)
-                self.blockprocessors.insert(0, [processor, processor_object, '_begin'])
+                self.blockprocessors.insert(0, [processor, processor_object, '<paragraph'])
             if processor_class == 'generic_container':
                 processor_object = GenericContainerBlockProcessor(processor, self, md.parser)
-                self.blockprocessors.append([processor, processor_object, '_begin'])
+                self.blockprocessors.append([processor, processor_object, '<paragraph'])
 
     def loadProcessorInfo(self):
         '''Loads processor descriptions from a json file.

From 06f8a8ebacb1975cf3728e071f8e565087be1a83 Mon Sep 17 00:00:00 2001
From: ravenmaster001 <hayden.adam.jackson@gmail.com>
Date: Mon, 24 Apr 2017 16:27:40 +1200
Subject: [PATCH 5/5] Bump version to v0.5.1

---
 docs/source/changelog.rst | 7 +++++++
 verto/__init__.py         | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index 3bf93c0c..a0123eac 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -1,6 +1,13 @@
 Changelog
 #######################################
 
+0.5.1
+=======================================
+
+Fixes:
+
+  - Verto tags and custom tags, are now support embedding into markdown lists.
+
 0.5.0
 =======================================
 
diff --git a/verto/__init__.py b/verto/__init__.py
index 71b8e834..6d3d0ad1 100644
--- a/verto/__init__.py
+++ b/verto/__init__.py
@@ -1,4 +1,4 @@
 # flake8: noqa
 from .Verto import Verto
 
-__version__ = '0.5.0'
+__version__ = '0.5.1'