Skip to content

Commit 7e1088f

Browse files
authored
Merge pull request #1400 from mccraveiro/strong-tag
Fix strong tag
2 parents 9bc193b + d010745 commit 7e1088f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/marked.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ var inline = {
541541
link: /^!?\[(label)\]\(href(?:\s+(title))?\s*\)/,
542542
reflink: /^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,
543543
nolink: /^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,
544-
strong: /^__([^\s])__(?!_)|^\*\*([^\s])\*\*(?!\*)|^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)/,
544+
strong: /^__([^\s_])__(?!_)|^\*\*([^\s*])\*\*(?!\*)|^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)/,
545545
em: /^_([^\s_])_(?!_)|^\*([^\s*"<\[])\*(?!\*)|^_([^\s][\s\S]*?[^\s_])_(?!_|[^\spunctuation])|^_([^\s_][\s\S]*?[^\s])_(?!_|[^\spunctuation])|^\*([^\s"<\[][\s\S]*?[^\s*])\*(?!\*)|^\*([^\s*"<\[][\s\S]*?[^\s])\*(?!\*)/,
546546
code: /^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,
547547
br: /^( {2,}|\\)\n(?!\s*$)/,

test/specs/commonmark/commonmark-spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ describe('CommonMark 0.28 Emphasis and strong emphasis', function() {
337337
var section = 'Emphasis and strong emphasis';
338338

339339
// var shouldPassButFails = [];
340-
var shouldPassButFails = [334, 342, 348, 349, 352, 353, 360, 368, 369, 371, 372, 378, 380, 381, 382, 387, 388, 392, 393, 394, 395, 396, 402, 403, 409, 416, 419, 420, 421, 422, 423, 424, 428, 431, 432, 433, 434, 435, 436, 443, 444, 445, 448, 449, 453, 454, 455, 457, 458];
340+
var shouldPassButFails = [334, 342, 348, 349, 352, 353, 360, 368, 369, 371, 372, 378, 380, 381, 382, 387, 388, 392, 393, 394, 395, 396, 402, 403, 409, 419, 420, 421, 422, 423, 424, 431, 432, 433, 434, 435, 436, 443, 444, 445, 448, 449, 453, 454, 455, 457, 458];
341341

342342
var willNotBeAttemptedByCoreTeam = [];
343343

0 commit comments

Comments
 (0)