mirror of
https://github.com/wekan/wekan.git
synced 2025-12-19 08:50:13 +01:00
Update markdown.
This commit is contained in:
parent
06fb201d80
commit
6e0fa78022
3 changed files with 27 additions and 7 deletions
|
|
@ -364,7 +364,7 @@ block.html = edit$1(block.html, 'i')
|
||||||
|
|
||||||
block.paragraph = edit$1(block._paragraph)
|
block.paragraph = edit$1(block._paragraph)
|
||||||
.replace('hr', block.hr)
|
.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('|lheading', '') // setex headings don't interrupt commonmark paragraphs
|
||||||
.replace('blockquote', ' {0,3}>')
|
.replace('blockquote', ' {0,3}>')
|
||||||
.replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
|
.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, {
|
block.gfm = merge$1({}, block.normal, {
|
||||||
nptable: /^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,
|
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)
|
* Pedantic grammar (original John Gruber's loose markdown specification)
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -386,7 +386,7 @@
|
||||||
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._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 = /<!--(?!-?>)[\s\S]*?-->/;
|
block._comment = /<!--(?!-?>)[\s\S]*?-->/;
|
||||||
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.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
|
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('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', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|!--)').replace('tag', block._tag) // pars can be interrupted by type (6) html blocks
|
.replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|!--)').replace('tag', block._tag) // pars can be interrupted by type (6) html blocks
|
||||||
.getRegex();
|
.getRegex();
|
||||||
|
|
@ -402,8 +402,14 @@
|
||||||
|
|
||||||
block.gfm = merge$1({}, block.normal, {
|
block.gfm = merge$1({}, block.normal, {
|
||||||
nptable: /^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,
|
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)
|
* Pedantic grammar (original John Gruber's loose markdown specification)
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
6
packages/markdown/marked/package-lock.json
generated
6
packages/markdown/marked/package-lock.json
generated
|
|
@ -1195,9 +1195,9 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"acorn": {
|
"acorn": {
|
||||||
"version": "7.1.0",
|
"version": "7.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
|
||||||
"integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
|
"integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"acorn-jsx": {
|
"acorn-jsx": {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue