From db10b123df4838ba8159d304e284560d55110fd5 Mon Sep 17 00:00:00 2001 From: bhsd <2545473905@qq.com> Date: Fri, 17 May 2024 19:53:37 +0800 Subject: [PATCH] fix(MediaWiki): `endGround` --- src/mediawiki.ts | 17 +- test/parserTests.json | 1040 +++++++++++++++-------------------------- 2 files changed, 386 insertions(+), 671 deletions(-) diff --git a/src/mediawiki.ts b/src/mediawiki.ts index 0162c26..8199c09 100644 --- a/src/mediawiki.ts +++ b/src/mediawiki.ts @@ -570,7 +570,7 @@ export class MediaWiki { return ''; } const isCloseTag = Boolean(stream.eat('/')), - mt = stream.match(/^[a-z][^\s/>]*(?=[\s/>]|$)/iu, false) as RegExpMatchArray | false; + mt = stream.match(/^[a-z][^\s/>]*/iu, false) as RegExpMatchArray | false; if (mt) { const tagname = mt[0].toLowerCase(); if (tagname in this.config.tags) { @@ -760,9 +760,8 @@ export class MediaWiki { const regex = new RegExp(`^(?:${getUrlRegex()})+`, 'u'); return (stream, state) => { if (stream.sol() || stream.match(/^\p{Zs}*\]/u)) { - state.nExtLink--; pop(state); - return this.makeLocalTagStyle('extLinkBracket', state); + return this.makeLocalTagStyle('extLinkBracket', state, 'nExtLink'); } else if (text) { return stream.match(/^(?:[^'[\]{&<]|\[(?!\[)|\{(?!\{)|'(?!')|<(?![!/a-z]))+/iu) ? this.makeTagStyle('extLinkText', state) @@ -791,11 +790,10 @@ export class MediaWiki { let lt: number | undefined; return (stream, state) => { if (stream.sol() || lt && stream.pos > lt || stream.match(/^\s*\]\]/u)) { - state.nLink--; state.redirect = false; state.lbrack = false; pop(state); - return this.makeLocalTagStyle('linkBracket', state); + return this.makeLocalTagStyle('linkBracket', state, 'nLink'); } lt = undefined; const space = stream.eatSpace(), @@ -840,14 +838,15 @@ export class MediaWiki { ? new RegExp(`^(?:[^'\\]{&<~|[]|'(?!')|\\](?!\\])|\\{(?!\\{)|<(?![!/a-z])|~~?(?!~)|\\[(?!${ this.config.urlProtocols }|\\[))+`, 'iu') - : /^(?:[^'\]{&<]|'(?!')|\](?!\])|\{(?!\{)|<(?![!/a-z]))+/iu; + : /^(?:[^'\]{&<[]|'(?!')|\](?!\])|\{(?!\{)|<(?![!/a-z])|\[(?!\[))+/iu; return (stream, state) => { const tmpstyle = `${tokens.linkText} ${linkState.bold ? tokens.strong : ''} ${ linkState.italic ? tokens.em : '' } ${file ? 'mw-file-text' : ''}`, - {redirect, lbrack} = state; - if (stream.match(']]')) { - if (!redirect && lbrack && stream.peek() === ']') { + {redirect, lbrack} = state, + closing = stream.match(']]'); + if (closing || !file && stream.match('[[', false)) { + if (closing && !redirect && lbrack && stream.peek() === ']') { stream.backUp(1); state.lbrack = false; return this.makeStyle(tmpstyle, state); diff --git a/test/parserTests.json b/test/parserTests.json index 483734b..648190c 100644 --- a/test/parserTests.json +++ b/test/parserTests.json @@ -372,7 +372,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "=", @@ -414,7 +414,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -3172,7 +3172,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": " : ", @@ -4812,7 +4812,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -4845,11 +4845,7 @@ "name": "link-ground apostrophes" }, { - "text": "]", - "name": "extlink-bracket" - }, - { - "text": "[", + "text": "][", "name": "link-ground extlink-bracket" }, { @@ -4874,7 +4870,7 @@ }, { "text": "]", - "name": "extlink-bracket" + "name": "link-ground extlink-bracket" }, { "text": "'''''", @@ -4906,7 +4902,7 @@ }, { "text": "]", - "name": "extlink-bracket" + "name": "link-ground extlink-bracket" }, { "text": "''", @@ -4942,7 +4938,7 @@ }, { "text": "]", - "name": "extlink-bracket" + "name": "link-ground extlink-bracket" }, { "text": "''''''''", @@ -4974,7 +4970,7 @@ }, { "text": "]", - "name": "extlink-bracket" + "name": "link-ground extlink-bracket" } ] }, @@ -5050,7 +5046,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5068,7 +5064,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5260,7 +5256,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5282,7 +5278,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5304,7 +5300,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5326,7 +5322,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5348,7 +5344,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": ", xxx", @@ -5364,7 +5360,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": ", Xxx", @@ -5380,7 +5376,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": " XXX", @@ -5396,7 +5392,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": ", XXX", @@ -5412,7 +5408,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5430,7 +5426,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "xxx, ", @@ -5446,7 +5442,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "XXX, ", @@ -5462,7 +5458,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "!!!", @@ -5542,7 +5538,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": """, @@ -5562,7 +5558,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "a", @@ -5598,7 +5594,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "]]", @@ -5718,7 +5714,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5736,7 +5732,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": ", ", @@ -5752,7 +5748,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5770,7 +5766,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5788,7 +5784,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5836,7 +5832,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5853,11 +5849,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -5892,7 +5884,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5909,11 +5901,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -5922,7 +5910,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5939,11 +5927,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -5952,7 +5936,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -5969,11 +5953,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -5982,7 +5962,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -6000,7 +5980,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -6017,11 +5997,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -6029,11 +6005,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -6042,7 +6014,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -6060,7 +6032,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -6078,7 +6050,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -6096,7 +6068,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -6221,11 +6193,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -6233,11 +6201,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -6304,7 +6268,7 @@ }, { "text": "]", - "name": "extlink-bracket" + "name": "link-ground extlink-bracket" }, { "text": "]", @@ -6338,7 +6302,7 @@ }, { "text": "]", - "name": "extlink-bracket" + "name": "link-ground extlink-bracket" }, { "text": "]", @@ -6372,7 +6336,7 @@ }, { "text": "]", - "name": "extlink-bracket" + "name": "link-ground extlink-bracket" }, { "text": "]", @@ -6402,7 +6366,7 @@ }, { "text": "]", - "name": "extlink-bracket" + "name": "link-ground extlink-bracket" }, { "text": "]", @@ -6436,7 +6400,7 @@ }, { "text": "]", - "name": "extlink-bracket" + "name": "link-ground extlink-bracket" }, { "text": "]", @@ -6457,11 +6421,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -6508,7 +6468,7 @@ }, { "text": "]", - "name": "extlink-bracket" + "name": "link-ground extlink-bracket" }, { "text": "]", @@ -6550,7 +6510,7 @@ }, { "text": "]", - "name": "extlink-bracket" + "name": "link-ground extlink-bracket" }, { "text": "]", @@ -6592,7 +6552,7 @@ }, { "text": "]", - "name": "template-ground extlink-bracket" + "name": "template-link-ground extlink-bracket" }, { "text": "}}{{", @@ -6628,7 +6588,7 @@ }, { "text": "]", - "name": "template-ground extlink-bracket" + "name": "template-link-ground extlink-bracket" }, { "text": "]", @@ -6668,7 +6628,7 @@ }, { "text": "]", - "name": "template-ground extlink-bracket" + "name": "template-link-ground extlink-bracket" }, { "text": "}}{{", @@ -6700,7 +6660,7 @@ }, { "text": "]", - "name": "template-ground extlink-bracket" + "name": "template-link-ground extlink-bracket" }, { "text": "]", @@ -6756,7 +6716,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": " ", @@ -6772,7 +6732,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -6794,7 +6754,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -6816,7 +6776,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -6834,7 +6794,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -6852,7 +6812,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -7058,7 +7018,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -7170,7 +7130,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -7260,7 +7220,7 @@ }, { "text": "]]", - "name": "template-ground link-bracket" + "name": "template-link-ground link-bracket" }, { "text": "}}", @@ -7292,7 +7252,7 @@ }, { "text": "]]", - "name": "template-ground link-bracket" + "name": "template-link-ground link-bracket" }, { "text": "l", @@ -7320,7 +7280,7 @@ }, { "text": "]]", - "name": "template-ground link-bracket" + "name": "template-link-ground link-bracket" }, { "text": "l", @@ -7356,7 +7316,7 @@ }, { "text": "]]", - "name": "template-ground link-bracket" + "name": "template-link-ground link-bracket" }, { "text": "<", @@ -7416,7 +7376,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "l", @@ -7454,7 +7414,7 @@ }, { "text": "]]", - "name": "template-ground link-bracket" + "name": "template-link-ground link-bracket" }, { "text": "}}", @@ -7496,7 +7456,7 @@ }, { "text": "]]", - "name": "template-ground link-bracket" + "name": "template-link-ground link-bracket" }, { "text": "s are ", @@ -7585,11 +7545,7 @@ "name": "link-ground extlink-text" }, { - "text": "]", - "name": "extlink-bracket" - }, - { - "text": "[", + "text": "][", "name": "link-ground extlink-bracket" }, { @@ -7618,7 +7574,7 @@ }, { "text": "]", - "name": "extlink-bracket" + "name": "link-ground extlink-bracket" } ] }, @@ -7640,7 +7596,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -7662,7 +7618,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -7683,15 +7639,19 @@ "name": "link-ground link-delimiter" }, { - "text": "[[Ho]", - "name": "link-ground link-text" + "text": "[[", + "name": "link-ground link-bracket" + }, + { + "text": "Ho", + "name": "link-ground link-pagename pagename" }, { "text": "]]", "name": "link-ground link-bracket" }, { - "text": "]", + "text": "]]", "name": "" } ] @@ -7709,11 +7669,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -7722,7 +7678,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -11871,11 +11827,7 @@ "name": "template-link-ground template-bracket" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -11916,7 +11868,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "Page", @@ -12104,7 +12056,7 @@ }, { "text": "]]", - "name": "template2-ground link-bracket" + "name": "template2-link-ground link-bracket" }, { "text": "}}", @@ -13670,7 +13622,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": " and ", @@ -14745,11 +14697,7 @@ "name": "template-link-ground template-bracket" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -14781,11 +14729,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -14849,11 +14793,7 @@ "name": "template-link-ground template-bracket" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -14964,7 +14904,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -16766,7 +16706,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "<", @@ -16845,11 +16785,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -16858,7 +16794,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "<", @@ -17928,7 +17864,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -17946,7 +17882,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -17963,11 +17899,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -17975,11 +17907,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -17988,7 +17916,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -18069,11 +17997,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18089,11 +18013,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18109,11 +18029,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18121,11 +18037,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18133,11 +18045,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18145,11 +18053,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18173,11 +18077,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18305,11 +18205,7 @@ "name": "template-link-ground template-bracket" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18333,11 +18229,7 @@ "name": "template-link-ground template-bracket" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18361,11 +18253,7 @@ "name": "template-link-ground template-bracket" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18389,11 +18277,7 @@ "name": "template-link-ground template-bracket" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18417,11 +18301,7 @@ "name": "template-link-ground template-bracket" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18445,11 +18325,7 @@ "name": "template-link-ground template-bracket" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18473,11 +18349,7 @@ "name": "template-link-ground template-bracket" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18502,7 +18374,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -18520,7 +18392,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -18555,11 +18427,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18568,7 +18436,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -18604,7 +18472,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -18622,7 +18490,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -18640,7 +18508,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -18658,7 +18526,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -18834,7 +18702,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": " BarFoo ", @@ -18850,7 +18718,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "BarFoo", @@ -18866,7 +18734,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "BarFoo", @@ -18882,7 +18750,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": " BarFoo", @@ -18898,7 +18766,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": " ", @@ -18913,11 +18781,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18926,7 +18790,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "Bar", @@ -18942,7 +18806,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": " ", @@ -18957,11 +18821,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18969,11 +18829,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[", + "text": "]][[", "name": "link-ground link-bracket" }, { @@ -18982,7 +18838,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": " ", @@ -19010,7 +18866,7 @@ }, { "text": "]]", - "name": "template-ground link-bracket" + "name": "template-link-ground link-bracket" }, { "text": "}}", @@ -19026,7 +18882,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -19056,7 +18912,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": " and this should be part of same paragraph (not an indent-pre)", @@ -19092,7 +18948,7 @@ }, { "text": "]]", - "name": "template-ground link-bracket" + "name": "template-link-ground link-bracket" }, { "text": " and so should this!", @@ -19134,7 +18990,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": " and this should be part of the same list item", @@ -19170,7 +19026,7 @@ }, { "text": "]]", - "name": "template-ground link-bracket" + "name": "template-link-ground link-bracket" }, { "text": " and this should be part of the same list item", @@ -19196,7 +19052,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "<", @@ -19224,7 +19080,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "", @@ -45587,7 +45335,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -46817,7 +46565,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -46835,7 +46583,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -46852,11 +46600,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[File:", + "text": "]][[File:", "name": "link-ground link-bracket" }, { @@ -47024,15 +46768,19 @@ "name": "link-ground link-delimiter" }, { - "text": "[[File:Foobar.jpg]", - "name": "link-ground link-text" + "text": "[[File:", + "name": "link-ground link-bracket" + }, + { + "text": "Foobar.jpg", + "name": "link-ground link-pagename pagename" }, { "text": "]]", "name": "link-ground link-bracket" }, { - "text": "]", + "text": "]]", "name": "" } ] @@ -47153,7 +46901,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -47179,7 +46927,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -47197,7 +46945,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -47215,7 +46963,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -47619,7 +47367,7 @@ }, { "text": "]]", - "name": "tag-gallery link-bracket" + "name": "tag-gallery link-ground link-bracket" }, { "text": "File:Foobar.jpgFile:Redirect to foobar.jpg", @@ -48112,11 +47860,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[File:", + "text": "]][[File:", "name": "link-ground link-bracket" }, { @@ -48300,11 +48044,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[File:", + "text": "]][[File:", "name": "link-ground link-bracket" }, { @@ -48722,11 +48462,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[File:", + "text": "]][[File:", "name": "link-ground link-bracket" }, { @@ -48799,7 +48535,7 @@ }, { "text": "]]", - "name": "tag-gallery link-bracket" + "name": "tag-gallery link-ground link-bracket" }, { "text": "", @@ -54565,7 +54297,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -55823,7 +55555,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -55887,7 +55619,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -55904,11 +55636,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[File:", + "text": "]][[File:", "name": "link-ground link-bracket" }, { @@ -56076,15 +55804,19 @@ "name": "link-ground link-delimiter" }, { - "text": "[[File:Foobar.jpg]", - "name": "link-ground link-text" + "text": "[[File:", + "name": "link-ground link-bracket" + }, + { + "text": "Foobar.jpg", + "name": "link-ground link-pagename pagename" }, { "text": "]]", "name": "link-ground link-bracket" }, { - "text": "]", + "text": "]]", "name": "" } ] @@ -56205,7 +55937,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -56231,7 +55963,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -56249,7 +55981,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -56267,7 +55999,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" } ] }, @@ -56733,7 +56465,7 @@ }, { "text": "]]", - "name": "tag-gallery link-bracket" + "name": "tag-gallery link-ground link-bracket" }, { "text": "File:Foobar.jpgFile:Redirect to foobar.jpg", @@ -57226,11 +56958,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[File:", + "text": "]][[File:", "name": "link-ground link-bracket" }, { @@ -57530,11 +57258,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[File:", + "text": "]][[File:", "name": "link-ground link-bracket" }, { @@ -58022,11 +57746,7 @@ "name": "link-ground link-pagename pagename" }, { - "text": "]]", - "name": "link-bracket" - }, - { - "text": "[[File:", + "text": "]][[File:", "name": "link-ground link-bracket" }, { @@ -58099,7 +57819,7 @@ }, { "text": "]]", - "name": "tag-gallery link-bracket" + "name": "tag-gallery link-ground link-bracket" }, { "text": "", @@ -63342,7 +63058,7 @@ }, { "text": "]]", - "name": "link-bracket" + "name": "link-ground link-bracket" }, { "text": "----", @@ -64823,7 +64539,7 @@ }, { "text": "]", - "name": "extlink-bracket" + "name": "link-ground extlink-bracket" }, { "text": "\" onmouseover=\"alert(document.cookie)\">test",