From 26a0e38154f2a2e7ae23ab5d62e3afcc5548cab6 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Wed, 4 Mar 2020 23:29:50 -0800
Subject: [PATCH] Make the recursion nicer

---
 amanuensis/parser/render.py | 10 +++++-----
 amanuensis/parser/text.py   |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/amanuensis/parser/render.py b/amanuensis/parser/render.py
index 37bc91a..1016fda 100644
--- a/amanuensis/parser/render.py
+++ b/amanuensis/parser/render.py
@@ -10,16 +10,16 @@ class PreviewHtmlRenderer():
 	def LineBreak(self, span):
 		return '<br>'
 	def ParsedArticle(self, span):
-		return '\n'.join([child.render(self) for child in span.spans])
+		return '\n'.join(span.recurse(self))
 	def BodyParagraph(self, span):
-		return f'<p>{"".join([child.render(self) for child in span.spans])}</p>'
+		return f'<p>{"".join(span.recurse(self))}</p>'
 	def SignatureParagraph(self, span):
 		return ('<hr><span class="signature"><p>'
-			f'{"".join([child.render(self) for child in span.spans])}'
+			f'{"".join(span.recurse(self))}'
 			'</p></span>')
 	def BoldSpan(self, span):
-		return f'<b>{"".join([child.render(self) for child in span.spans])}</b>'
+		return f'<b>{"".join(span.recurse(self))}</b>'
 	def ItalicSpan(self, span):
-		return f'<i>{"".join([child.render(self) for child in span.spans])}</i>'
+		return f'<i>{"".join(span.recurse(self))}</i>'
 	def CitationSpan(self, span):
 		return f'<a href="#">{span.cite_text}</a>'
diff --git a/amanuensis/parser/text.py b/amanuensis/parser/text.py
index 45f8868..c2a2220 100644
--- a/amanuensis/parser/text.py
+++ b/amanuensis/parser/text.py
@@ -29,6 +29,8 @@ class SpanContainer(Renderable):
 		self.spans = spans
 	def __str__(self):
 		return f"[{type(self).__name__} {' '.join([str(span) for span in self.spans])}]"
+	def recurse(self, renderer):
+		return [child.render(renderer) for child in self.spans]
 
 class ParsedArticle(SpanContainer):
 	"""Multiple paragraphs"""