fix(literalMidWordAsterisks): now parses single characters enclosed b…

…y * correctly Closes #478
showdownjs · Dec 22, 2017 · fe70e45 · fe70e45
1 parent a8bcde1
commit fe70e45
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/dist/showdown.js b/dist/showdown.js
diff --git a/dist/showdown.js.map b/dist/showdown.js.map
diff --git a/dist/showdown.min.js b/dist/showdown.min.js
diff --git a/src/subParsers/italicsAndBold.js b/src/subParsers/italicsAndBold.js
@@ -42,13 +42,13 @@ showdown.subParser('italicsAndBold', function (text, options, globals) {
 
   // Now parse asterisks
   if (options.literalMidWordAsterisks) {
-    text = text.replace(/([^*]|^)\B\*\*\*(\S[\s\S]+?)\*\*\*\B(?!\*)/g, function (wm, lead, txt) {
+    text = text.replace(/([^*]|^)\B\*\*\*(\S[\s\S]*?)\*\*\*\B(?!\*)/g, function (wm, lead, txt) {
       return parseInside (txt, lead + '<strong><em>', '</em></strong>');
     });
-    text = text.replace(/([^*]|^)\B\*\*(\S[\s\S]+?)\*\*\B(?!\*)/g, function (wm, lead, txt) {
+    text = text.replace(/([^*]|^)\B\*\*(\S[\s\S]*?)\*\*\B(?!\*)/g, function (wm, lead, txt) {
       return parseInside (txt, lead + '<strong>', '</strong>');
     });
-    text = text.replace(/([^*]|^)\B\*(\S[\s\S]+?)\*\B(?!\*)/g, function (wm, lead, txt) {
+    text = text.replace(/([^*]|^)\B\*(\S[\s\S]*?)\*\B(?!\*)/g, function (wm, lead, txt) {
       return parseInside (txt, lead + '<em>', '</em>');
     });
   } else {

diff --git a/test/features/literalMidWordAsterisks/#478.single-character-bolding.html b/test/features/literalMidWordAsterisks/#478.single-character-bolding.html
@@ -0,0 +1,2 @@
+<p>Click the <strong>X</strong></p>
+<p>Click the <strong>X</strong> button and then the <strong>OK</strong> button</p>
diff --git a/test/features/literalMidWordAsterisks/#478.single-character-bolding.md b/test/features/literalMidWordAsterisks/#478.single-character-bolding.md
@@ -0,0 +1,3 @@
+Click the **X**
+
+Click the **X** button and then the **OK** button