From 0242a96366b1681a86563d63776e320ff6f76a9e Mon Sep 17 00:00:00 2001 From: Charles de Beauchesne Date: Thu, 8 Mar 2018 14:56:09 +0100 Subject: Better check of allowed TOC location #639 (#641) --- markdown/extensions/toc.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'markdown') diff --git a/markdown/extensions/toc.py b/markdown/extensions/toc.py index 21f98ba..0e9b2b9 100644 --- a/markdown/extensions/toc.py +++ b/markdown/extensions/toc.py @@ -137,11 +137,17 @@ class TocTreeprocessor(Treeprocessor): self.header_rgx = re.compile("[Hh][123456]") - def iterparent(self, root): - ''' Iterator wrapper to get parent and child all at once. ''' - for parent in root.iter(): - for child in parent: - yield parent, child + def iterparent(self, node): + ''' Iterator wrapper to get allowed parent and child all at once. ''' + + # We do not allow the marker inside a header as that + # would causes an enless loop of placing a new TOC + # inside previously generated TOC. + for child in node: + if not self.header_rgx.match(child.tag) and child.tag not in ['pre', 'code']: + yield node, child + for p, c in self.iterparent(child): + yield p, c def replace_marker(self, root, elem): ''' Replace marker with elem. ''' @@ -153,11 +159,7 @@ class TocTreeprocessor(Treeprocessor): # To keep the output from screwing up the # validation by putting a
inside of a

# we actually replace the

in its entirety. - # We do not allow the marker inside a header as that - # would causes an enless loop of placing a new TOC - # inside previously generated TOC. - if c.text and c.text.strip() == self.marker and \ - not self.header_rgx.match(c.tag) and c.tag not in ['pre', 'code']: + if c.text and c.text.strip() == self.marker: for i in range(len(p)): if p[i] == c: p[i] = elem -- cgit v1.2.3