aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaylan Limberg <waylan@gmail.com>2014-01-12 18:25:11 -0500
committerWaylan Limberg <waylan@gmail.com>2014-01-12 18:25:11 -0500
commitbdf7bf290ad72d0fc70612c8c0ca614c4d5939bb (patch)
tree3fed550fc5707869afa40b1151ca7e7c7e2f24de
parent28d61f5b6b1e0863857c9e1368b3f7698c2f67dd (diff)
parent73fdecaf2cf00d85b7c933f5b8d186d74a80ff2a (diff)
downloadmarkdown-bdf7bf290ad72d0fc70612c8c0ca614c4d5939bb.tar.gz
markdown-bdf7bf290ad72d0fc70612c8c0ca614c4d5939bb.tar.bz2
markdown-bdf7bf290ad72d0fc70612c8c0ca614c4d5939bb.zip
Merge branch 'master' of github.com:waylan/Python-Markdown
-rw-r--r--markdown/extensions/attr_list.py2
-rw-r--r--tests/extensions/extra/tables_and_attr_list.html18
-rw-r--r--tests/extensions/extra/tables_and_attr_list.txt4
-rw-r--r--tests/extensions/extra/test.cfg3
4 files changed, 27 insertions, 0 deletions
diff --git a/markdown/extensions/attr_list.py b/markdown/extensions/attr_list.py
index fabc925..8b65f56 100644
--- a/markdown/extensions/attr_list.py
+++ b/markdown/extensions/attr_list.py
@@ -121,6 +121,8 @@ class AttrListTreeprocessor(Treeprocessor):
elif elem.text:
# no children. Get from text.
m = RE.search(elem.text)
+ if not m and elem.tag == 'td':
+ m = re.search(self.BASE_RE, elem.text)
if m:
self.assign_attrs(elem, m.group(1))
elem.text = elem.text[:m.start()]
diff --git a/tests/extensions/extra/tables_and_attr_list.html b/tests/extensions/extra/tables_and_attr_list.html
new file mode 100644
index 0000000..7d2451b
--- /dev/null
+++ b/tests/extensions/extra/tables_and_attr_list.html
@@ -0,0 +1,18 @@
+<table>
+<thead>
+<tr>
+<th>First Header</th>
+<th>Second Header</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="foo bar" title="Some title!">Content Cell</td>
+<td>Content Cell</td>
+</tr>
+<tr>
+<td>Content Cell</td>
+<td class="foo bar" title="Some title!">Content Cell</td>
+</tr>
+</tbody>
+</table>
diff --git a/tests/extensions/extra/tables_and_attr_list.txt b/tests/extensions/extra/tables_and_attr_list.txt
new file mode 100644
index 0000000..517eeeb
--- /dev/null
+++ b/tests/extensions/extra/tables_and_attr_list.txt
@@ -0,0 +1,4 @@
+First Header | Second Header
+------------------------------------------------------ | -------------
+Content Cell{: class="foo bar" title="Some title!" } | Content Cell
+Content Cell | Content Cell{: class="foo bar" title="Some title!" }
diff --git a/tests/extensions/extra/test.cfg b/tests/extensions/extra/test.cfg
index 74893f0..52d48f0 100644
--- a/tests/extensions/extra/test.cfg
+++ b/tests/extensions/extra/test.cfg
@@ -15,3 +15,6 @@ extensions=footnotes
[tables]
extensions=tables
+
+[tables_and_attr_list]
+extensions=tables,attr_list