fix(literalMidWordUnderscores): fix different behavior with asterisks

Closes #198
showdownjs · Oct 19, 2015 · e86aea8 · e86aea8
1 parent 5b1f716
commit e86aea8
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 7 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/dist/showdown.min.js.map b/dist/showdown.min.js.map
diff --git a/src/subParsers/italicsAndBold.js b/src/subParsers/italicsAndBold.js
@@ -7,8 +7,8 @@ showdown.subParser('italicsAndBold', function (text, options) {
     text = text.replace(/(^|\s|>|\b)__(?=\S)([^]+?)__(?=\b|<|\s|$)/gm, '$1<strong>$2</strong>');
     text = text.replace(/(^|\s|>|\b)_(?=\S)([^]+?)_(?=\b|<|\s|$)/gm, '$1<em>$2</em>');
     //asterisks
-    text = text.replace(/\*\*(?=\S)([^]+?)\*\*/g, '<strong>$1</strong>');
-    text = text.replace(/\*(?=\S)([^]+?)\*/g, '<em>$1</em>');
+    text = text.replace(/(\*\*)(?=\S)([^\r]*?\S[*]*)\1/g, '<strong>$2</strong>');
+    text = text.replace(/(\*)(?=\S)([^\r]*?\S)\1/g, '<em>$2</em>');
 
   } else {
     // <strong> must go first:

diff --git a/test/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.html b/test/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.html
@@ -0,0 +1,5 @@
+<p>pointer *ptr *thing</p>
+
+<p>something _else _bla</p>
+
+<p>something __else __bla</p>
diff --git a/test/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.md b/test/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.md
@@ -0,0 +1,5 @@
+pointer *ptr *thing
+
+something _else _bla
+
+something __else __bla
diff --git a/test/node/testsuite.features.js b/test/node/testsuite.features.js
@@ -27,6 +27,8 @@ describe('makeHtml() features testsuite', function () {
       converter = new showdown.Converter({tasklists: true});
     } else if (testsuite[i].name === 'autolink-and-disallow-underscores') {
       converter = new showdown.Converter({literalMidWordUnderscores: true, simplifiedAutoLink: true});
+    } else if (testsuite[i].name === '#198.literalMidWordUnderscores-changes-behavior-of-asterisk') {
+      converter = new showdown.Converter({literalMidWordUnderscores: true});
     } else {
       converter = new showdown.Converter();
     }