Merge pull request #218 from liguangsheng/tasklist

nicholasserra · web-flow · commit 70a28df3ca47 · 2016-06-23T23:40:25.000-04:00
added tasklist extra and unit test
diff --git a/lib/markdown2.py b/lib/markdown2.py
@@ -1509,11 +1509,26 @@ def _do_lists(self, text):
         (^[ \t]*)               # leading whitespace = \2
         (?P<marker>%s) [ \t]+   # list marker = \3
         ((?:.+?)                # list item text = \4
-         (\n{1,2}))             # eols = \5
+        (\n{1,2}))              # eols = \5
         (?= \n* (\Z | \2 (?P<next_marker>%s) [ \t]+))
         ''' % (_marker_any, _marker_any),
         re.M | re.X | re.S)
 
+    _task_list_item_re = re.compile(r'''
+        (\[[\ x]\])[ \t]+       # tasklist marker = \1
+        (.*)                   # list item text = \2
+    ''', re.M | re.X | re.S)
+
+    _task_list_warpper_str = r'<p><input type="checkbox" class="task-list-item-checkbox" %sdisabled>%s</p>'
+
+    def _task_list_item_sub(self, match):
+        marker = match.group(1)
+        item_text = match.group(2)
+        if marker == '[x]':
+                return self._task_list_warpper_str % ('checked ', item_text)
+        elif marker == '[ ]':
+                return self._task_list_warpper_str % ('', item_text)
+
     _last_li_endswith_two_eols = False
     def _list_item_sub(self, match):
         item = match.group(4)
@@ -1527,6 +1542,10 @@ def _list_item_sub(self, match):
                 item = item[:-1]
             item = self._run_span_gamut(item)
         self._last_li_endswith_two_eols = (len(match.group(5)) == 2)
+
+        if "task_list" in self.extras:
+            item = self._task_list_item_re.sub(self._task_list_item_sub, item)
+
         return "<li>%s</li>\n" % item
 
     def _process_list_items(self, list_str):
diff --git a/test/tm-cases/task_list.html b/test/tm-cases/task_list.html
@@ -0,0 +1,4 @@
+<ul>
+<li><p><input type="checkbox" class="task-list-item-checkbox" checked disabled>item1</p></li>
+<li><p><input type="checkbox" class="task-list-item-checkbox" disabled>item2</p></li>
+</ul>
diff --git a/test/tm-cases/task_list.opts b/test/tm-cases/task_list.opts
@@ -0,0 +1 @@
+{"extras": ["task_list"]}
diff --git a/test/tm-cases/task_list.tags b/test/tm-cases/task_list.tags
@@ -0,0 +1 @@
+extra task_list issue216
diff --git a/test/tm-cases/task_list.text b/test/tm-cases/task_list.text
@@ -0,0 +1,2 @@
+- [x] item1
+- [ ] item2

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +<ul>
 +<li><p><input type="checkbox" class="task-list-item-checkbox" checked disabled>item1</p></li>
 +<li><p><input type="checkbox" class="task-list-item-checkbox" disabled>item2</p></li>
 +</ul>