Skip to content

Commit

Permalink
Merge pull request #1394 from mccraveiro/blockquote
Browse files Browse the repository at this point in the history
Fix blockquote paragraph continuation
  • Loading branch information
styfle authored Dec 20, 2018
2 parents 0fd0a97 + 419e654 commit 2a9f782
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/marked.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var block = {
heading: /^ *(#{1,6}) *([^\n]+?) *(?:#+ *)?(?:\n+|$)/,
nptable: noop,
blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
list: /^( {0,3})(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
html: '^ {0,3}(?:' // optional indentation
+ '<(script|pre|style)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)' // (1)
+ '|comment[^\\n]*(\\n+|$)' // (2)
Expand Down
2 changes: 1 addition & 1 deletion test/specs/commonmark/commonmark-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ describe('CommonMark 0.28 Block quotes', function() {
var section = 'Block quotes';

// var shouldPassButFails = [];
var shouldPassButFails = [198, 199, 200, 201];
var shouldPassButFails = [198, 199, 200];

var willNotBeAttemptedByCoreTeam = [];

Expand Down

0 comments on commit 2a9f782

Please sign in to comment.