Merge pull request trentm#157 from trentm/nicholasserra-hr-length

nicholasserra · nicholasserra · commit 201ec812d91b · 2014-03-30T21:59:58.000-04:00
Horizontal rules need to be at least 3 chars.
diff --git a/lib/markdown2.py b/lib/markdown2.py
@@ -776,12 +776,7 @@ def _strip_footnote_definitions(self, text):
             re.X | re.M)
         return footnote_def_re.sub(self._extract_footnote_def_sub, text)
 
-
-    _hr_data = [
-        ('*', re.compile(r"^[ ]{0,3}\*(.*?)$", re.M)),
-        ('-', re.compile(r"^[ ]{0,3}\-(.*?)$", re.M)),
-        ('_', re.compile(r"^[ ]{0,3}\_(.*?)$", re.M)),
-    ]
+    _hr_re = re.compile(r'^[ ]{0,3}([-_*][ ]{0,2}){3,}$', re.M)
 
     def _run_block_gamut(self, text):
         # These are all the transformations that form block-level
@@ -798,13 +793,7 @@ def _run_block_gamut(self, text):
         # Markdown.pl 1.0.1's hr regexes limit the number of spaces between the
         # hr chars to one or two. We'll reproduce that limit here.
         hr = "\n<hr"+self.empty_element_suffix+"\n"
-        for ch, regex in self._hr_data:
-            if ch in text:
-                for m in reversed(list(regex.finditer(text))):
-                    tail = m.group(1).rstrip()
-                    if not tail.strip(ch + ' ') and tail.count("   ") == 0:
-                        start, end = m.span()
-                        text = text[:start] + hr + text[end:]
+        text = re.sub(self._hr_re, hr, text)
 
         text = self._do_lists(text)
 
diff --git a/test/tm-cases/hr_length.html b/test/tm-cases/hr_length.html
@@ -0,0 +1,19 @@
+<h1>horizontal rules need to be at least 3 characters</h1>
+
+<p>-</p>
+
+<p>*</p>
+
+<p>_</p>
+
+<p>--</p>
+
+<p>**</p>
+
+<p>__</p>
+
+<hr />
+
+<hr />
+
+<hr />
diff --git a/test/tm-cases/hr_length.text b/test/tm-cases/hr_length.text
@@ -0,0 +1,19 @@
+# horizontal rules need to be at least 3 characters
+
+-
+
+*
+
+_
+
+--
+
+**
+
+__
+
+---
+
+***
+
+___

-Original file line number
+Diff line change
@@ @@ -0,0 +1,19 @@ @@
 +# horizontal rules need to be at least 3 characters
++
 +-
++
 +*
++
 +_
++
 +--
++
 +**
++
 +__
++
 +---
++
 +***
++
 +___