diff options
author | Lauri Ojansivu <x@xet7.org> | 2020-03-14 12:03:34 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2020-03-14 12:03:34 +0200 |
commit | 6e0fa78022ea487176eb0a32ec5a4a441f8e0c3c (patch) | |
tree | 8c8aeb11ceea98e632bbf4d460f1101df60ca1ce /packages/markdown/marked/lib/marked.esm.js | |
parent | 06fb201d808e08280fd56b686c6f8a7f8e09e561 (diff) | |
download | wekan-6e0fa78022ea487176eb0a32ec5a4a441f8e0c3c.tar.gz wekan-6e0fa78022ea487176eb0a32ec5a4a441f8e0c3c.tar.bz2 wekan-6e0fa78022ea487176eb0a32ec5a4a441f8e0c3c.zip |
Update markdown.
Diffstat (limited to 'packages/markdown/marked/lib/marked.esm.js')
-rw-r--r-- | packages/markdown/marked/lib/marked.esm.js | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/packages/markdown/marked/lib/marked.esm.js b/packages/markdown/marked/lib/marked.esm.js index 36672909..8a42d378 100644 --- a/packages/markdown/marked/lib/marked.esm.js +++ b/packages/markdown/marked/lib/marked.esm.js @@ -364,7 +364,7 @@ block.html = edit$1(block.html, 'i') block.paragraph = edit$1(block._paragraph) .replace('hr', block.hr) - .replace('heading', ' {0,3}#{1,6} +') + .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') @@ -389,9 +389,23 @@ block.normal = merge$1({}, block); block.gfm = merge$1({}, block.normal, { nptable: /^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/, - table: /^ *\|(.+)\n *\|?( *[-:]+[-| :]*)(?:\n((?: *[^>\n ].*(?:\n|$))*)\n*|$)/ + table: '^ *\\|(.+)\\n' // Header + + ' *\\|?( *[-:]+[-| :]*)' // Align + + '(?:\\n((?:(?!^|>|\\n| |hr|heading|lheading|code|fences|list|html).*(?:\\n|$))*)\\n*|$)' // Cells }); +block.gfm.table = edit$1(block.gfm.table) + .replace('hr', block.hr) + .replace('heading', ' {0,3}#{1,6} ') + .replace('lheading', '([^\\n]+)\\n {0,3}(=+|-+) *(?:\\n+|$)') + .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', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|!--)') + .replace('tag', block._tag) // pars can be interrupted by type (6) html blocks + .getRegex(); + /** * Pedantic grammar (original John Gruber's loose markdown specification) */ |