Loosen whitespace requirements for admonitions.

Also consume to the end of the first line of any admonition. Everything after
the title is discarded. However, the only thing that will match should be
whitespace so it should be a non-issue.
Fixes #550.

Author: waylan

markdown/extensions/admonition.py

@@ -41,7 +41,7 @@ class AdmonitionProcessor(BlockProcessor):
 
     CLASSNAME = 'admonition'
     CLASSNAME_TITLE = 'admonition-title'
-    RE = re.compile(r'(?:^|\n)!!!\ ?([\w\-]+)(?:\ "(.*?)")?')
+    RE = re.compile(r'(?:^|\n)!!! ?([\w\-]+)(?: +"(.*?)")? *(?:\n|$)')
 
     def test(self, parent, block):
         sibling = self.lastChild(parent)
@@ -55,7 +55,7 @@ def run(self, parent, blocks):
         m = self.RE.search(block)
 
         if m:
-            block = block[m.end() + 1:]  # removes the first line
+            block = block[m.end():]  # removes the first line
 
         block, theRest = self.detab(block)
 

tests/extensions/admonition.html

@@ -28,4 +28,12 @@
 </div>
 <div class="admonition tip">
 <p>An explicitly empty string prevents the title from being rendered.</p>
+</div>
+<p>No body:</p>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
+</div>
+<p>Extra whitespace after the title should not alter output:</p>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
 </div>

tests/extensions/admonition.txt

@@ -27,3 +27,11 @@ Not part of an Admonition!
 
 !!! tip ""
     An explicitly empty string prevents the title from being rendered.
+
+No body:
+
+!!! note
+
+Extra whitespace after the title should not alter output:
+
+!!! note