StarMirror/showdown
1
0
Fork 0
mirror of https://github.com/showdownjs/showdown.git synced 2024-03-22 13:30:55 +08:00
Code Issues Projects Releases Wiki Activity

fix(literalMidWordUnderscores): fix different behavior with asterisks

Browse Source 
Closes #198
This commit is contained in:
Estevão Soares dos Santos 2015-10-19 03:09:50 +01:00
parent 5b1f716151
commit e86aea8183
8 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/showdown.js vendored
View File

Binary file not shown.

BIN
dist/showdown.js.map vendored
View File

Binary file not shown.

BIN
dist/showdown.min.js vendored
View File

Binary file not shown.

BIN
dist/showdown.min.js.map vendored
View File

Binary file not shown.

4
src/subParsers/italicsAndBold.js
View File

@ -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:

5
test/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.html Normal file
View File

@ -0,0 +1,5 @@
<p>​pointer *ptr *thing</p>
<p>something _else _bla</p>
<p>something __else __bla</p>

5
test/features/#198.literalMidWordUnderscores-changes-behavior-of-asterisk.md Normal file
View File

@ -0,0 +1,5 @@
​pointer *ptr *thing
something _else _bla
something __else __bla

2
test/node/testsuite.features.js
View File

@ -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();
}