Merge pull request #590 from Crozzers/code-friendly-bold-italic

Fix underscores within bold text getting emphasized (#589)

Author: nicholasserra

CHANGES.md

@@ -2,7 +2,7 @@
 
 ## python-markdown2 2.5.1 (not yet released)
 
-(nothing yet)
+- [pull 590] Fix underscores within bold text getting emphasized (#589)
 
 
 ## python-markdown2 2.5.0

lib/markdown2.py

@@ -2643,9 +2643,12 @@ def run(self, text):
             text = self.strong_re.sub(self.sub, text)
             text = self.em_re.sub(self.sub, text)
         else:
-            # put any hashed values back
-            for key, substr in self.hash_table.items():
-                text = text.replace(key, substr)
+            # push any hashed values back, using a while loop to deal with recursive hashes
+            orig_text = ''
+            while orig_text != text:
+                orig_text = text
+                for key, substr in self.hash_table.items():
+                    text = text.replace(key, substr)
         return text
 
     @abstractmethod
@@ -2762,12 +2765,20 @@ class CodeFriendly(ItalicAndBoldProcessor):
 
     def sub(self, match: re.Match) -> str:
         syntax = match.group(1)
-        if '_' not in syntax:
-            return super().sub(match)
-        text = match.string[match.start(): match.end()]
-        key = _hash_text(text)
-        self.hash_table[key] = text
-        return key
+        text: str = match.string[match.start(): match.end()]
+        if '_' in syntax:
+            # if using _this_ syntax, hash the whole thing so that it doesn't get processed
+            key = _hash_text(text)
+            self.hash_table[key] = text
+            return key
+        elif '_' in text:
+            # if the text within the bold/em markers contains '_' then hash those contents to protect them from em_re
+            text = text[len(syntax): -len(syntax)]
+            key = _hash_text(text)
+            self.hash_table[key] = text
+            return syntax + key + syntax
+        # if no underscores are present, the text is fine and we can just leave it alone
+        return super().sub(match)
 
 
 class FencedCodeBlocks(Extra):

test/tm-cases/code_friendly_bold.html

@@ -0,0 +1 @@
+<p><strong>bold_but_not_emphasized</strong></p>

test/tm-cases/code_friendly_bold.opts

@@ -0,0 +1 @@
+{"extras": ["code-friendly"]}

test/tm-cases/code_friendly_bold.text

@@ -0,0 +1 @@
+**bold_but_not_emphasized**