GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70916
Change subject: Refine wikitext escaping for template parameters
......................................................................
Refine wikitext escaping for template parameters
Take into account the position of the string token within the parameter token
array, and escape generic [{}] less aggressively in the middle of a parameter.
Fixes
node roundtrip-test.js --prefix zh 'HUNTER×HUNTER角色列表'
Change-Id: If1d1775225647e17db93c460144af2650d801648
---
M js/lib/mediawiki.WikitextSerializer.js
1 file changed, 18 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/16/70916/1
diff --git a/js/lib/mediawiki.WikitextSerializer.js
b/js/lib/mediawiki.WikitextSerializer.js
index 4511da9..8fdef8f 100644
--- a/js/lib/mediawiki.WikitextSerializer.js
+++ b/js/lib/mediawiki.WikitextSerializer.js
@@ -767,24 +767,20 @@
* the entire DOM range they span in the end.
*/
WSP.escapeTplArgWT = function(state, arg, isPositional) {
- function escapeStr(str, buf) {
- if (isPositional) {
- // Can't allow '=' in positional parameters
- if (str.match(/[\{\[\]\}\|\=]/)) {
- buf.push("<nowiki>");
- buf.push(str);
- buf.push("</nowiki>");
- } else {
- buf.push(str);
- }
+ function escapeStr(str, buf, pos) {
+ var genericMatch =
+ pos.start && /^{/.test(str) ||
+ pos.end && /}$/.test(str) ||
+ /{{|}}|[[\[\]\|]/.test(str);
+ if (genericMatch ||
+ // Can't allow '=' in positional parameters
+ (isPositional && /[=]/.test(str)))
+ {
+ buf.push("<nowiki>");
+ buf.push(str);
+ buf.push("</nowiki>");
} else {
- if (str.match(/[\{\[\]\}\|]/)) {
- buf.push("<nowiki>");
- buf.push(str);
- buf.push("</nowiki>");
- } else {
- buf.push(str);
- }
+ buf.push(str);
}
}
@@ -820,7 +816,11 @@
break;
case String:
- escapeStr(t, buf);
+ var pos = {
+ atStart: i === 0,
+ atEnd: i === tokens.length - 1
+ };
+ escapeStr(t, buf, pos);
break;
case pd.EOFTk:
--
To view, visit https://gerrit.wikimedia.org/r/70916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1d1775225647e17db93c460144af2650d801648
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
