/i.test(cap[0])) {
+ this.lexer.state.inLink = false;
}
- if (!inRawBlock && /^<(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
- inRawBlock = true;
- } else if (inRawBlock && /^<\/(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
- inRawBlock = false;
+ if (!this.lexer.state.inRawBlock && /^<(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
+ this.lexer.state.inRawBlock = true;
+ } else if (this.lexer.state.inRawBlock && /^<\/(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
+ this.lexer.state.inRawBlock = false;
}
return {
type: this.options.sanitize ? 'text' : 'html',
raw: cap[0],
- inLink: inLink,
- inRawBlock: inRawBlock,
+ inLink: this.lexer.state.inLink,
+ inRawBlock: this.lexer.state.inRawBlock,
text: this.options.sanitize ? this.options.sanitizer ? this.options.sanitizer(cap[0]) : _escape(cap[0]) : cap[0]
};
}
@@ -879,14 +936,14 @@
} // ending angle bracket cannot be escaped
- var rtrimSlash = rtrim(trimmedUrl.slice(0, -1), '\\');
+ var rtrimSlash = rtrim$1(trimmedUrl.slice(0, -1), '\\');
if ((trimmedUrl.length - rtrimSlash.length) % 2 === 0) {
return;
}
} else {
// find closing parenthesis
- var lastParenIndex = findClosingBracket(cap[2], '()');
+ var lastParenIndex = findClosingBracket$1(cap[2], '()');
if (lastParenIndex > -1) {
var start = cap[0].indexOf('!') === 0 ? 5 : 4;
@@ -926,7 +983,7 @@
return outputLink(cap, {
href: href ? href.replace(this.rules.inline._escapes, '$1') : href,
title: title ? title.replace(this.rules.inline._escapes, '$1') : title
- }, cap[0]);
+ }, cap[0], this.lexer);
}
};
@@ -946,7 +1003,7 @@
};
}
- return outputLink(cap, link, cap[0]);
+ return outputLink(cap, link, cap[0], this.lexer);
}
};
@@ -997,18 +1054,23 @@
rLength = Math.min(rLength, rLength + delimTotal + midDelimTotal); // Create `em` if smallest delimiter has odd char count. *a***
if (Math.min(lLength, rLength) % 2) {
+ var _text = src.slice(1, lLength + match.index + rLength);
+
return {
type: 'em',
raw: src.slice(0, lLength + match.index + rLength + 1),
- text: src.slice(1, lLength + match.index + rLength)
+ text: _text,
+ tokens: this.lexer.inlineTokens(_text, [])
};
} // Create 'strong' if smallest delimiter has even char count. **a***
+ var text = src.slice(2, lLength + match.index + rLength - 1);
return {
type: 'strong',
raw: src.slice(0, lLength + match.index + rLength + 1),
- text: src.slice(2, lLength + match.index + rLength - 1)
+ text: text,
+ tokens: this.lexer.inlineTokens(text, [])
};
}
}
@@ -1053,7 +1115,8 @@
return {
type: 'del',
raw: cap[0],
- text: cap[2]
+ text: cap[2],
+ tokens: this.lexer.inlineTokens(cap[2], [])
};
}
};
@@ -1127,13 +1190,13 @@
}
};
- _proto.inlineText = function inlineText(src, inRawBlock, smartypants) {
+ _proto.inlineText = function inlineText(src, smartypants) {
var cap = this.rules.inline.text.exec(src);
if (cap) {
var text;
- if (inRawBlock) {
+ if (this.lexer.state.inRawBlock) {
text = this.options.sanitize ? this.options.sanitizer ? this.options.sanitizer(cap[0]) : _escape(cap[0]) : cap[0];
} else {
text = _escape(this.options.smartypants ? smartypants(cap[0]) : cap[0]);
@@ -1150,21 +1213,21 @@
return Tokenizer;
}();
- var noopTest = helpers.noopTest,
- edit = helpers.edit,
+ var noopTest$1 = helpers.noopTest,
+ edit$1 = helpers.edit,
merge$1 = helpers.merge;
/**
* Block-Level Grammar
*/
- var block$1 = {
+ var block = {
newline: /^(?: *(?:\n|$))+/,
code: /^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/,
- fences: /^ {0,3}(`{3,}(?=[^`\n]*\n)|~{3,})([^\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/,
+ fences: /^ {0,3}(`{3,}(?=[^`\n]*\n)|~{3,})([^\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?=\n|$)|$)/,
hr: /^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,
heading: /^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/,
blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
- list: /^( {0,3})(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?! {0,3}bull )\n*|\s*$)/,
+ list: /^( {0,3}bull)( [^\n]+?)?(?:\n|$)/,
html: '^ {0,3}(?:' // optional indentation
+ '<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:[^\\n]*\\n+|$)' // (1)
+ '|comment[^\\n]*(\\n+|$)' // (2)
@@ -1176,76 +1239,66 @@
+ '|(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) closing tag
+ ')',
def: /^ {0,3}\[(label)\]: *\n? *]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,
- nptable: noopTest,
- table: noopTest,
+ table: noopTest$1,
lheading: /^([^\n]+)\n {0,3}(=+|-+) *(?:\n+|$)/,
// regex template, placeholders will be replaced according to different paragraph
// interruption rules of commonmark and the original markdown spec:
_paragraph: /^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html| +\n)[^\n]+)*)/,
text: /^[^\n]+/
};
- block$1._label = /(?!\s*\])(?:\\[\[\]]|[^\[\]])+/;
- block$1._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/;
- block$1.def = edit(block$1.def).replace('label', block$1._label).replace('title', block$1._title).getRegex();
- block$1.bullet = /(?:[*+-]|\d{1,9}[.)])/;
- block$1.item = /^( *)(bull) ?[^\n]*(?:\n(?! *bull ?)[^\n]*)*/;
- block$1.item = edit(block$1.item, 'gm').replace(/bull/g, block$1.bullet).getRegex();
- block$1.listItemStart = edit(/^( *)(bull) */).replace('bull', block$1.bullet).getRegex();
- block$1.list = edit(block$1.list).replace(/bull/g, block$1.bullet).replace('hr', '\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))').replace('def', '\\n+(?=' + block$1.def.source + ')').getRegex();
- block$1._tag = 'address|article|aside|base|basefont|blockquote|body|caption' + '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption' + '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe' + '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option' + '|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr' + '|track|ul';
- block$1._comment = /|$)/;
- block$1.html = edit(block$1.html, 'i').replace('comment', block$1._comment).replace('tag', block$1._tag).replace('attribute', / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex();
- block$1.paragraph = edit(block$1._paragraph).replace('hr', block$1.hr).replace('heading', ' {0,3}#{1,6} ').replace('|lheading', '') // setex headings don't interrupt commonmark paragraphs
+ block._label = /(?!\s*\])(?:\\[\[\]]|[^\[\]])+/;
+ block._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/;
+ block.def = edit$1(block.def).replace('label', block._label).replace('title', block._title).getRegex();
+ block.bullet = /(?:[*+-]|\d{1,9}[.)])/;
+ block.listItemStart = edit$1(/^( *)(bull) */).replace('bull', block.bullet).getRegex();
+ block.list = edit$1(block.list).replace(/bull/g, block.bullet).replace('hr', '\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))').replace('def', '\\n+(?=' + block.def.source + ')').getRegex();
+ block._tag = 'address|article|aside|base|basefont|blockquote|body|caption' + '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption' + '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe' + '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option' + '|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr' + '|track|ul';
+ block._comment = /|$)/;
+ block.html = edit$1(block.html, 'i').replace('comment', block._comment).replace('tag', block._tag).replace('attribute', / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex();
+ block.paragraph = edit$1(block._paragraph).replace('hr', block.hr).replace('heading', ' {0,3}#{1,6} ').replace('|lheading', '') // setex headings don't interrupt commonmark paragraphs
.replace('blockquote', ' {0,3}>').replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n').replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
- .replace('html', ')|<(?:script|pre|style|textarea|!--)').replace('tag', block$1._tag) // pars can be interrupted by type (6) html blocks
+ .replace('html', ')|<(?:script|pre|style|textarea|!--)').replace('tag', block._tag) // pars can be interrupted by type (6) html blocks
.getRegex();
- block$1.blockquote = edit(block$1.blockquote).replace('paragraph', block$1.paragraph).getRegex();
+ block.blockquote = edit$1(block.blockquote).replace('paragraph', block.paragraph).getRegex();
/**
* Normal Block Grammar
*/
- block$1.normal = merge$1({}, block$1);
+ block.normal = merge$1({}, block);
/**
* GFM Block Grammar
*/
- block$1.gfm = merge$1({}, block$1.normal, {
- nptable: '^ *([^|\\n ].*\\|.*)\\n' // Header
- + ' {0,3}([-:]+ *\\|[-| :]*)' // Align
- + '(?:\\n((?:(?!\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)',
- // Cells
- table: '^ *\\|(.+)\\n' // Header
- + ' {0,3}\\|?( *[-:]+[-| :]*)' // Align
+ block.gfm = merge$1({}, block.normal, {
+ table: '^ *([^\\n ].*\\|.*)\\n' // Header
+ + ' {0,3}(?:\\| *)?(:?-+:? *(?:\\| *:?-+:? *)*)\\|?' // Align
+ '(?:\\n *((?:(?!\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)' // Cells
});
- block$1.gfm.nptable = edit(block$1.gfm.nptable).replace('hr', block$1.hr).replace('heading', ' {0,3}#{1,6} ').replace('blockquote', ' {0,3}>').replace('code', ' {4}[^\\n]').replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n').replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
- .replace('html', ')|<(?:script|pre|style|textarea|!--)').replace('tag', block$1._tag) // tables can be interrupted by type (6) html blocks
- .getRegex();
- block$1.gfm.table = edit(block$1.gfm.table).replace('hr', block$1.hr).replace('heading', ' {0,3}#{1,6} ').replace('blockquote', ' {0,3}>').replace('code', ' {4}[^\\n]').replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n').replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
- .replace('html', ')|<(?:script|pre|style|textarea|!--)').replace('tag', block$1._tag) // tables can be interrupted by type (6) html blocks
+ block.gfm.table = edit$1(block.gfm.table).replace('hr', block.hr).replace('heading', ' {0,3}#{1,6} ').replace('blockquote', ' {0,3}>').replace('code', ' {4}[^\\n]').replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n').replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
+ .replace('html', ')|<(?:script|pre|style|textarea|!--)').replace('tag', block._tag) // tables can be interrupted by type (6) html blocks
.getRegex();
/**
* Pedantic grammar (original John Gruber's loose markdown specification)
*/
- block$1.pedantic = merge$1({}, block$1.normal, {
- html: edit('^ *(?:comment *(?:\\n|\\s*$)' + '|<(tag)[\\s\\S]+? *(?:\\n{2,}|\\s*$)' // closed tag
- + '|\\s]*)*?/?> *(?:\\n{2,}|\\s*$))').replace('comment', block$1._comment).replace(/tag/g, '(?!(?:' + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub' + '|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)' + '\\b)\\w+(?!:|[^\\w\\s@]*@)\\b').getRegex(),
+ block.pedantic = merge$1({}, block.normal, {
+ html: edit$1('^ *(?:comment *(?:\\n|\\s*$)' + '|<(tag)[\\s\\S]+? *(?:\\n{2,}|\\s*$)' // closed tag
+ + '|\\s]*)*?/?> *(?:\\n{2,}|\\s*$))').replace('comment', block._comment).replace(/tag/g, '(?!(?:' + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub' + '|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)' + '\\b)\\w+(?!:|[^\\w\\s@]*@)\\b').getRegex(),
def: /^ *\[([^\]]+)\]: *]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,
heading: /^(#{1,6})(.*)(?:\n+|$)/,
- fences: noopTest,
+ fences: noopTest$1,
// fences not supported
- paragraph: edit(block$1.normal._paragraph).replace('hr', block$1.hr).replace('heading', ' *#{1,6} *[^\n]').replace('lheading', block$1.lheading).replace('blockquote', ' {0,3}>').replace('|fences', '').replace('|list', '').replace('|html', '').getRegex()
+ paragraph: edit$1(block.normal._paragraph).replace('hr', block.hr).replace('heading', ' *#{1,6} *[^\n]').replace('lheading', block.lheading).replace('blockquote', ' {0,3}>').replace('|fences', '').replace('|list', '').replace('|html', '').getRegex()
});
/**
* Inline-Level Grammar
*/
- var inline$1 = {
+ var inline = {
escape: /^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,
autolink: /^<(scheme:[^\s\x00-\x1f<>]*|email)>/,
- url: noopTest,
+ url: noopTest$1,
tag: '^comment' + '|^' // self-closing tag
+ '|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>' // open tag
+ '|^<\\?[\\s\\S]*?\\?>' // processing instruction, e.g.
@@ -1266,43 +1319,43 @@
},
code: /^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,
br: /^( {2,}|\\)\n(?!\s*$)/,
- del: noopTest,
+ del: noopTest$1,
text: /^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\?@\\[\\]`^{|}~';
- inline$1.punctuation = edit(inline$1.punctuation).replace(/punctuation/g, inline$1._punctuation).getRegex(); // sequences em should skip over [title](link), `code`,
-
- inline$1.blockSkip = /\[[^\]]*?\]\([^\)]*?\)|`[^`]*?`|<[^>]*?>/g;
- inline$1.escapedEmSt = /\\\*|\\_/g;
- inline$1._comment = edit(block$1._comment).replace('(?:-->|$)', '-->').getRegex();
- inline$1.emStrong.lDelim = edit(inline$1.emStrong.lDelim).replace(/punct/g, inline$1._punctuation).getRegex();
- inline$1.emStrong.rDelimAst = edit(inline$1.emStrong.rDelimAst, 'g').replace(/punct/g, inline$1._punctuation).getRegex();
- inline$1.emStrong.rDelimUnd = edit(inline$1.emStrong.rDelimUnd, 'g').replace(/punct/g, inline$1._punctuation).getRegex();
- inline$1._escapes = /\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g;
- inline$1._scheme = /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/;
- inline$1._email = /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/;
- inline$1.autolink = edit(inline$1.autolink).replace('scheme', inline$1._scheme).replace('email', inline$1._email).getRegex();
- inline$1._attribute = /\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/;
- inline$1.tag = edit(inline$1.tag).replace('comment', inline$1._comment).replace('attribute', inline$1._attribute).getRegex();
- inline$1._label = /(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/;
- inline$1._href = /<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/;
- inline$1._title = /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/;
- inline$1.link = edit(inline$1.link).replace('label', inline$1._label).replace('href', inline$1._href).replace('title', inline$1._title).getRegex();
- inline$1.reflink = edit(inline$1.reflink).replace('label', inline$1._label).getRegex();
- inline$1.reflinkSearch = edit(inline$1.reflinkSearch, 'g').replace('reflink', inline$1.reflink).replace('nolink', inline$1.nolink).getRegex();
+ inline._punctuation = '!"#$%&\'()+\\-.,/:;<=>?@\\[\\]`^{|}~';
+ inline.punctuation = edit$1(inline.punctuation).replace(/punctuation/g, inline._punctuation).getRegex(); // sequences em should skip over [title](link), `code`,
+
+ inline.blockSkip = /\[[^\]]*?\]\([^\)]*?\)|`[^`]*?`|<[^>]*?>/g;
+ inline.escapedEmSt = /\\\*|\\_/g;
+ inline._comment = edit$1(block._comment).replace('(?:-->|$)', '-->').getRegex();
+ inline.emStrong.lDelim = edit$1(inline.emStrong.lDelim).replace(/punct/g, inline._punctuation).getRegex();
+ inline.emStrong.rDelimAst = edit$1(inline.emStrong.rDelimAst, 'g').replace(/punct/g, inline._punctuation).getRegex();
+ inline.emStrong.rDelimUnd = edit$1(inline.emStrong.rDelimUnd, 'g').replace(/punct/g, inline._punctuation).getRegex();
+ inline._escapes = /\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g;
+ inline._scheme = /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/;
+ inline._email = /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/;
+ inline.autolink = edit$1(inline.autolink).replace('scheme', inline._scheme).replace('email', inline._email).getRegex();
+ inline._attribute = /\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/;
+ inline.tag = edit$1(inline.tag).replace('comment', inline._comment).replace('attribute', inline._attribute).getRegex();
+ inline._label = /(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/;
+ inline._href = /<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/;
+ inline._title = /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/;
+ inline.link = edit$1(inline.link).replace('label', inline._label).replace('href', inline._href).replace('title', inline._title).getRegex();
+ inline.reflink = edit$1(inline.reflink).replace('label', inline._label).getRegex();
+ inline.reflinkSearch = edit$1(inline.reflinkSearch, 'g').replace('reflink', inline.reflink).replace('nolink', inline.nolink).getRegex();
/**
* Normal Inline Grammar
*/
- inline$1.normal = merge$1({}, inline$1);
+ inline.normal = merge$1({}, inline);
/**
* Pedantic Inline Grammar
*/
- inline$1.pedantic = merge$1({}, inline$1.normal, {
+ inline.pedantic = merge$1({}, inline.normal, {
strong: {
start: /^__|\*\*/,
middle: /^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,
@@ -1315,40 +1368,39 @@
endAst: /\*(?!\*)/g,
endUnd: /_(?!_)/g
},
- link: edit(/^!?\[(label)\]\((.*?)\)/).replace('label', inline$1._label).getRegex(),
- reflink: edit(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace('label', inline$1._label).getRegex()
+ link: edit$1(/^!?\[(label)\]\((.*?)\)/).replace('label', inline._label).getRegex(),
+ reflink: edit$1(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace('label', inline._label).getRegex()
});
/**
* GFM Inline Grammar
*/
- inline$1.gfm = merge$1({}, inline$1.normal, {
- escape: edit(inline$1.escape).replace('])', '~|])').getRegex(),
+ inline.gfm = merge$1({}, inline.normal, {
+ escape: edit$1(inline.escape).replace('])', '~|])').getRegex(),
_extended_email: /[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/,
url: /^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,
_backpedal: /(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,
del: /^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,
text: /^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\= 0) {
startIndex = Math.min(startIndex, tempStart);
@@ -1622,12 +1678,14 @@
})();
}
- if (top && (token = this.tokenizer.paragraph(cutSrc))) {
+ if (this.state.top && (token = this.tokenizer.paragraph(cutSrc))) {
lastToken = tokens[tokens.length - 1];
if (lastParagraphClipped && lastToken.type === 'paragraph') {
lastToken.raw += '\n' + token.raw;
lastToken.text += '\n' + token.text;
+ this.inlineQueue.pop();
+ this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
} else {
tokens.push(token);
}
@@ -1645,6 +1703,8 @@
if (lastToken && lastToken.type === 'text') {
lastToken.raw += '\n' + token.raw;
lastToken.text += '\n' + token.text;
+ this.inlineQueue.pop();
+ this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
} else {
tokens.push(token);
}
@@ -1664,97 +1724,28 @@
}
}
+ this.state.top = true;
return tokens;
};
- _proto.inline = function inline(tokens) {
- var i, j, k, l2, row, token;
- var l = tokens.length;
-
- for (i = 0; i < l; i++) {
- token = tokens[i];
-
- switch (token.type) {
- case 'paragraph':
- case 'text':
- case 'heading':
- {
- token.tokens = [];
- this.inlineTokens(token.text, token.tokens);
- break;
- }
-
- case 'table':
- {
- token.tokens = {
- header: [],
- cells: []
- }; // header
-
- l2 = token.header.length;
-
- for (j = 0; j < l2; j++) {
- token.tokens.header[j] = [];
- this.inlineTokens(token.header[j], token.tokens.header[j]);
- } // cells
-
-
- l2 = token.cells.length;
-
- for (j = 0; j < l2; j++) {
- row = token.cells[j];
- token.tokens.cells[j] = [];
-
- for (k = 0; k < row.length; k++) {
- token.tokens.cells[j][k] = [];
- this.inlineTokens(row[k], token.tokens.cells[j][k]);
- }
- }
-
- break;
- }
-
- case 'blockquote':
- {
- this.inline(token.tokens);
- break;
- }
-
- case 'list':
- {
- l2 = token.items.length;
-
- for (j = 0; j < l2; j++) {
- this.inline(token.items[j].tokens);
- }
-
- break;
- }
- }
- }
-
- return tokens;
+ _proto.inline = function inline(src, tokens) {
+ this.inlineQueue.push({
+ src: src,
+ tokens: tokens
+ });
}
/**
* Lexing/Compiling
*/
;
- _proto.inlineTokens = function inlineTokens(src, tokens, inLink, inRawBlock) {
+ _proto.inlineTokens = function inlineTokens(src, tokens) {
var _this2 = this;
if (tokens === void 0) {
tokens = [];
}
- if (inLink === void 0) {
- inLink = false;
- }
-
- if (inRawBlock === void 0) {
- inRawBlock = false;
- }
-
var token, lastToken, cutSrc; // String with links masked to avoid interference with em and strong
var maskedSrc = src;
@@ -1767,7 +1758,7 @@
if (links.length > 0) {
while ((match = this.tokenizer.rules.inline.reflinkSearch.exec(maskedSrc)) != null) {
if (links.includes(match[0].slice(match[0].lastIndexOf('[') + 1, -1))) {
- maskedSrc = maskedSrc.slice(0, match.index) + '[' + repeatString('a', match[0].length - 2) + ']' + maskedSrc.slice(this.tokenizer.rules.inline.reflinkSearch.lastIndex);
+ maskedSrc = maskedSrc.slice(0, match.index) + '[' + repeatString$1('a', match[0].length - 2) + ']' + maskedSrc.slice(this.tokenizer.rules.inline.reflinkSearch.lastIndex);
}
}
}
@@ -1775,7 +1766,7 @@
while ((match = this.tokenizer.rules.inline.blockSkip.exec(maskedSrc)) != null) {
- maskedSrc = maskedSrc.slice(0, match.index) + '[' + repeatString('a', match[0].length - 2) + ']' + maskedSrc.slice(this.tokenizer.rules.inline.blockSkip.lastIndex);
+ maskedSrc = maskedSrc.slice(0, match.index) + '[' + repeatString$1('a', match[0].length - 2) + ']' + maskedSrc.slice(this.tokenizer.rules.inline.blockSkip.lastIndex);
} // Mask out escaped em & strong delimiters
@@ -1791,7 +1782,9 @@
keepPrevChar = false; // extensions
if (this.options.extensions && this.options.extensions.inline && this.options.extensions.inline.some(function (extTokenizer) {
- if (token = extTokenizer.call(_this2, src, tokens)) {
+ if (token = extTokenizer.call({
+ lexer: _this2
+ }, src, tokens)) {
src = src.substring(token.raw.length);
tokens.push(token);
return true;
@@ -1810,10 +1803,8 @@
} // tag
- if (token = this.tokenizer.tag(src, inLink, inRawBlock)) {
+ if (token = this.tokenizer.tag(src)) {
src = src.substring(token.raw.length);
- inLink = token.inLink;
- inRawBlock = token.inRawBlock;
lastToken = tokens[tokens.length - 1];
if (lastToken && token.type === 'text' && lastToken.type === 'text') {
@@ -1829,11 +1820,6 @@
if (token = this.tokenizer.link(src)) {
src = src.substring(token.raw.length);
-
- if (token.type === 'link') {
- token.tokens = this.inlineTokens(token.text, [], true, inRawBlock);
- }
-
tokens.push(token);
continue;
} // reflink, nolink
@@ -1843,10 +1829,7 @@
src = src.substring(token.raw.length);
lastToken = tokens[tokens.length - 1];
- if (token.type === 'link') {
- token.tokens = this.inlineTokens(token.text, [], true, inRawBlock);
- tokens.push(token);
- } else if (lastToken && token.type === 'text' && lastToken.type === 'text') {
+ if (lastToken && token.type === 'text' && lastToken.type === 'text') {
lastToken.raw += token.raw;
lastToken.text += token.text;
} else {
@@ -1859,7 +1842,6 @@
if (token = this.tokenizer.emStrong(src, maskedSrc, prevChar)) {
src = src.substring(token.raw.length);
- token.tokens = this.inlineTokens(token.text, [], inLink, inRawBlock);
tokens.push(token);
continue;
} // code
@@ -1881,7 +1863,6 @@
if (token = this.tokenizer.del(src)) {
src = src.substring(token.raw.length);
- token.tokens = this.inlineTokens(token.text, [], inLink, inRawBlock);
tokens.push(token);
continue;
} // autolink
@@ -1894,7 +1875,7 @@
} // url (gfm)
- if (!inLink && (token = this.tokenizer.url(src, mangle))) {
+ if (!this.state.inLink && (token = this.tokenizer.url(src, mangle))) {
src = src.substring(token.raw.length);
tokens.push(token);
continue;
@@ -1911,7 +1892,9 @@
var tempStart = void 0;
_this2.options.extensions.startInline.forEach(function (getStartIndex) {
- tempStart = getStartIndex.call(this, tempSrc);
+ tempStart = getStartIndex.call({
+ lexer: this
+ }, tempSrc);
if (typeof tempStart === 'number' && tempStart >= 0) {
startIndex = Math.min(startIndex, tempStart);
@@ -1924,7 +1907,7 @@
})();
}
- if (token = this.tokenizer.inlineText(cutSrc, inRawBlock, smartypants)) {
+ if (token = this.tokenizer.inlineText(cutSrc, smartypants)) {
src = src.substring(token.raw.length);
if (token.raw.slice(-1) !== '_') {
@@ -1964,8 +1947,8 @@
key: "rules",
get: function get() {
return {
- block: block,
- inline: inline
+ block: block$1,
+ inline: inline$1
};
}
}]);
@@ -1973,8 +1956,8 @@
return Lexer;
}();
- var defaults$2 = defaults$5.exports.defaults;
- var cleanUrl = helpers.cleanUrl,
+ var defaults$3 = defaults.defaults;
+ var cleanUrl$1 = helpers.cleanUrl,
escape$1 = helpers.escape;
/**
* Renderer
@@ -1982,7 +1965,7 @@
var Renderer_1 = /*#__PURE__*/function () {
function Renderer(options) {
- this.options = options || defaults$2;
+ this.options = options || defaults$3;
}
var _proto = Renderer.prototype;
@@ -2084,7 +2067,7 @@
};
_proto.link = function link(href, title, text) {
- href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
+ href = cleanUrl$1(this.options.sanitize, this.options.baseUrl, href);
if (href === null) {
return text;
@@ -2101,7 +2084,7 @@
};
_proto.image = function image(href, title, text) {
- href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
+ href = cleanUrl$1(this.options.sanitize, this.options.baseUrl, href);
if (href === null) {
return text;
@@ -2128,7 +2111,6 @@
* TextRenderer
* returns only the textual part of the token
*/
-
var TextRenderer_1 = /*#__PURE__*/function () {
function TextRenderer() {}
@@ -2177,7 +2159,6 @@
/**
* Slugger generates header id
*/
-
var Slugger_1 = /*#__PURE__*/function () {
function Slugger() {
this.seen = {};
@@ -2234,23 +2215,20 @@
return Slugger;
}();
- var Renderer$1 = Renderer_1;
- var TextRenderer$1 = TextRenderer_1;
- var Slugger$1 = Slugger_1;
- var defaults$1 = defaults$5.exports.defaults;
- var unescape = helpers.unescape;
+ var defaults$4 = defaults.defaults;
+ var unescape$1 = helpers.unescape;
/**
* Parsing & Compiling
*/
var Parser_1 = /*#__PURE__*/function () {
function Parser(options) {
- this.options = options || defaults$1;
- this.options.renderer = this.options.renderer || new Renderer$1();
+ this.options = options || defaults$4;
+ this.options.renderer = this.options.renderer || new Renderer_1();
this.renderer = this.options.renderer;
this.renderer.options = this.options;
- this.textRenderer = new TextRenderer$1();
- this.slugger = new Slugger$1();
+ this.textRenderer = new TextRenderer_1();
+ this.slugger = new Slugger_1();
}
/**
* Static Parse Method
@@ -2308,7 +2286,9 @@
token = tokens[i]; // Run any renderer extensions
if (this.options.extensions && this.options.extensions.renderers && this.options.extensions.renderers[token.type]) {
- ret = this.options.extensions.renderers[token.type].call(this, token);
+ ret = this.options.extensions.renderers[token.type].call({
+ parser: this
+ }, token);
if (ret !== false || !['space', 'hr', 'heading', 'code', 'table', 'blockquote', 'list', 'html', 'paragraph', 'text'].includes(token.type)) {
out += ret || '';
@@ -2330,7 +2310,7 @@
case 'heading':
{
- out += this.renderer.heading(this.parseInline(token.tokens), token.depth, unescape(this.parseInline(token.tokens, this.textRenderer)), this.slugger);
+ out += this.renderer.heading(this.parseInline(token.tokens), token.depth, unescape$1(this.parseInline(token.tokens, this.textRenderer)), this.slugger);
continue;
}
@@ -2402,7 +2382,7 @@
checkbox = this.renderer.checkbox(checked);
if (loose) {
- if (item.tokens.length > 0 && item.tokens[0].type === 'text') {
+ if (item.tokens.length > 0 && item.tokens[0].type === 'paragraph') {
item.tokens[0].text = checkbox + ' ' + item.tokens[0].text;
if (item.tokens[0].tokens && item.tokens[0].tokens.length > 0 && item.tokens[0].tokens[0].type === 'text') {
@@ -2486,7 +2466,9 @@
token = tokens[i]; // Run any renderer extensions
if (this.options.extensions && this.options.extensions.renderers && this.options.extensions.renderers[token.type]) {
- ret = this.options.extensions.renderers[token.type].call(this, token);
+ ret = this.options.extensions.renderers[token.type].call({
+ parser: this
+ }, token);
if (ret !== false || !['escape', 'html', 'link', 'image', 'strong', 'em', 'codespan', 'br', 'del', 'text'].includes(token.type)) {
out += ret || '';
@@ -2575,18 +2557,12 @@
return Parser;
}();
- var Lexer = Lexer_1;
- var Parser = Parser_1;
- var Tokenizer = Tokenizer_1;
- var Renderer = Renderer_1;
- var TextRenderer = TextRenderer_1;
- var Slugger = Slugger_1;
- var merge = helpers.merge,
- checkSanitizeDeprecation = helpers.checkSanitizeDeprecation,
- escape = helpers.escape;
- var getDefaults = defaults$5.exports.getDefaults,
- changeDefaults = defaults$5.exports.changeDefaults,
- defaults = defaults$5.exports.defaults;
+ var merge$2 = helpers.merge,
+ checkSanitizeDeprecation$1 = helpers.checkSanitizeDeprecation,
+ escape$2 = helpers.escape;
+ var getDefaults = defaults.getDefaults,
+ changeDefaults = defaults.changeDefaults,
+ defaults$5 = defaults.defaults;
/**
* Marked
*/
@@ -2606,15 +2582,15 @@
opt = null;
}
- opt = merge({}, marked.defaults, opt || {});
- checkSanitizeDeprecation(opt);
+ opt = merge$2({}, marked.defaults, opt || {});
+ checkSanitizeDeprecation$1(opt);
if (callback) {
var highlight = opt.highlight;
var tokens;
try {
- tokens = Lexer.lex(src, opt);
+ tokens = Lexer_1.lex(src, opt);
} catch (e) {
return callback(e);
}
@@ -2628,7 +2604,7 @@
marked.walkTokens(tokens, opt.walkTokens);
}
- out = Parser.parse(tokens, opt);
+ out = Parser_1.parse(tokens, opt);
} catch (e) {
err = e;
}
@@ -2677,18 +2653,18 @@
}
try {
- var _tokens = Lexer.lex(src, opt);
+ var _tokens = Lexer_1.lex(src, opt);
if (opt.walkTokens) {
marked.walkTokens(_tokens, opt.walkTokens);
}
- return Parser.parse(_tokens, opt);
+ return Parser_1.parse(_tokens, opt);
} catch (e) {
e.message += '\nPlease report this to https://github.com/markedjs/marked.';
if (opt.silent) {
- return 'An error occurred:
' + escape(e.message + '', true) + '
';
+ return 'An error occurred:
' + escape$2(e.message + '', true) + '
';
}
throw e;
@@ -2700,13 +2676,13 @@
marked.options = marked.setOptions = function (opt) {
- merge(marked.defaults, opt);
+ merge$2(marked.defaults, opt);
changeDefaults(marked.defaults);
return marked;
};
marked.getDefaults = getDefaults;
- marked.defaults = defaults;
+ marked.defaults = defaults$5;
/**
* Use Extension
*/
@@ -2718,7 +2694,7 @@
args[_key] = arguments[_key];
}
- var opts = merge.apply(void 0, [{}].concat(args));
+ var opts = merge$2.apply(void 0, [{}].concat(args));
var extensions = marked.defaults.extensions || {
renderers: {},
childTokens: {}
@@ -2797,7 +2773,7 @@
if (pack.renderer) {
(function () {
- var renderer = marked.defaults.renderer || new Renderer();
+ var renderer = marked.defaults.renderer || new Renderer_1();
var _loop = function _loop(prop) {
var prevRenderer = renderer[prop]; // Replace renderer with func to run extension, but fall back if false
@@ -2827,7 +2803,7 @@
if (pack.tokenizer) {
(function () {
- var tokenizer = marked.defaults.tokenizer || new Tokenizer();
+ var tokenizer = marked.defaults.tokenizer || new Tokenizer_1();
var _loop2 = function _loop2(prop) {
var prevTokenizer = tokenizer[prop]; // Replace tokenizer with func to run extension, but fall back if false
@@ -2944,22 +2920,22 @@
throw new Error('marked.parseInline(): input parameter is of type ' + Object.prototype.toString.call(src) + ', string expected');
}
- opt = merge({}, marked.defaults, opt || {});
- checkSanitizeDeprecation(opt);
+ opt = merge$2({}, marked.defaults, opt || {});
+ checkSanitizeDeprecation$1(opt);
try {
- var tokens = Lexer.lexInline(src, opt);
+ var tokens = Lexer_1.lexInline(src, opt);
if (opt.walkTokens) {
marked.walkTokens(tokens, opt.walkTokens);
}
- return Parser.parseInline(tokens, opt);
+ return Parser_1.parseInline(tokens, opt);
} catch (e) {
e.message += '\nPlease report this to https://github.com/markedjs/marked.';
if (opt.silent) {
- return 'An error occurred:
' + escape(e.message + '', true) + '
';
+ return 'An error occurred:
' + escape$2(e.message + '', true) + '
';
}
throw e;
@@ -2970,14 +2946,14 @@
*/
- marked.Parser = Parser;
- marked.parser = Parser.parse;
- marked.Renderer = Renderer;
- marked.TextRenderer = TextRenderer;
- marked.Lexer = Lexer;
- marked.lexer = Lexer.lex;
- marked.Tokenizer = Tokenizer;
- marked.Slugger = Slugger;
+ marked.Parser = Parser_1;
+ marked.parser = Parser_1.parse;
+ marked.Renderer = Renderer_1;
+ marked.TextRenderer = TextRenderer_1;
+ marked.Lexer = Lexer_1;
+ marked.lexer = Lexer_1.lex;
+ marked.Tokenizer = Tokenizer_1;
+ marked.Slugger = Slugger_1;
marked.parse = marked;
var marked_1 = marked;
diff --git a/src/Lexer.js b/src/Lexer.js
index c1d8b03cb4..d34aa47bc0 100644
--- a/src/Lexer.js
+++ b/src/Lexer.js
@@ -163,10 +163,9 @@ module.exports = class Lexer {
src = src.substring(token.raw.length);
lastToken = tokens[tokens.length - 1];
// An indented code block cannot interrupt a paragraph.
- if (lastToken && lastToken.type === 'paragraph') {
+ if (lastToken && (lastToken.type === 'paragraph' || lastToken.type === 'text')) {
lastToken.raw += '\n' + token.raw;
lastToken.text += '\n' + token.text;
- this.inlineQueue.pop();
this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
} else {
tokens.push(token);
@@ -217,9 +216,14 @@ module.exports = class Lexer {
}
// def
- if (this.state.top && (token = this.tokenizer.def(src))) {
+ if (token = this.tokenizer.def(src)) {
src = src.substring(token.raw.length);
- if (!this.tokens.links[token.tag]) {
+ lastToken = tokens[tokens.length - 1];
+ if (lastToken && (lastToken.type === 'paragraph' || lastToken.type === 'text')) {
+ lastToken.raw += '\n' + token.raw;
+ lastToken.text += '\n' + token.raw;
+ this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+ } else if (!this.tokens.links[token.tag]) {
this.tokens.links[token.tag] = {
href: token.href,
title: token.title
diff --git a/src/Parser.js b/src/Parser.js
index e804c143c4..ef5009aea8 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -149,7 +149,7 @@ module.exports = class Parser {
if (item.task) {
checkbox = this.renderer.checkbox(checked);
if (loose) {
- if (item.tokens.length > 0 && item.tokens[0].type === 'text') {
+ if (item.tokens.length > 0 && item.tokens[0].type === 'paragraph') {
item.tokens[0].text = checkbox + ' ' + item.tokens[0].text;
if (item.tokens[0].tokens && item.tokens[0].tokens.length > 0 && item.tokens[0].tokens[0].type === 'text') {
item.tokens[0].tokens[0].text = checkbox + ' ' + item.tokens[0].tokens[0].text;
diff --git a/src/Tokenizer.js b/src/Tokenizer.js
index 922452e7be..85bdb33675 100644
--- a/src/Tokenizer.js
+++ b/src/Tokenizer.js
@@ -164,145 +164,149 @@ module.exports = class Tokenizer {
}
list(src) {
- const cap = this.rules.block.list.exec(src);
+ let cap = this.rules.block.list.exec(src);
if (cap) {
- let raw = cap[0];
- const bull = cap[2];
+ let raw, istask, ischecked, indent, i, blankLine, endsWithBlankLine,
+ line, lines, itemContents;
+
+ let bull = cap[1].trim();
const isordered = bull.length > 1;
const list = {
type: 'list',
- raw,
+ raw: '',
ordered: isordered,
start: isordered ? +bull.slice(0, -1) : '',
loose: false,
items: []
};
- // Get each top-level item.
- const itemMatch = cap[0].match(this.rules.block.item);
-
- let next = false,
- item,
- space,
- bcurr,
- bnext,
- addBack,
- loose,
- istask,
- ischecked,
- endMatch;
-
- let l = itemMatch.length;
- bcurr = this.rules.block.listItemStart.exec(itemMatch[0]);
- for (let i = 0; i < l; i++) {
- item = itemMatch[i];
- raw = item;
-
- if (!this.options.pedantic) {
- // Determine if current item contains the end of the list
- endMatch = item.match(new RegExp('\\n\\s*\\n {0,' + (bcurr[0].length - 1) + '}\\S'));
- if (endMatch) {
- addBack = item.length - endMatch.index + itemMatch.slice(i + 1).join('\n').length;
- list.raw = list.raw.substring(0, list.raw.length - addBack);
-
- item = item.substring(0, endMatch.index);
- raw = item;
- l = i + 1;
- }
+ bull = isordered ? `\\d{1,9}\\${bull.slice(-1)}` : `\\${bull}`;
+
+ if (this.options.pedantic) {
+ bull = isordered ? bull : '[*+-]';
+ }
+
+ // Get next list item
+ const itemRegex = new RegExp(`^( {0,3}${bull})((?: [^\\n]*| *)(?:\\n[^\\n]*)*(?:\\n|$))`);
+
+ // Get each top-level item
+ while (src) {
+ if (this.rules.block.hr.test(src)) { // End list if we encounter an HR (possibly move into itemRegex?)
+ break;
}
- // Determine whether the next list item belongs here.
- // Backpedal if it does not belong in this list.
- if (i !== l - 1) {
- bnext = this.rules.block.listItemStart.exec(itemMatch[i + 1]);
- if (
- !this.options.pedantic
- ? bnext[1].length >= bcurr[0].length || bnext[1].length > 3
- : bnext[1].length > bcurr[1].length
- ) {
- // nested list or continuation
- itemMatch.splice(i, 2, itemMatch[i] + (!this.options.pedantic && bnext[1].length < bcurr[0].length && !itemMatch[i].match(/\n$/) ? '' : '\n') + itemMatch[i + 1]);
- i--;
- l--;
- continue;
- } else if (
- // different bullet style
- !this.options.pedantic || this.options.smartLists
- ? bnext[2][bnext[2].length - 1] !== bull[bull.length - 1]
- : isordered === (bnext[2].length === 1)
- ) {
- addBack = itemMatch.slice(i + 1).join('\n').length;
- list.raw = list.raw.substring(0, list.raw.length - addBack);
- i = l - 1;
- }
- bcurr = bnext;
+ if (!(cap = itemRegex.exec(src))) {
+ break;
}
- // Remove the list item's bullet
- // so it is seen as the next token.
- space = item.length;
- item = item.replace(/^ *([*+-]|\d+[.)]) ?/, '');
-
- // Outdent whatever the
- // list item contains. Hacky.
- if (~item.indexOf('\n ')) {
- space -= item.length;
- item = !this.options.pedantic
- ? item.replace(new RegExp('^ {1,' + space + '}', 'gm'), '')
- : item.replace(/^ {1,4}/gm, '');
+ lines = cap[2].split('\n');
+
+ if (this.options.pedantic) {
+ indent = 2;
+ itemContents = lines[0].trimLeft();
+ } else {
+ indent = cap[2].search(/[^ ]/); // Find first non-space char
+ indent = cap[1].length + (indent > 4 ? 1 : indent); // intented code blocks after 4 spaces; indent is always 1
+ itemContents = lines[0].slice(indent - cap[1].length);
}
- // trim item newlines at end
- item = rtrim(item, '\n');
- if (i !== l - 1) {
- raw = raw + '\n';
+ blankLine = false;
+ raw = cap[0];
+
+ if (!lines[0] && /^ *$/.test(lines[1])) { // items begin with at most one blank line
+ raw = cap[1] + lines.slice(0, 2).join('\n') + '\n';
+ list.loose = true;
+ lines = [];
}
- // Determine whether item is loose or not.
- // Use: /(^|\n)(?! )[^\n]+\n\n(?!\s*$)/
- // for discount behavior.
- loose = next || /\n\n(?!\s*$)/.test(raw);
- if (i !== l - 1) {
- next = raw.slice(-2) === '\n\n';
- if (!loose) loose = next;
+ const nextBulletRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:[*+-]|\\d{1,9}[.)])`);
+
+ for (i = 1; i < lines.length; i++) {
+ line = lines[i];
+
+ if (this.options.pedantic) { // Re-align to follow commonmark nesting rules
+ line = line.replace(/^ {1,4}(?=( {4})*[^ ])/g, ' ');
+ }
+
+ // End list item if found start of new bullet
+ if (nextBulletRegex.test(line)) {
+ raw = cap[1] + lines.slice(0, i).join('\n') + '\n';
+ break;
+ }
+
+ // Until we encounter a blank line, item contents do not need indentation
+ if (!blankLine) {
+ if (!line.trim()) { // Check if current line is empty
+ blankLine = true;
+ }
+
+ // Dedent if possible
+ if (line.search(/[^ ]/) >= indent) {
+ itemContents += '\n' + line.slice(indent);
+ } else {
+ itemContents += '\n' + line;
+ }
+ continue;
+ }
+
+ // Dedent this line
+ if (line.search(/[^ ]/) >= indent || !line.trim()) {
+ itemContents += '\n' + line.slice(indent);
+ continue;
+ } else { // Line was not properly indented; end of this item
+ raw = cap[1] + lines.slice(0, i).join('\n') + '\n';
+ break;
+ }
}
- if (loose) {
- list.loose = true;
+ if (!list.loose) {
+ // If the previous item ended with a blank line, the list is loose
+ if (endsWithBlankLine) {
+ list.loose = true;
+ } else if (/\n *\n *$/.test(raw)) {
+ endsWithBlankLine = true;
+ }
}
// Check for task list items
if (this.options.gfm) {
- istask = /^\[[ xX]\] /.test(item);
- ischecked = undefined;
+ istask = /^\[[ xX]\] /.exec(itemContents);
if (istask) {
- ischecked = item[1] !== ' ';
- item = item.replace(/^\[[ xX]\] +/, '');
+ ischecked = istask[0] !== '[ ] ';
+ itemContents = itemContents.replace(/^\[[ xX]\] +/, '');
}
}
- this.lexer.state.top = false;
-
- const token = {
+ list.items.push({
type: 'list_item',
- raw,
- task: istask,
+ raw: raw,
+ task: !!istask,
checked: ischecked,
- loose: loose,
- text: item,
- tokens: this.lexer.blockTokens(item, [])
- };
+ loose: false,
+ text: itemContents
+ });
- // this.lexer.inline(token.text, )
- list.items.push(token);
+ list.raw += raw;
+ src = src.slice(raw.length);
}
- // l2 = token.items.length;
- // for (j = 0; j < l2; j++) {
- // this.inline(token.items[j].tokens);
- // }
- // break;
+ // Do not consume newlines at end of final item. Alternatively, make itemRegex *start* with any newlines to simplify/speed up endsWithBlankLine logic
+ list.items[list.items.length - 1].raw = raw.trimRight();
+ list.items[list.items.length - 1].text = itemContents.trimRight();
+ list.raw = list.raw.trimRight();
+
+ const l = list.items.length;
+
+ // Item child tokens handled here at end because we needed to have the final item to trim it first
+ for (i = 0; i < l; i++) {
+ this.lexer.state.top = false;
+ list.items[i].tokens = this.lexer.blockTokens(list.items[i].text, []);
+ if (list.items[i].tokens.some(t => t.type === 'space')) {
+ list.loose = true;
+ list.items[i].loose = true;
+ }
+ }
return list;
}
diff --git a/src/rules.js b/src/rules.js
index 13961f2251..39fa8e56c4 100644
--- a/src/rules.js
+++ b/src/rules.js
@@ -10,11 +10,11 @@ const {
const block = {
newline: /^(?: *(?:\n|$))+/,
code: /^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/,
- fences: /^ {0,3}(`{3,}(?=[^`\n]*\n)|~{3,})([^\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/,
+ fences: /^ {0,3}(`{3,}(?=[^`\n]*\n)|~{3,})([^\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?=\n|$)|$)/,
hr: /^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,
heading: /^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/,
blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
- list: /^( {0,3})(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?! {0,3}bull )\n*|\s*$)/,
+ list: /^( {0,3}bull)( [^\n]+?)?(?:\n|$)/,
html: '^ {0,3}(?:' // optional indentation
+ '<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:[^\\n]*\\n+|$)' // (1)
+ '|comment[^\\n]*(\\n+|$)' // (2)
@@ -42,11 +42,6 @@ block.def = edit(block.def)
.getRegex();
block.bullet = /(?:[*+-]|\d{1,9}[.)])/;
-block.item = /^( *)(bull) ?[^\n]*(?:\n(?! *bull ?)[^\n]*)*/;
-block.item = edit(block.item, 'gm')
- .replace(/bull/g, block.bullet)
- .getRegex();
-
block.listItemStart = edit(/^( *)(bull) */)
.replace('bull', block.bullet)
.getRegex();
diff --git a/test/specs/commonmark/commonmark.0.30.json b/test/specs/commonmark/commonmark.0.30.json
index 18a49682bd..62a0dfe076 100644
--- a/test/specs/commonmark/commonmark.0.30.json
+++ b/test/specs/commonmark/commonmark.0.30.json
@@ -2107,8 +2107,7 @@
"example": 262,
"start_line": 4314,
"end_line": 4326,
- "section": "List items",
- "shouldFail": true
+ "section": "List items"
},
{
"markdown": "1. foo\n\n ```\n bar\n ```\n\n baz\n\n > bam\n",
@@ -2124,8 +2123,7 @@
"example": 264,
"start_line": 4359,
"end_line": 4377,
- "section": "List items",
- "shouldFail": true
+ "section": "List items"
},
{
"markdown": "123456789. ok\n",
@@ -2197,8 +2195,7 @@
"example": 273,
"start_line": 4493,
"end_line": 4509,
- "section": "List items",
- "shouldFail": true
+ "section": "List items"
},
{
"markdown": "1. indented code\n\n paragraph\n\n more code\n",
@@ -2206,8 +2203,7 @@
"example": 274,
"start_line": 4515,
"end_line": 4531,
- "section": "List items",
- "shouldFail": true
+ "section": "List items"
},
{
"markdown": " foo\n\nbar\n",
@@ -2239,8 +2235,7 @@
"example": 278,
"start_line": 4596,
"end_line": 4617,
- "section": "List items",
- "shouldFail": true
+ "section": "List items"
},
{
"markdown": "- \n foo\n",
@@ -2256,8 +2251,7 @@
"example": 280,
"start_line": 4636,
"end_line": 4645,
- "section": "List items",
- "shouldFail": true
+ "section": "List items"
},
{
"markdown": "- foo\n-\n- bar\n",
@@ -2289,8 +2283,7 @@
"example": 284,
"start_line": 4695,
"end_line": 4701,
- "section": "List items",
- "shouldFail": true
+ "section": "List items"
},
{
"markdown": "foo\n*\n\nfoo\n1.\n",
@@ -2466,8 +2459,7 @@
"example": 306,
"start_line": 5388,
"end_line": 5407,
- "section": "Lists",
- "shouldFail": true
+ "section": "Lists"
},
{
"markdown": "- foo\n - bar\n - baz\n\n\n bim\n",
@@ -2475,8 +2467,7 @@
"example": 307,
"start_line": 5409,
"end_line": 5431,
- "section": "Lists",
- "shouldFail": true
+ "section": "Lists"
},
{
"markdown": "- foo\n- bar\n\n\n\n- baz\n- bim\n",
@@ -2556,8 +2547,7 @@
"example": 317,
"start_line": 5645,
"end_line": 5663,
- "section": "Lists",
- "shouldFail": true
+ "section": "Lists"
},
{
"markdown": "- a\n- ```\n b\n\n\n ```\n- c\n",
@@ -2565,8 +2555,7 @@
"example": 318,
"start_line": 5668,
"end_line": 5687,
- "section": "Lists",
- "shouldFail": true
+ "section": "Lists"
},
{
"markdown": "- a\n - b\n\n c\n- d\n",
@@ -2574,8 +2563,7 @@
"example": 319,
"start_line": 5694,
"end_line": 5712,
- "section": "Lists",
- "shouldFail": true
+ "section": "Lists"
},
{
"markdown": "* a\n > b\n >\n* c\n",
diff --git a/test/specs/gfm/commonmark.0.30.json b/test/specs/gfm/commonmark.0.30.json
index 1b01311866..e32558a3a3 100644
--- a/test/specs/gfm/commonmark.0.30.json
+++ b/test/specs/gfm/commonmark.0.30.json
@@ -2107,8 +2107,7 @@
"example": 262,
"start_line": 4314,
"end_line": 4326,
- "section": "List items",
- "shouldFail": true
+ "section": "List items"
},
{
"markdown": "1. foo\n\n ```\n bar\n ```\n\n baz\n\n > bam\n",
@@ -2124,8 +2123,7 @@
"example": 264,
"start_line": 4359,
"end_line": 4377,
- "section": "List items",
- "shouldFail": true
+ "section": "List items"
},
{
"markdown": "123456789. ok\n",
@@ -2197,8 +2195,7 @@
"example": 273,
"start_line": 4493,
"end_line": 4509,
- "section": "List items",
- "shouldFail": true
+ "section": "List items"
},
{
"markdown": "1. indented code\n\n paragraph\n\n more code\n",
@@ -2206,8 +2203,7 @@
"example": 274,
"start_line": 4515,
"end_line": 4531,
- "section": "List items",
- "shouldFail": true
+ "section": "List items"
},
{
"markdown": " foo\n\nbar\n",
@@ -2239,8 +2235,7 @@
"example": 278,
"start_line": 4596,
"end_line": 4617,
- "section": "List items",
- "shouldFail": true
+ "section": "List items"
},
{
"markdown": "- \n foo\n",
@@ -2256,8 +2251,7 @@
"example": 280,
"start_line": 4636,
"end_line": 4645,
- "section": "List items",
- "shouldFail": true
+ "section": "List items"
},
{
"markdown": "- foo\n-\n- bar\n",
@@ -2289,8 +2283,7 @@
"example": 284,
"start_line": 4695,
"end_line": 4701,
- "section": "List items",
- "shouldFail": true
+ "section": "List items"
},
{
"markdown": "foo\n*\n\nfoo\n1.\n",
@@ -2466,8 +2459,7 @@
"example": 306,
"start_line": 5388,
"end_line": 5407,
- "section": "Lists",
- "shouldFail": true
+ "section": "Lists"
},
{
"markdown": "- foo\n - bar\n - baz\n\n\n bim\n",
@@ -2475,8 +2467,7 @@
"example": 307,
"start_line": 5409,
"end_line": 5431,
- "section": "Lists",
- "shouldFail": true
+ "section": "Lists"
},
{
"markdown": "- foo\n- bar\n\n\n\n- baz\n- bim\n",
@@ -2556,8 +2547,7 @@
"example": 317,
"start_line": 5645,
"end_line": 5663,
- "section": "Lists",
- "shouldFail": true
+ "section": "Lists"
},
{
"markdown": "- a\n- ```\n b\n\n\n ```\n- c\n",
@@ -2565,8 +2555,7 @@
"example": 318,
"start_line": 5668,
"end_line": 5687,
- "section": "Lists",
- "shouldFail": true
+ "section": "Lists"
},
{
"markdown": "- a\n - b\n\n c\n- d\n",
@@ -2574,8 +2563,7 @@
"example": 319,
"start_line": 5694,
"end_line": 5712,
- "section": "Lists",
- "shouldFail": true
+ "section": "Lists"
},
{
"markdown": "* a\n > b\n >\n* c\n",
diff --git a/test/specs/new/def_blocks.html b/test/specs/new/def_blocks.html
index 5d8de49c04..23207da91e 100644
--- a/test/specs/new/def_blocks.html
+++ b/test/specs/new/def_blocks.html
@@ -12,13 +12,14 @@
-
-
-
-- hello
+-
+
hello
+
+
+-
+
hello
+[4]: hello
+
diff --git a/test/specs/new/list_paren_delimiter.html b/test/specs/new/list_paren_delimiter.html
index 4999ee3efa..ba8ecf36dd 100644
--- a/test/specs/new/list_paren_delimiter.html
+++ b/test/specs/new/list_paren_delimiter.html
@@ -1,11 +1,13 @@
- - one
- - two
- - three
+- one
+- two
+- three
-
+
+
+
- - two
- - three
- - four
-
\ No newline at end of file
+two
+three
+four
+
diff --git a/test/specs/new/list_paren_delimiter.md b/test/specs/new/list_paren_delimiter.md
index d7ff7f3aeb..2443a64a85 100644
--- a/test/specs/new/list_paren_delimiter.md
+++ b/test/specs/new/list_paren_delimiter.md
@@ -2,6 +2,7 @@
2) two
3) three
+***
2) two
3) three
diff --git a/test/specs/new/main.html b/test/specs/new/main.html
deleted file mode 100644
index 8f78c4d30e..0000000000
--- a/test/specs/new/main.html
+++ /dev/null
@@ -1,4 +0,0 @@
-A heading
Just a note, I've found that I can't test my markdown parser vs others. For example, both markdown.js and showdown code blocks in lists wrong. They're also completely inconsistent with regards to paragraphs in list items.
A link. Not anymore.
Paragraph.
- bq Item 1
- bq Item 2
- New bq Item 1
- New bq Item 2 Text here
Another blockquote! I really need to get more creative with mockup text.. markdown.js breaks here again
Another Heading
Hello world. Here is a link. And an image 
.
Code goes here.
-Lots of it...
diff --git a/test/specs/new/main.md b/test/specs/new/main.md
deleted file mode 100644
index 58e17a6a76..0000000000
--- a/test/specs/new/main.md
+++ /dev/null
@@ -1,55 +0,0 @@
-[test]: http://google.com/ "Google"
-
-# A heading
-
-Just a note, I've found that I can't test my markdown parser vs others.
-For example, both markdown.js and showdown code blocks in lists wrong. They're
-also completely [inconsistent][test] with regards to paragraphs in list items.
-
-A link. Not anymore.
-
-
-
-* List Item 1
-
-* List Item 2
- * New List Item 1
- Hi, this is a list item.
- * New List Item 2
- Another item
- Code goes here.
- Lots of it...
- * New List Item 3
- The last item
-
-* List Item 3
-The final item.
-
-* List Item 4
-The real final item.
-
-Paragraph.
-
-> * bq Item 1
-> * bq Item 2
-> * New bq Item 1
-> * New bq Item 2
-> Text here
-
-* * *
-
-> Another blockquote!
-> I really need to get
-> more creative with
-> mockup text..
-> markdown.js breaks here again
-
-Another Heading
--------------
-
-Hello *world*. Here is a [link](//hello).
-And an image .
-
- Code goes here.
- Lots of it...
diff --git a/test/unit/Lexer-spec.js b/test/unit/Lexer-spec.js
index f94cd6e70d..af3f5781b1 100644
--- a/test/unit/Lexer-spec.js
+++ b/test/unit/Lexer-spec.js
@@ -295,7 +295,7 @@ a | b
tokens: [
{
type: 'list',
- raw: '- item 1\n- item 2\n',
+ raw: '- item 1\n- item 2',
ordered: false,
start: '',
loose: false,
@@ -316,7 +316,7 @@ a | b
},
{
type: 'list_item',
- raw: '- item 2\n',
+ raw: '- item 2',
task: false,
checked: undefined,
loose: false,
@@ -343,7 +343,7 @@ a | b
tokens: jasmine.arrayContaining([
jasmine.objectContaining({
type: 'list',
- raw: '1. item 1\n2. item 2\n',
+ raw: '1. item 1\n2. item 2',
ordered: true,
start: 1,
items: [
@@ -351,7 +351,7 @@ a | b
raw: '1. item 1\n'
}),
jasmine.objectContaining({
- raw: '2. item 2\n'
+ raw: '2. item 2'
})
]
})
@@ -368,7 +368,7 @@ a | b
tokens: jasmine.arrayContaining([
jasmine.objectContaining({
type: 'list',
- raw: '1) item 1\n2) item 2\n',
+ raw: '1) item 1\n2) item 2',
ordered: true,
start: 1,
items: [
@@ -376,7 +376,7 @@ a | b
raw: '1) item 1\n'
}),
jasmine.objectContaining({
- raw: '2) item 2\n'
+ raw: '2) item 2'
})
]
})
@@ -395,7 +395,7 @@ paragraph
tokens: [
{
type: 'list',
- raw: '- item 1\n- item 2\n\n',
+ raw: '- item 1\n- item 2',
ordered: false,
start: '',
loose: false,
@@ -416,7 +416,7 @@ paragraph
},
{
type: 'list_item',
- raw: '- item 2\n\n',
+ raw: '- item 2',
task: false,
checked: undefined,
loose: false,
@@ -430,6 +430,7 @@ paragraph
}
]
},
+ { type: 'space', raw: '\n\n' },
{
type: 'paragraph',
raw: 'paragraph',
@@ -453,7 +454,7 @@ paragraph
tokens: jasmine.arrayContaining([
jasmine.objectContaining({
type: 'list',
- raw: '2. item 1\n3. item 2\n',
+ raw: '2. item 1\n3. item 2',
ordered: true,
start: 2,
items: [
@@ -461,7 +462,7 @@ paragraph
raw: '2. item 1\n'
}),
jasmine.objectContaining({
- raw: '3. item 2\n'
+ raw: '3. item 2'
})
]
})
@@ -479,14 +480,14 @@ paragraph
tokens: jasmine.arrayContaining([
jasmine.objectContaining({
type: 'list',
- raw: '- item 1\n\n- item 2\n',
+ raw: '- item 1\n\n- item 2',
loose: true,
items: [
jasmine.objectContaining({
raw: '- item 1\n\n'
}),
jasmine.objectContaining({
- raw: '- item 2\n'
+ raw: '- item 2'
})
]
})
@@ -503,7 +504,7 @@ paragraph
tokens: jasmine.arrayContaining([
jasmine.objectContaining({
type: 'list',
- raw: '- [ ] item 1\n- [x] item 2\n',
+ raw: '- [ ] item 1\n- [x] item 2',
items: [
jasmine.objectContaining({
raw: '- [ ] item 1\n',
@@ -511,7 +512,7 @@ paragraph
checked: false
}),
jasmine.objectContaining({
- raw: '- [x] item 2\n',
+ raw: '- [x] item 2',
task: true,
checked: true
})
diff --git a/test/unit/marked-spec.js b/test/unit/marked-spec.js
index 6b67a8fe61..79fa151520 100644
--- a/test/unit/marked-spec.js
+++ b/test/unit/marked-spec.js
@@ -1001,6 +1001,7 @@ br
['heading', '# heading'],
['text', 'heading'],
['code', '```code```'],
+ ['space', ''],
['table', '| a | b ||---|---|| 1 | 2 || 3 | 4 |'],
['text', 'a'],
['text', 'b'],
@@ -1015,6 +1016,7 @@ br
['list_item', '- list'],
['text', 'list'],
['text', 'list'],
+ ['space', ''],
['html', 'html
'],
['paragraph', '[link](https://example.com)'],
['link', '[link](https://example.com)'],