Skip to content

Commit fceda57

Browse files
author
MarkedJS bot
committed
🗜️ build [skip ci]
1 parent 8f80657 commit fceda57

File tree

4 files changed

+22
-15
lines changed

4 files changed

+22
-15
lines changed

‎lib/marked.cjs

+6-5
Original file line numberDiff line numberDiff line change
@@ -1199,15 +1199,15 @@ var block = {
11991199
+ '|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) open tag
12001200
+ '|</(?!script|pre|style|textarea)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) closing tag
12011201
+ ')',
1202-
def: /^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,
1202+
def: /^ {0,3}\[(label)\]: *(?:\n *)?<?([^\s>]+)>?(?:(?: +(?:\n *)?| *\n *)(title))? *(?:\n+|$)/,
12031203
table: noopTest,
12041204
lheading: /^([^\n]+)\n {0,3}(=+|-+) *(?:\n+|$)/,
12051205
// regex template, placeholders will be replaced according to different paragraph
12061206
// interruption rules of commonmark and the original markdown spec:
12071207
_paragraph: /^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/,
12081208
text: /^[^\n]+/
12091209
};
1210-
block._label = /(?!\s*\])(?:\\[\[\]]|[^\[\]])+/;
1210+
block._label = /(?!\s*\])(?:\\.|[^\[\]\\])+/;
12111211
block._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/;
12121212
block.def = edit(block.def).replace('label', block._label).replace('title', block._title).getRegex();
12131213
block.bullet = /(?:[*+-]|\d{1,9}[.)])/;
@@ -1272,8 +1272,8 @@ var inline = {
12721272
+ '|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>',
12731273
// CDATA section
12741274
link: /^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/,
1275-
reflink: /^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,
1276-
nolink: /^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,
1275+
reflink: /^!?\[(label)\]\[(ref)\]/,
1276+
nolink: /^!?\[(ref)\](?:\[\])?/,
12771277
reflinkSearch: 'reflink|nolink(?!\\()',
12781278
emStrong: {
12791279
lDelim: /^(?:\*+(?:([punct_])|[^\s*]))|^_+(?:([punct*])|([^\s_]))/,
@@ -1310,7 +1310,8 @@ inline._label = /(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/;
13101310
inline._href = /<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/;
13111311
inline._title = /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/;
13121312
inline.link = edit(inline.link).replace('label', inline._label).replace('href', inline._href).replace('title', inline._title).getRegex();
1313-
inline.reflink = edit(inline.reflink).replace('label', inline._label).getRegex();
1313+
inline.reflink = edit(inline.reflink).replace('label', inline._label).replace('ref', block._label).getRegex();
1314+
inline.nolink = edit(inline.nolink).replace('ref', block._label).getRegex();
13141315
inline.reflinkSearch = edit(inline.reflinkSearch, 'g').replace('reflink', inline.reflink).replace('nolink', inline.nolink).getRegex();
13151316
/**
13161317
* Normal Inline Grammar

‎lib/marked.esm.js

+9-4
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ const block = {
10711071
+ '|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) open tag
10721072
+ '|</(?!script|pre|style|textarea)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) closing tag
10731073
+ ')',
1074-
def: /^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,
1074+
def: /^ {0,3}\[(label)\]: *(?:\n *)?<?([^\s>]+)>?(?:(?: +(?:\n *)?| *\n *)(title))? *(?:\n+|$)/,
10751075
table: noopTest,
10761076
lheading: /^([^\n]+)\n {0,3}(=+|-+) *(?:\n+|$)/,
10771077
// regex template, placeholders will be replaced according to different paragraph
@@ -1080,7 +1080,7 @@ const block = {
10801080
text: /^[^\n]+/
10811081
};
10821082

1083-
block._label = /(?!\s*\])(?:\\[\[\]]|[^\[\]])+/;
1083+
block._label = /(?!\s*\])(?:\\.|[^\[\]\\])+/;
10841084
block._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/;
10851085
block.def = edit(block.def)
10861086
.replace('label', block._label)
@@ -1208,8 +1208,8 @@ const inline = {
12081208
+ '|^<![a-zA-Z]+\\s[\\s\\S]*?>' // declaration, e.g. <!DOCTYPE html>
12091209
+ '|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>', // CDATA section
12101210
link: /^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/,
1211-
reflink: /^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,
1212-
nolink: /^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,
1211+
reflink: /^!?\[(label)\]\[(ref)\]/,
1212+
nolink: /^!?\[(ref)\](?:\[\])?/,
12131213
reflinkSearch: 'reflink|nolink(?!\\()',
12141214
emStrong: {
12151215
lDelim: /^(?:\*+(?:([punct_])|[^\s*]))|^_+(?:([punct*])|([^\s_]))/,
@@ -1276,6 +1276,11 @@ inline.link = edit(inline.link)
12761276

12771277
inline.reflink = edit(inline.reflink)
12781278
.replace('label', inline._label)
1279+
.replace('ref', block._label)
1280+
.getRegex();
1281+
1282+
inline.nolink = edit(inline.nolink)
1283+
.replace('ref', block._label)
12791284
.getRegex();
12801285

12811286
inline.reflinkSearch = edit(inline.reflinkSearch, 'g')

‎lib/marked.umd.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -1201,15 +1201,15 @@
12011201
+ '|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) open tag
12021202
+ '|</(?!script|pre|style|textarea)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) closing tag
12031203
+ ')',
1204-
def: /^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,
1204+
def: /^ {0,3}\[(label)\]: *(?:\n *)?<?([^\s>]+)>?(?:(?: +(?:\n *)?| *\n *)(title))? *(?:\n+|$)/,
12051205
table: noopTest,
12061206
lheading: /^([^\n]+)\n {0,3}(=+|-+) *(?:\n+|$)/,
12071207
// regex template, placeholders will be replaced according to different paragraph
12081208
// interruption rules of commonmark and the original markdown spec:
12091209
_paragraph: /^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/,
12101210
text: /^[^\n]+/
12111211
};
1212-
block._label = /(?!\s*\])(?:\\[\[\]]|[^\[\]])+/;
1212+
block._label = /(?!\s*\])(?:\\.|[^\[\]\\])+/;
12131213
block._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/;
12141214
block.def = edit(block.def).replace('label', block._label).replace('title', block._title).getRegex();
12151215
block.bullet = /(?:[*+-]|\d{1,9}[.)])/;
@@ -1274,8 +1274,8 @@
12741274
+ '|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>',
12751275
// CDATA section
12761276
link: /^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/,
1277-
reflink: /^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,
1278-
nolink: /^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,
1277+
reflink: /^!?\[(label)\]\[(ref)\]/,
1278+
nolink: /^!?\[(ref)\](?:\[\])?/,
12791279
reflinkSearch: 'reflink|nolink(?!\\()',
12801280
emStrong: {
12811281
lDelim: /^(?:\*+(?:([punct_])|[^\s*]))|^_+(?:([punct*])|([^\s_]))/,
@@ -1312,7 +1312,8 @@
13121312
inline._href = /<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/;
13131313
inline._title = /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/;
13141314
inline.link = edit(inline.link).replace('label', inline._label).replace('href', inline._href).replace('title', inline._title).getRegex();
1315-
inline.reflink = edit(inline.reflink).replace('label', inline._label).getRegex();
1315+
inline.reflink = edit(inline.reflink).replace('label', inline._label).replace('ref', block._label).getRegex();
1316+
inline.nolink = edit(inline.nolink).replace('ref', block._label).getRegex();
13161317
inline.reflinkSearch = edit(inline.reflinkSearch, 'g').replace('reflink', inline.reflink).replace('nolink', inline.nolink).getRegex();
13171318
/**
13181319
* Normal Inline Grammar

‎marked.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)