Arlolra has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/328612 )
Change subject: Suppress breaking on tableCellArg in block tags too
......................................................................
Suppress breaking on tableCellArg in block tags too
* The same comment as for xmlish_tag applies.
* Should have been part of 566f4c0f but it's only in adeb4e47 and
c1a5cfd1 that block_tag and xmlish_tag are converging.
Change-Id: I7ad6435206841844505a7751101ad1e8b99a87b3
---
M lib/wt2html/pegTokenizer.pegjs
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/12/328612/1
diff --git a/lib/wt2html/pegTokenizer.pegjs b/lib/wt2html/pegTokenizer.pegjs
index 624bc17..9c3d1ec 100644
--- a/lib/wt2html/pegTokenizer.pegjs
+++ b/lib/wt2html/pegTokenizer.pegjs
@@ -1273,7 +1273,8 @@
* following paragraphs.
*/
block_tag
- = "<" end:"/"?
+ = & { return stops.push('tableCellArg', false); }
+ "<" end:"/"?
name:$(tn:tag_name & {
return isXMLTag(tn, true); // NOTE: 'extTag' stop was pushed.
})
@@ -1281,11 +1282,13 @@
space_or_newline*
selfclose:"/"?
">" {
+ stops.pop('tableCellArg');
stops.pop('extTag');
var t = tu.buildXMLTag(name, name.toLowerCase(), attribs, end,
selfclose, tsrOffsets());
return [maybeExtensionTag(t)];
}
/ "<" "/"? tag_name & { return stops.pop('extTag'); }
+ / & { return stops.pop('tableCellArg'); }
// A generic attribute that can span multiple lines.
generic_newline_attribute
--
To view, visit https://gerrit.wikimedia.org/r/328612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ad6435206841844505a7751101ad1e8b99a87b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
