diff options
author | Waylan Limberg <waylan@gmail.com> | 2013-07-19 21:18:18 -0400 |
---|---|---|
committer | Waylan Limberg <waylan@gmail.com> | 2013-07-19 21:18:18 -0400 |
commit | fbfa42dfafaa7b129c864cc359f9e6697887dab3 (patch) | |
tree | 2e169385c7380d2b3781f9553b975971bdbcc271 | |
parent | effa7a8aaace52b466fdd19ffd97e5e33e2a9a3a (diff) | |
download | markdown-fbfa42dfafaa7b129c864cc359f9e6697887dab3.tar.gz markdown-fbfa42dfafaa7b129c864cc359f9e6697887dab3.tar.bz2 markdown-fbfa42dfafaa7b129c864cc359f9e6697887dab3.zip |
Allow inline attr_lists at end of header.
A header can be only one line - so unlike other block level elements, a
attr_list must be at th eend of the line. To disingush it from an inline
attr_list on the last child in a header, we must require at least one
space before th eblock-level attrt_list.
Always intended it to work that way. Not sure how I missed that before.
At least we're testing for it now.
-rw-r--r-- | markdown/extensions/attr_list.py | 2 | ||||
-rw-r--r-- | tests/extensions/attr_list.html | 2 | ||||
-rw-r--r-- | tests/extensions/attr_list.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/markdown/extensions/attr_list.py b/markdown/extensions/attr_list.py index 161c448..3d7fc46 100644 --- a/markdown/extensions/attr_list.py +++ b/markdown/extensions/attr_list.py @@ -67,7 +67,7 @@ def isheader(elem): class AttrListTreeprocessor(Treeprocessor): BASE_RE = r'\{\:?([^\}]*)\}' - HEADER_RE = re.compile(r'[ ]*%s[ ]*$' % BASE_RE) + HEADER_RE = re.compile(r'[ ]+%s[ ]*$' % BASE_RE) BLOCK_RE = re.compile(r'\n[ ]*%s[ ]*$' % BASE_RE) INLINE_RE = re.compile(r'^%s' % BASE_RE) NAME_RE = re.compile(r'[^A-Z_a-z\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u02ff\u0370-\u037d' diff --git a/tests/extensions/attr_list.html b/tests/extensions/attr_list.html index b1ed85c..ad965fd 100644 --- a/tests/extensions/attr_list.html +++ b/tests/extensions/attr_list.html @@ -32,7 +32,7 @@ And a <strong class="nest">nested <a class="linky2" href="http://example.com" ti </li> <li>Item5</li> </ul> -<p>And ordered lists too:</p> +<h1>And ordered lists <em class="inline">too</em></h1> <ol> <li class="item">Item1</li> <li class="item">Item2<ol> diff --git a/tests/extensions/attr_list.txt b/tests/extensions/attr_list.txt index 8ecfe44..a841b87 100644 --- a/tests/extensions/attr_list.txt +++ b/tests/extensions/attr_list.txt @@ -49,7 +49,7 @@ Also a codespan: `{: .someclass}`{: .foo}. * Item4-1 * Item5 -And ordered lists too: +# And ordered lists *too*{.inline} 1. Item1 {: .item } |