From 0f6ff94aed8c2f6529d2308f75a770f2b130bff9 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Wed, 4 Feb 2009 17:39:47 -0500 Subject: Completed nested lists and added a test. All tests pass. --- markdown/blockprocessors.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'markdown/blockprocessors.py') diff --git a/markdown/blockprocessors.py b/markdown/blockprocessors.py index bc5ddaa..79f4db9 100644 --- a/markdown/blockprocessors.py +++ b/markdown/blockprocessors.py @@ -135,7 +135,10 @@ class ListIndentProcessor(BlockProcessor): if parent.tag in self.ITEM_TYPES: # The parent is already a li. Just parse the child block. self.parser.parseBlocks(parent, [block]) - elif len(sibling) and sibling[-1].tag in self.ITEM_TYPES : + elif sibling.tag in self.ITEM_TYPES: + # The sibling is a li. Use it as parent. + self.parser.parseBlocks(sibling, [block]) + elif len(sibling) and sibling[-1].tag in self.ITEM_TYPES: # The parent is a list (``ol`` or ``ul``) which has children. # Assume the last child li is the parent of this block. if sibling[-1].text: @@ -154,18 +157,28 @@ class ListIndentProcessor(BlockProcessor): def get_level(self, parent, block): """ Get level of indent based on list level. """ + # Get indent level m = self.INDENT_RE.match(block) if m: indent_level = len(m.group(1))/markdown.TAB_LENGTH else: indent_level = 0 - level = 0 + if self.parser.state.isstate('list'): + # We're in a tightlist - so we already are at correct parent. + level = 1 + else: + # We're in a looselist - so we need to find parent. + level = 0 + # Step through children of tree to find matching indent level. while indent_level > level: - parent = self.lastChild(parent) - if parent: - if parent.tag in self.LIST_TYPES: + child = self.lastChild(parent) + if child and (child.tag in self.LIST_TYPES or child.tag in self.ITEM_TYPES): + if child.tag in self.LIST_TYPES: level += 1 + parent = child else: + # No more child levels. If we're short of indent_level, + # we have a code block. So we stop here. break return level, parent -- cgit v1.2.3