From 15acbdec8c9357b78435af707140b0278cf376b2 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Tue, 7 Apr 2015 19:50:25 -0400 Subject: Remove lazy_ol keyword. Use sane_lists extension instead. This was adapted from 11408e50 of the md3 branch. --- markdown/blockprocessors.py | 4 +++- markdown/core.py | 2 -- markdown/extensions/sane_lists.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'markdown') diff --git a/markdown/blockprocessors.py b/markdown/blockprocessors.py index 378c7c7..f3e1fa7 100644 --- a/markdown/blockprocessors.py +++ b/markdown/blockprocessors.py @@ -325,6 +325,8 @@ class OListProcessor(BlockProcessor): # 3. Item # The ol tag will get starts="3" attribute STARTSWITH = '1' + # Lazy ol - ignore startswith + LAZY_OL = True # List of allowed sibling tags. SIBLING_TAGS = ['ol', 'ul'] @@ -385,7 +387,7 @@ class OListProcessor(BlockProcessor): # This is a new list so create parent with appropriate tag. lst = util.etree.SubElement(parent, self.TAG) # Check if a custom start integer is set - if not self.parser.md.lazy_ol and self.STARTSWITH != '1': + if not self.LAZY_OL and self.STARTSWITH != '1': lst.attrib['start'] = self.STARTSWITH self.parser.state.set('list') diff --git a/markdown/core.py b/markdown/core.py index b031715..2144f00 100644 --- a/markdown/core.py +++ b/markdown/core.py @@ -50,7 +50,6 @@ class Markdown(object): option_defaults = { 'tab_length': 4, 'smart_emphasis': True, - 'lazy_ol': True, } output_formats = { @@ -75,7 +74,6 @@ class Markdown(object): * "html": Outputs HTML style tags. * tab_length: Length of tabs in the source. Default: 4 * smart_emphasis: Treat `_connected_words_` intelligently Default: True - * lazy_ol: Ignore number of first item of ordered lists. Default: True """ diff --git a/markdown/extensions/sane_lists.py b/markdown/extensions/sane_lists.py index 7fb4fd6..479da04 100644 --- a/markdown/extensions/sane_lists.py +++ b/markdown/extensions/sane_lists.py @@ -25,6 +25,7 @@ import re class SaneOListProcessor(OListProcessor): SIBLING_TAGS = ['ol'] + LAZY_OL = False def __init__(self, parser): super(SaneOListProcessor, self).__init__(parser) -- cgit v1.2.3