aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohan Jain <crodjer@gmail.com>2011-04-05 14:59:30 +0530
committerRohan Jain <crodjer@gmail.com>2011-04-05 14:59:30 +0530
commitc385e5fc0a9fe7517b4afdb5b3f9c174ae0766de (patch)
treef2652cb039e44d9f430e8509c3b1912937313970
parentf1a2d3763115c41a4f0159e2f98aa76330cc17e5 (diff)
downloadmarkdown-c385e5fc0a9fe7517b4afdb5b3f9c174ae0766de.tar.gz
markdown-c385e5fc0a9fe7517b4afdb5b3f9c174ae0766de.tar.bz2
markdown-c385e5fc0a9fe7517b4afdb5b3f9c174ae0766de.zip
fixed startindex reset in multiple ul
Now the startindex would be reset if continual unordered lists are present (tests are passed).
-rw-r--r--markdown/blockprocessors.py10
-rw-r--r--tests/misc/some-test.html4
2 files changed, 6 insertions, 8 deletions
diff --git a/markdown/blockprocessors.py b/markdown/blockprocessors.py
index 13bc477..64b9e09 100644
--- a/markdown/blockprocessors.py
+++ b/markdown/blockprocessors.py
@@ -300,11 +300,11 @@ class OListProcessor(BlockProcessor):
CHILD_RE = re.compile(r'^[ ]{0,3}((\d+\.)|[*+-])[ ]+(.*)')
# Detect indented (nested) items of either type
INDENT_RE = re.compile(r'^[ ]{4,7}((\d+\.)|[*+-])[ ]+.*')
- # The integer with which the lists starts (None means start with 0)
+ # The integer (python string) with which the lists starts (default=1)
# Eg: If list is intialized as)
# 3. Item
# The ol tag will get starts="3" attribute
- STARTSWITH = None
+ STARTSWITH = '1'
def test(self, parent, block):
return bool(self.RE.match(block))
@@ -345,7 +345,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 self.STARTSWITH:
+ if self.STARTSWITH !='1':
lst.attrib['start'] = self.STARTSWITH
self.parser.state.set('list')
@@ -372,9 +372,7 @@ class OListProcessor(BlockProcessor):
if not items and self.TAG=='ol':
# Detect the integer value of first list item
INTEGER_RE = re.compile('(\d+)')
- start_integer = INTEGER_RE.match(m.group(1)).group()
- if start_integer!='1':
- self.STARTSWITH = start_integer
+ self.STARTSWITH = INTEGER_RE.match(m.group(1)).group()
# Append to the list
items.append(m.group(3))
elif self.INDENT_RE.match(line):
diff --git a/tests/misc/some-test.html b/tests/misc/some-test.html
index b78683f..92e7262 100644
--- a/tests/misc/some-test.html
+++ b/tests/misc/some-test.html
@@ -51,7 +51,7 @@ ok
with a bunch of items</li>
<li>
<p>Mostly fruits</p>
-<ol>
+<ol start="3">
<li>Apple</li>
<li>Pare</li>
</ol>
@@ -65,4 +65,4 @@ Another code example
* Lists and similar stuff
&gt; Should be ignored
-</code></pre> \ No newline at end of file
+</code></pre>