aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaylan Limberg <waylan.limberg@icloud.com>2015-08-29 18:18:55 -0400
committerWaylan Limberg <waylan.limberg@icloud.com>2015-08-29 18:18:55 -0400
commitd442f575a35fdf5f7b78df7355c32c4728ff98be (patch)
treeb48109a6e8720e445c5682186c6fe381ffab089d
parent904d4e6d9c8910c3feca52c82382486d51505a3b (diff)
parentc3f7b2ba327c729a36e2a3705514db1742267700 (diff)
downloadmarkdown-d442f575a35fdf5f7b78df7355c32c4728ff98be.tar.gz
markdown-d442f575a35fdf5f7b78df7355c32c4728ff98be.tar.bz2
markdown-d442f575a35fdf5f7b78df7355c32c4728ff98be.zip
Merge pull request #429 from Tigge/patch-1
Fix find footnote placeholder to recurse
-rw-r--r--markdown/extensions/footnotes.py4
-rw-r--r--tests/extensions/extra/footnote_placeholder_depth.html13
-rw-r--r--tests/extensions/extra/footnote_placeholder_depth.txt5
3 files changed, 21 insertions, 1 deletions
diff --git a/markdown/extensions/footnotes.py b/markdown/extensions/footnotes.py
index d8caae2..b52815f 100644
--- a/markdown/extensions/footnotes.py
+++ b/markdown/extensions/footnotes.py
@@ -96,7 +96,9 @@ class FootnoteExtension(Extension):
if child.tail:
if child.tail.find(self.getConfig("PLACE_MARKER")) > -1:
return child, element, False
- finder(child)
+ child_res = finder(child)
+ if child_res is not None:
+ return child_res
return None
res = finder(root)
diff --git a/tests/extensions/extra/footnote_placeholder_depth.html b/tests/extensions/extra/footnote_placeholder_depth.html
new file mode 100644
index 0000000..9793a49
--- /dev/null
+++ b/tests/extensions/extra/footnote_placeholder_depth.html
@@ -0,0 +1,13 @@
+<blockquote>
+<blockquote>
+<div class="footnote">
+<hr />
+<ol>
+<li id="fn:1">
+<p>A Footnote.&#160;<a class="footnote-backref" href="#fnref:1" rev="footnote" title="Jump back to footnote 1 in the text">&#8617;</a></p>
+</li>
+</ol>
+</div>
+<p>Some text with a footnote<sup id="fnref:1"><a class="footnote-ref" href="#fn:1" rel="footnote">1</a></sup>.</p>
+</blockquote>
+</blockquote> \ No newline at end of file
diff --git a/tests/extensions/extra/footnote_placeholder_depth.txt b/tests/extensions/extra/footnote_placeholder_depth.txt
new file mode 100644
index 0000000..cfe87c0
--- /dev/null
+++ b/tests/extensions/extra/footnote_placeholder_depth.txt
@@ -0,0 +1,5 @@
+>> ///Footnotes Go Here///
+>>
+>> Some text with a footnote[^1].
+
+[^1]: A Footnote.