From fbfa42dfafaa7b129c864cc359f9e6697887dab3 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Fri, 19 Jul 2013 21:18:18 -0400 Subject: 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. --- markdown/extensions/attr_list.py | 2 +- tests/extensions/attr_list.html | 2 +- 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 nested
  • Item5
  • -

    And ordered lists too:

    +

    And ordered lists too

    1. Item1
    2. Item2
        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 } -- cgit v1.2.3