Merge pull request #545 from Crozzers/fix-consecutive-bold

Fix bad handling of consecutive bold words (#541)
trentm · Dec 10, 2023 · 0fa9739 · 0fa9739
2 parents bef9a20 + 078f76a
commit 0fa9739
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/lib/markdown2.py b/lib/markdown2.py
@@ -2406,9 +2406,9 @@ def _do_tg_spoiler(self, text):
         text = self._tg_spoiler_re.sub(r"<tg-spoiler>\1</tg-spoiler>", text)
         return text
 
-    _strong_re = re.compile(r"(\*\*|__)(?=\S)(.*\S)\1", re.S)
+    _strong_re = re.compile(r"(\*\*|__)(?=\S)(.+?[*_]?)(?<=\S)\1", re.S)
     _em_re = r"(\*|_)(?=\S)(.*?\S)\1"
-    _code_friendly_strong_re = re.compile(r"\*\*(?=\S)(.*\S)\*\*", re.S)
+    _code_friendly_strong_re = re.compile(r"\*\*(?=\S)(.+?[*_]?)(?<=\S)\*\*", re.S)
     _code_friendly_em_re = r"\*(?=\S)(.+?)\*"
     def _do_italics_and_bold(self, text):
         if self.extras.get('middle-word-em', True) is False:

diff --git a/test/tm-cases/consecutive_strong_em.html b/test/tm-cases/consecutive_strong_em.html
@@ -0,0 +1,7 @@
+<p><strong>a</strong> b <strong>c</strong></p>
+
+<p><em>a</em> b <em>c</em></p>
+
+<p><strong>a</strong> b <strong>c</strong></p>
+
+<p><em>a</em> b <em>c</em></p>
diff --git a/test/tm-cases/consecutive_strong_em.text b/test/tm-cases/consecutive_strong_em.text
@@ -0,0 +1,7 @@
+**a** b **c**
+
+*a* b *c*
+
+__a__ b __c__
+
+_a_ b _c_