Merge branch 'dev'

makefile

@@ -21,7 +21,7 @@ benchmark:
 	${PYTHON_EXEC} test/benchmark.py
 
 commonmark:
-	${PYTHON_EXEC} test/commonmark/commonmark.py
+	${PYTHON_EXEC} -m test.commonmark
 
 docs:
 	${PYTHON_EXEC} -m docs

mistletoe/html_renderer.py

@@ -42,7 +42,8 @@ def __exit__(self, *args):
 
     def render_to_plain(self, token):
         if hasattr(token, 'children'):
-            return self.render_inner(token)
+            inner = [self.render_to_plain(child) for child in token.children]
+            return ''.join(inner)
         return self.escape_html(token.content)
 
     def render_strong(self, token):
@@ -64,15 +65,11 @@ def render_strikethrough(self, token):
 
     def render_image(self, token):
         template = '<img src="{}" alt="{}"{} />'
-        render_func = self.render
-        self.render = self.render_to_plain
-        inner = self.render_inner(token)
-        self.render = render_func
         if token.title:
             title = ' title="{}"'.format(self.escape_html(token.title))
         else:
             title = ''
-        return template.format(token.src, inner, title)
+        return template.format(token.src, self.render_to_plain(token), title)
 
     def render_link(self, token):
         template = '<a href="{target}"{title}>{inner}</a>'

test/test_html_renderer.py

@@ -36,7 +36,7 @@ def test_strikethrough(self):
         self._test_token('Strikethrough', '<del>inner</del>')
 
     def test_image(self):
-        output = '<img src="src" alt="inner" title="title" />'
+        output = '<img src="src" alt="" title="title" />'
         self._test_token('Image', output, src='src', title='title')
 
     def test_link(self):