From: C. Scott Ananian Date: Wed, 8 Jul 2015 21:56:54 +0000 (-0400) Subject: Sync up with Parsoid parserTests. X-Git-Tag: 1.31.0-rc.0~10845^2 X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=1c4a8ff314ae894a5dae23cd1c6b76b4e82bac49;p=lhc%2Fweb%2Fwiklou.git Sync up with Parsoid parserTests. This now aligns with Parsoid commit 34bd76a1747816ed96952ce81ce2fafa751dbb21 Change-Id: Iabf427db488251e26d55a0eb68b282eccd9eb8df --- diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt index 1670fe4cc5..b3944fb99f 100644 --- a/tests/parser/parserTests.txt +++ b/tests/parser/parserTests.txt @@ -118,6 +118,13 @@ Template:echo_with_div

{{{1}}}

!! endarticle +!! article +Template:blank_param +!! text +{{{1}}} +{{{}}} +!! endarticle + !! article Template:table_attribs !! text @@ -165,6 +172,13 @@ Template:table_cells {{table_attribs}}||style='color:red;'|''Bar''||style='color:brown;'|''Foo'' and Baz !! endarticle +!! article +Template:PartialTable +!! text +{| +|- +!! endarticle + !! article Template:image_attribs !! text @@ -1425,6 +1439,16 @@ parsoid=html2wt * </nowiki> tag !! end +!! test +T93824: Put escaped HTML tags inside nowiki +!! options +parsoid=html2wt +!! html +

+!! wikitext +

foo

+!! end + !! test T71950: 1. Put nowiki as close to cause as possible, even with non-quote escapable chars !! options @@ -1483,6 +1507,30 @@ parsoid=html2wt {{echo|a }}} !! end +!! test +Cases where "!!" needs nowiki protection +!! options +parsoid=html2wt +!! html + + +

this needs protection !! here

+ + + +

this does not need +protection !! here

+!! wikitext +{| +!this needs protection !! here +|} + +{| +!this does not need +protection !! here +|} +!! end + ### ### Comments ### @@ -1587,8 +1635,10 @@ Comment whitespace Comment semantics and delimiters !! wikitext -!! html +!! html/php +!! html/parsoid + !! end !! test @@ -1596,8 +1646,11 @@ Comment semantics and delimiters, redux !! wikitext -!! html +!! html/php +!! html/parsoid + !! end !! test @@ -1607,39 +1660,68 @@ Comment semantics and delimiters: directors cut everything starting with < followed by !-- until the first -- and > we see, that wouldn't be valid XML however, since in XML -- has to terminate a comment -->--> -!! html +!! html/php

-->

+!! html/parsoid +

-->

!! end !! test Comment semantics: nesting !! wikitext --> -!! html +!! html/php

-->

+!! html/parsoid +

-->

!! end +# Parsoid closes the unclosed comment, even if it means a slight +# round-trip diff. !! test Comment semantics: unclosed comment at end +!! options +parsoid=wt2html,html2html !! wikitext !! end -# Bug 58184: document parsoid's behaviour !! test -Suppress comment closing tag in lenient browsers -!! options -parsoid=wt2html,html2html +Comment semantics: normalize comments to play nice with XML and browsers !! wikitext - think this is closed --> + think this is closed --> + This would normally be text --> + As would this --> + + +But this is not a comment. !! html/php +

But this is not a comment. +

+!! html/parsoid + + + + + +

But this is not a comment.

+!! end +!! test +Comment semantics: round-trip even text which contains encoded --> +!! wikitext + !! html/parsoid - + !! end !! test @@ -1683,9 +1765,10 @@ parsoid=wt2html,wt2wt *a *b !! html -

aÂ : b

{{{1}}}

bar +foo +

bar +foo

- a
- b

 a
+  b

a b

to a

(but Parsoid doesn't). +# From whitelist: +# * The test is wrong, there are two colons where there should be :; +# * The PHP parser is wrong to close the

containing the . !! test Definition Lists: Weird Ones: Test 1 !! wikitext @@ -4063,7 +4173,7 @@ Definition Lists: Weird Ones: Test 1 - foo + fooÂ bar (who uses this?)

tags with invalid link targets as plain text !! options parsoid=html2wt !! html -

[[foo]]

*a [[foo]]

Bar

+European Robin +European Robin +

Bold tag left open

Italic tag left open

Normal text. -

This year's election should beat last year's. +

This year's election should beat last year's.

Toms car is bigger than Susans.

Plain italic's plain

a b	c +

a b	c

a + b!!c + +

a + b!!c

a
b!!c

a
b!!c

bar +

title="foo|" bar +

Foo	Bar	Foo and Baz +
Foo	Bar	Foo and Baz +

Foo	Bar	Foo and Baz
Foo	Bar	Foo and Baz

Blah blah blah

Blah blah blah +

Blah blah blah

[[Bar]]

REDIRECT [[[[Bar]]]]

REDIRECT [[]]

Foo

!! html/parsoid -

!! end !! test @@ -8258,11 +8545,15 @@ List items are not parsed correctly following a

 block (bug 785)
 * foo
 * bar
 * zar
-!! html
+!! html/php
  foo
  bar
  zar
 
+!! html/parsoid
+ foo
+ bar
+ zar
 !! end
 
 !! test
@@ -9642,9 +9933,11 @@ Template with default value (value set)
 Template redirect
 !! wikitext
 {{templateredirect}}
-!! html
+!! html/php
 (test)
 
+!! html/parsoid
+
 !! end
 
 !! test
@@ -9882,6 +10175,24 @@ Template with targets containing wikilinks
 
 !! end
 
+!! article
+Template:''
+!! text
+bar
+!! endarticle
+
+!! test
+Templates: Double quotes as template target
+!! wikitext
+foo {{''}} baz
+!! html/php
+foo bar baz
+
+!! html/parsoid
+foo bar baz
+
+!! end
+
 !! article
 Template:MSGNW test
 !! text
@@ -10669,6 +10980,24 @@ Templates: Support for templates generating attributes and content
 
 !! end
 
+!! test
+3. Entities and nowikis inside templated attributes should be handled correctly inside templated tables
+!! wikitext
+{{tbl-start}}
+|{{table_attribs_3}}
+{{tbl-end}}
+!! html/php
+
+
+Foo
+
+
+!! html/parsoid
+
+
+Foo
+!! end
+
 !!test
 Templates: HTML Tables: 1. Generating start of a HTML table
 !! wikitext
@@ -10896,6 +11225,46 @@ Templates: Wiki Tables: 6. Templated tags, templated td-tags
 
 !!end
 
+## This test case is very specific to Parsoid's internals
+## and is hence only tested for Parsoid's code. Parsoid uses
+## a  marker tag for  tags and they are expanded
+## much later. We are verifying that this  tag usage
+## doesn't prevent foster parenting.
+!!test
+Templates: Wiki Tables: 7. Fosterable s should get fostered
+!!wikitext
+{{PartialTable}}foo
+|}
+
+
+!!html/parsoid
+[1]
+
+
+
+â  foo
+!!end
+
+!! test
+Templates: Wiki Tables: 8. Fosterable meta-tags should get fostered
+!! wikitext
+{{echo|
+{{{!}}
+{{!}}-}}
+
+|foo
+
+{{!}}}
+!! html/parsoid
+
+
+
+
+
+foo
+
+!! end
+
 !!test
 Templates: Lists: Multi-line list-items via templates
 !! wikitext
@@ -11921,7 +12290,7 @@ parsoid=wt2html,wt2wt,html2html
   
This is a caption
 
 !! html/parsoid
-This is a caption
+This is a caption
 !! end
 
 !! test
@@ -11932,7 +12301,7 @@ parsoid=wt2html,wt2wt,html2html
   
This is a caption
 
 !! html/parsoid
-This is a caption
+This is a caption
 !! end
 
 !! test
@@ -11989,7 +12358,7 @@ thumbsize=220
 !! html/parsoid
 123456
 123
456
-123
456
+123
456
 !! end
 
 !! test
@@ -12011,7 +12380,7 @@ Image with multiple widths -- use last
 
 
 !! html/parsoid
-
+
 !! end
 
 !! test
@@ -12027,7 +12396,7 @@ thumbsize=220
 
 
 !! html/parsoid
-caption
+caption
 
 !! end
 
@@ -12043,9 +12412,9 @@ Image with width attribute at different positions
 
 
 !! html/parsoid
-Caption
-Caption
-Caption
+Caption
+Caption
+Caption
 !! end
 
 # a sad bit of backward-compatibility
@@ -12061,7 +12430,7 @@ parsoid=wt2html,wt2wt,html2html
 
 
 !! html/parsoid
- 
+ 
 !! end
 
 !! test
@@ -12187,7 +12556,7 @@ parsoid=wt2html,wt2wt,html2html
   
Title
 
 !! html/parsoid
-Title
+Title
 !! end
 
 !! test
@@ -12334,9 +12703,9 @@ parsoid=wt2html,wt2wt,html2html
 

 
 !! html/parsoid
-
-
-
+
+
+
 !! end
 
 !! test
@@ -12372,9 +12741,9 @@ parsoid=wt2html,wt2wt,html2html
   
caption
 
 !! html/parsoid
-caption
-caption
-caption
+caption
+caption
+caption
 !! end
 
 ###################
@@ -12401,8 +12770,8 @@ parsoid=wt2html,wt2wt,html2html
 

 
 !! html/parsoid
-
-
+
+
 !! end
 
 !! test
@@ -12418,8 +12787,8 @@ parsoid=wt2html,wt2wt,html2html
 

 
 !! html/parsoid
-
-
+
+
 !! end
 
 !! test
@@ -12432,7 +12801,7 @@ parsoid=wt2html,wt2wt,html2html
   
 
 !! html/parsoid
-
+
 !! end
 
 !! test
@@ -12448,8 +12817,8 @@ parsoid=wt2html,wt2wt,html2html
   
 
 !! html/parsoid
-
-
+
+
 !! end
 
 !! test
@@ -12462,7 +12831,7 @@ parsoid=wt2html,wt2wt,html2html
 
 
 !! html/parsoid
-
+
 !! end
 
 !! test
@@ -12478,8 +12847,8 @@ parsoid=wt2html,wt2wt,html2html
 

 
 !! html/parsoid
-
-
+
+
 !! end
 
 !! test
@@ -12550,7 +12919,7 @@ thumbsize=220
   
http://example.com
 
 !! html/parsoid
-http://example.com
+http://example.com
 !! end
 
 !! test
@@ -12564,7 +12933,7 @@ parsoid=wt2html,wt2wt,html2html
   
http://example.com
 
 !! html/parsoid
-http://example.com
+http://example.com
 !! end
 
 !! test
@@ -12576,7 +12945,7 @@ SVG thumbnails with no language set
   
caption
 
 !! html/parsoid
-caption
+caption
 !! end
 
 !! test
@@ -12589,7 +12958,7 @@ parsoid=wt2html,wt2wt,html2html
   
caption
 
 !! html/parsoid
-caption
+caption
 !! end
 
 !! test
@@ -12613,7 +12982,7 @@ BUG 1887: A ISBN with a thumbnail
   
ISBN 1235467890
 
 !! html/parsoid
-ISBN 1235467890
+ISBN 1235467890
 !! end
 
 !! test
@@ -12624,7 +12993,7 @@ BUG 1887: A RFC with a thumbnail
   
This is RFC 12354
 
 !! html/parsoid
-This is RFC 12354
+This is RFC 12354
 !! end
 
 !! test
@@ -12635,7 +13004,7 @@ BUG 1887: A mailto link with a thumbnail
   
Please mailto:nobody@example.com
 
 !! html/parsoid
-Please mailto:nobody@example.com
+Please mailto:nobody@example.com
 !! end
 
 # Pending resolution to bug 368
@@ -12726,7 +13095,7 @@ Image caption containing another image
   
This is a caption with another  inside it!
 
 !! html/parsoid
-This is a caption with another  inside it!
+This is a caption with another  inside it!
 !! end
 
 !! test
@@ -12750,7 +13119,7 @@ Image: caption containing leading space
   
bar
 
 !! html/parsoid
- bar
+ bar
 !!end
 
 !! test
@@ -12769,7 +13138,7 @@ and some more text.]]
   
This is an example image thumbnail caption with a table    Foo   Bar 
   Foo1   Bar1 
 and some more text.
 
 !! html/parsoid
-This is an example image thumbnail caption with a table
+This is an example image thumbnail caption with a table
 
@@ -12786,7 +13155,7 @@ Bug 3090: External links other than http: in image captions
   
This caption has irc and Secure ext links in it.
 
 !! html/parsoid
-This caption has irc and Secure ext links in it.
+This caption has irc and Secure ext links in it.
 !! end
 
 !! test
@@ -12828,7 +13197,7 @@ language=es
   
caption
 
 !! html/parsoid
-caption
+caption
 !! end
 
 !! test
@@ -12842,7 +13211,7 @@ parsoid=wt2html,wt2wt,html2html
 
 
 !! html/parsoid
-
+
 !! end
 
 # Note that 'right' is the default alignment, despite the misspelled 'righ' below
@@ -12863,9 +13232,9 @@ parsoid=wt2html,wt2wt,html2html
   
caption
 
 !! html/parsoid
-caption
-caption
-caption
+caption
+caption
+caption
 !! end
 
 !! article
@@ -12910,7 +13279,7 @@ Parsoid-specific image handling - simple image with size and middle alignment
 !! wikitext
 [[File:Foobar.jpg|middle|50px]]
 !! html/parsoid
-
+
 !! end
 
 !! test
@@ -12921,7 +13290,7 @@ parsoid=wt2wt,wt2html,html2html
 !! wikitext
 [[Image:Foobar.jpg|middle|50px]]
 !! html/parsoid
-
+
 !! end
 
 !! test
@@ -12930,7 +13299,7 @@ Parsoid-specific image handling - simple image with size and middle alignment
 !! wikitext
 [[File:Foobar.jpg|50px|middle]]
 !! html/parsoid
-
+
 !! end
 
 !! test
@@ -12941,7 +13310,7 @@ parsoid=wt2html,wt2wt,html2html
 !! wikitext
 [[Image:Foobar.jpg|50px|middle]]
 !! html/parsoid
-
+
 !! end
 
 !! test
@@ -12965,7 +13334,7 @@ Parsoid-specific image handling - thumbnail with halign, valign, and caption
 !! wikitext
 [[File:Foobar.jpg|left|baseline|thumb|caption content]]
 !! html/parsoid
-caption content
+caption content
 !! end
 
 !! test
@@ -12974,7 +13343,7 @@ Parsoid-specific image handling - thumbnail with halign, valign, and caption
 !! wikitext
 [[File:Foobar.jpg|thumb|left|baseline|caption content]]
 !! html/parsoid
-caption content
+caption content
 !! end
 
 !! test
@@ -12982,7 +13351,7 @@ Parsoid-specific image handling - thumbnail with specific size, halign, valign,
 !! wikitext
 [[Image:Foobar.jpg|right|middle|thumb|50x50px|caption]]
 !! html/parsoid
-caption
+caption
 !! end
 
 !! test
@@ -13050,7 +13419,7 @@ foo
 bar
 !! html/parsoid
 foo
-This caption has a unbalanced tag in it.
+This caption has a unbalanced tag in it.
bar
 !! end
 
@@ -13061,7 +13430,7 @@ parsoid=wt2html,wt2wt
 !! wikitext
 [[File:Foobar.jpg|thumb|]]
 !! html/parsoid
-
+
 !! end
 
 # empty captions don't get serialized unless we're in the "round trip" case
@@ -13088,7 +13457,7 @@ Parsoid-specific image handling - whitespace caption
 !! wikitext
 [[File:Foobar.jpg|thumb| ]]
 !! html/parsoid
- 
+ 
 !! end
 
 !! test
@@ -13435,6 +13804,152 @@ Bar
 
 !! end
 
+## The whitespace on the empty line is part of the test. Please do not delete
+!! test
+1. Categories and newlines: All preceding newlines should be suppressed (courtesy bug 87)
+!! options
+parsoid=wt2html,wt2wt
+!! wikitext
+This
+   
+[[Category:Foo]] and this should be part of same paragraph (not an indent-pre)
+   
+{{echo|[[Category:Foo]] and so should this!}}
+!! html
+This and this should be part of same paragraph (not an indent-pre) and so should this!
+
+!! html/parsoid
+This
+   
+ and this should be part of same paragraph (not an indent-pre)
+   
+ and so should this!
+!! end
+
+## Parsoid will not try to wt2wt this while preserving newlines because
+## it suppresses excess newlines within list items -- and we don't want to
+## introduce a special case just for categories, which is, in reality somewhat
+## odd behavior -- categories are unlikely to be used in list items like this
+## in top-level pages and are only likely to show up in template-generated
+## list items where this RT-ing is a non-issue.
+##
+## The whitespace on the empty line is part of the test. Please do not delete
+!! test
+2. Categories and newlines: All preceding newlines should be suppressed (courtesy bug 87)
+!! options
+parsoid=wt2html
+!! wikitext
+* This
+   
+[[Category:Foo]] and this should be part of the same list item
+* So should this
+
+{{echo|[[Category:Foo]] and this should be part of the same list item}}
+!! html
+This and this should be part of the same list item
+So should this and this should be part of the same list item
+!! html/parsoid
+
+This  and this should be part of the same list item
+So should this  and this should be part of the same list item
+
+!! end
+
+## Newlines and categories that follow the last item of a list
+## are treated differently because this (list followed by categories)
+## is an extremely common pattern on wikis.
+!! test
+3. Categories and newlines: newline suppression for last list item should RT properly
+!! wikitext
+* a
+* b 
+   
+[[Category:Foo]]
+   
+[[Category:Bar]]
+[[Category:Baz]]
+!! html/parsoid
+ a
+ b 
+   
+
+   
+
+
+!! end
+
+!! test
+4. Categories and newlines: newline suppression for last list item should RT properly
+!! wikitext
+* a
+**** b
+
+[[Category:Foo]]
+!! html/parsoid
+ a
+ b
+
+
+!! end
+
+## only wt2html for this to make sure the algo only applies to the rightmost path
+!! test
+5. Categories and newlines: migrateTrailingCategories dom pass should only run on the rightmost path of nested lists
+!! options
+parsoid=wt2html
+!! wikitext
+* a
+** b
+[[Category:Foo]]
+* c
+** d
+[[Category:Foo]]
+!! html/parsoid
+ a
+ b
+
+ c
+ d
+
+!! end
+
+!! test
+6. Categories and newlines: migrateTrailingCategories dom pass should not migrate categories not preceded by newlines
+!! wikitext
+* a [[Category:Foo]]
+!! html/parsoid
+a 
+!! end
+
+# This test also demonstrates because of newline+category tunneling
+# through the list hander, template wrapping doesn't expand to the
+# containing list when the list item swallows the category.
+!! test
+7. Categories and newlines: migrateTrailingCategories dom pass should leave template content alone
+!! wikitext
+* {{echo|a
+[[Category:Foo]]}}
+!! html/parsoid
+ a
+
+!! end
+
+!! test
+8. Categories and newlines: migrateTrailingCategories dom pass should not get tripped by intervening templates
+!! wikitext
+* a
+
+{{echo|[[Category:Foo]]
+[[Category:Bar]]}}
+[[Category:Baz]]
+!! html/parsoid
+ a
+
+
+
+
+!! end
+
 !! test
 Parsoid: Serialize link to category page with colon escape
 !! options
@@ -13450,15 +13965,21 @@ parsoid
 
 !! end
 
+# html2wt localizes the "Category" namespace.
+# XXX the  element needs an empty data-parsoid attribute, or
+# else the html2html test fails because spaces are inserted.
 !! test
-Parsoid: Link prefix/suffixes aren't applied to category links
+Link prefix/suffixes aren't applied to category links
 !! options
 parsoid=wt2html,wt2wt,html2html
 language=is
 !! wikitext
 x[[Category:Foo]]y
-!! html
-xy
+!! html/php
+xy
+
+!! html/parsoid
+xy
 !! end
 
 !! test
@@ -17564,7 +18085,7 @@ Images with the "|" character in the comment
   
An external URL
 
 !! html/parsoid
-An external URL
+An external URL
 !! end
 
 !! test
@@ -19109,7 +19630,7 @@ percent-encoding and + signs in comments (Bug 26410)
 comment
 !! wikitext
 [[ABC%33D% ++]] [[ABC%33D% ++|+%20]]
-!! html
+!! html/php
 ABC3D% +++%20
 !! end
 
@@ -19439,7 +19960,10 @@ percent-encoding and + signs in internal links (Bug 26410)
 3E3E+
 !! html/parsoid
-User:+% Page+title% %+ %20 %+  %+r % +  3E 3E+
+User:+% Page+title%
+%+ %20 %+  %+r
+% + 
+3E 3E+
 !! end
 
 !! test
@@ -20208,10 +20732,11 @@ parsoid=wt2html,wt2wt
 
 [[Image:Foobar.jpg|right|300px]]
 !! html/parsoid
+
 foo
-caption
+caption
bar
-
+
 !! end
 
 #### ----------------------------------------------------------------
@@ -20230,13 +20755,13 @@ B foo
 C 
 
 !! html
-A [1]
-B [2]
-C [3]
-
-â foo
-â foo
-â 
+A [1]
+B [2]
+C [3]
+
+â  foo
+â  foo
+â  
 
 !!end
 
@@ -20249,10 +20774,10 @@ A foo
 B 
 
 !! html
-A [1]
-B [1]
-
-â 1.0 1.1 foo
+A [1]
+B [1]
+
+1 2  foo
 
 !!end
 
@@ -20266,11 +20791,11 @@ B 
 C 
 
 !! html
-A [1]
-B [1]
-C [1]
-
-â 1.0 1.1 1.2 foo
+A [1]
+B [1]
+C [1]
+
+1 2 3  foo
 
 !!end
 
@@ -20283,9 +20808,9 @@ parsoid
 A foo
 
 !! html
-A [1]
-
-â foo
+A [1]
+
+â  foo
 
 !!end
 
@@ -20300,10 +20825,10 @@ A 
 
 
 !! html
-A [1]
+A [1]
 
-
-â This is a bolded link and this is a transclusion
+
+â  This is a bolded link and this is a transclusion
 
 
 !!end
@@ -20321,10 +20846,10 @@ A 
 
 
 !! html
-A [1]
+A [1]
 
-
-â foo
+
+â  foo
  bar
  baz
 
@@ -20351,10 +20876,10 @@ booz
 
 
 !! html
-A [1]
+A [1]
 
-
-â foo
+
+â  foo
 
 bar
 
@@ -20377,9 +20902,9 @@ A  foo {{echo| B C}}
 
 
 !! html
-A [1] B C}}
-
-â foo {{echo|
+A [1] B C}}
+
+â  foo {{echo|
 
 !!end
 
@@ -20391,9 +20916,9 @@ parsoid
 A  foo 
+A [1] B C
+
+â  foo 
 
 !!end
 
@@ -20406,11 +20931,11 @@ A   foo  B C
 
 
 !! html
-A [1] B C
+A [1] B C
 
 
-
-â  foo 
+
+â   foo 
 
 !!end
 
@@ -20423,37 +20948,35 @@ A foo B
 C bar D
 
 !! html
-A [1] B
-C [2] D
-
-â foo
-â bar
+A [1] B
+C [2] D
+
+â  foo
+â  bar
 
 !!end
 
 !!test
 Ref: 12. ref-tags act as trailing newline migration barrier
-!!options
-parsoid
 !! wikitext
-a
+a
 
-b 
+b 
 
 
 c
 
-!! html
-a
+!! html/parsoid
+a
 
 
-b [1]
-[2]
+b [1]
+[2]
 
 c
-
-â 
-â 
+
+â  
+â  
 !!end
 
 !!test
@@ -20466,11 +20989,11 @@ parsoid
  B
 
 !! html
-[1] A
-[2] B
-
-â foo
-â bar
+[1] A
+[2] B
+
+â  foo
+â  bar
 
 
 !!end
@@ -20484,10 +21007,10 @@ parsoid
 
 
 !! html
-[1]
+
[1]
 
-
-â foo <ref>bar</ref> baz
+
+â  foo <ref>bar</ref> baz
 
 !!end
 
@@ -20501,10 +21024,10 @@ B1  B2 bar
 
 
 !! html
-A1 [1] A2 [1]
-B1 [2] B2 [2]
+A1 [1] A2 [1]
+B1 [2] B2 [2]
 
-â 1.0 1.1 foo
â 2.0 2.1 bar
+1 2  foo
1 2  bar
 
 !!end
 
@@ -20518,9 +21041,9 @@ A foo
 
 
 !! html
-A [1]
-
-â foo
+A [1]
+
+â  foo
 !!end
 
 !!test
@@ -20532,11 +21055,11 @@ parsoid
 
 
 !!html
-[1]
+
[1]
 
 
-
-â foo
+
+â  foo
 
 !!end
 
@@ -20549,11 +21072,11 @@ parsoid
 
 
 !!html
-[1]
+
[1]
 
 
-
-â foo
+
+â  foo
 
 !!end
 
@@ -20566,10 +21089,10 @@ parsoid
 
 
 !! html
-1 [1] 2 [1]
+
1 [1] 2 [1]
 
-
-â 1.0 1.1 foo
+
+1 2  foo
 
 !!end
 
@@ -20584,28 +21107,24 @@ C 
 
 
 !! html
-A [1]
-B [1]
-C [1]
+A [1]
+B [1]
+C [1]
 
-â 1.0 1.1 1.2 Foo one
+1 2 3  Foo one
 
 !!end
 
 !!test
 References: 1. references tag without any refs should be handled properly
-!!options
-parsoid
 !! wikitext
 
-!! html
-
+!! html/parsoid
+
 !!end
 
 !!test
 References: 2. references tag with group only outputs references from that group
-!!options
-parsoid
 !! wikitext
 A foo
 B bar
@@ -20614,26 +21133,24 @@ C baz
 
 
 
-!! html
-A [a 1]
-B [b 1]
-C [1]
+!! html/parsoid
+A [a 1]
+B [b 1]
+C [1]
 
-
-â foo
+
+â  foo
 
-
-â baz
+
+â  baz
 
-
-â bar
+
+â  bar
 
 !!end
 
 !!test
 References: 3. ref list should be cleared after processing references
-!!options
-parsoid
 !! wikitext
 A foo
 
@@ -20642,23 +21159,21 @@ A foo
 B bar
 
 
-!! html
-A [1]
+!! html/parsoid
+A [1]
 
-â foo
+â  foo
 
 
-B [1]
+B [1]
 
-
-â bar
+
+â  bar
 
 !!end
 
 !!test
 References: 4. only referenced group should be cleared after processing references
-!!options
-parsoid
 !! wikitext
 A afoo
 B bfoo
@@ -20668,23 +21183,21 @@ B bfoo
 C cfoo
 
 
-!! html
-A [a 1]
-B [1]
+!! html/parsoid
+A [a 1]
+B [1]
 
-â afoo
+â  afoo
 
 
-C [2]
+C [2]
 
-â bfoo
â cfoo
+â  bfoo
â  cfoo
 
 !!end
 
 !!test
 References: 5. ref tags in references should be processed while ignoring all other content
-!!options
-parsoid
 !! wikitext
 A 
 B bar
@@ -20693,30 +21206,26 @@ B bar
 foo
 This should just get lost.
 
-!! html
-A [1]
-B [2]
+!! html/parsoid
+A [1]
+B [2]
 
 
-â foo
â bar
+â  foo
â  bar
 
 !!end
 
 !!test
 References: 6.  from a transclusion
-!!options
-parsoid
 !! wikitext
 Foo {{echo|}}
-!! html
-[1]
 â Foo
+!! html/parsoid
+[1]
 â  Foo
 
 !!end
 
 !! test
 References: 7. Multiple references tags (one without and one with nested refs) should be correctly handled
-!! options
-parsoid
 !! wikitext
 A foo bar for a
 B 
@@ -20726,30 +21235,28 @@ B 
 
 foo
 
-!! html
-A [1]
-B [X 1]
+!! html/parsoid
+
A [1]
+B [X 1]
 
 
-
-â foo bar for a
+
+â  foo bar for a
 
 
-
-â foo
+
+â  foo
 
 !! end
 
 !! test
 References: 8. T88019: Remove s from templates inside  that's itself inside a template
-!! options
-parsoid
 !! wikitext
 X{{echo|foo {{echo|bar}} and {{echo|baz}} boo}}
 
-!! html
-X[1]
-â foo bar and baz boo
+!! html/parsoid
+X[1]
+â  foo bar and baz boo
 
 !!end
 
@@ -20759,18 +21266,16 @@ X{{echo|foo {{echo|bar}} and {{echo|baz}} boo}}
 # wt2wt.
 !! test
 References: 9. Generate missing references list at the end
-!! options
-parsoid
 !! wikitext
 A foo
 B bar
-!! html
-A [1] B [inexistent 1]
-
-â foo
+!! html/parsoid
+A [1] B [inexistent 1]
+
+â  foo
 
-
-â bar
+
+â  bar
 
 !! end
 
@@ -20792,15 +21297,13 @@ A foo
 
 !! test
 Entities in ref name
-!! options
-parsoid
 !! wikitext
 hi
 
-!! html
-[1]
-
-â hi
+!! html/parsoid
+[1]
+
+â  hi
 
 !! end
 
@@ -20814,10 +21317,10 @@ parsoid=wt2html
 afoo
 
 
-!! html
-a[1]
-
-â foo
+!! html/parsoid
+a[1]
+
+â  foo
 !! end
 
 !! test
@@ -20827,8 +21330,8 @@ parsoid=wt2wt,html2wt
 !! wikitext
 foo
 
-!! html
-foo
+!! html/parsoid
+foo
 !! end
 
 #### ----------------------------------------------------------------
@@ -21061,8 +21564,6 @@ parsoid=html2wt
 
 !! test
 Headings: 5. Empty headings
-!! options
-parsoid
 !! wikitext
 ==
 
@@ -21075,13 +21576,18 @@ parsoid
 ==========
 
 ============
-!! html
-
-
-
-
-
-
+!! html/parsoid
+
+
+
+
+
+
+
+
+
+
+
 !!end
 
 !! test
@@ -21727,6 +22233,40 @@ parsoid=wt2html
 
 
 Foo Bar
   
 
 

 !! end
 
+!! test
+T97430: Don't emit empty nowiki pairs around marker meta tags
+!! options
+parsoid=html2wt
+!! html
+*This is a long sentence here that will make the nowiki algo split up the nowikis into multiple pairs
+|** Make this another long long long sentence forcing the nowiki algo to split up the nowikis.
+!! wikitext
+*This is a long sentence here that will make the nowiki algo split up the nowikis into multiple pairs
+|** Make this another long long long sentence forcing the nowiki algo to split up the nowikis.
+!! end
+
+!! test
+Unclosed xmlish element in table line shouldn't eat end delimiters
+!! wikitext
+{|
+| 
+|}
+!! html/php
+
+
+
+ <foo
+  bar>
+
+
+!! html/parsoid
+
+
+
+ <foo  bar>
+!! end
+
 #### --------------- Links ----------------
 #### 1. Quote marks in link text
 #### 2. Wikilinks: Escapes needed
@@ -22102,10 +22642,10 @@ parsoid=html2wt,wt2wt
 a' foo bar
 a' foo bar
 foo x'bar
-'foo [1]
+'foo [1]
 'foo test
 'foo and 
 bar
-
+
 â test
 
 !! end
@@ -22223,9 +22763,9 @@ foo ''a''
  b
 
 !! html
-foo [1]
-
-â a
+foo [1]
+
+â  a
  b
 
 !! end
@@ -22256,7 +22796,7 @@ parsoid
 !! wikitext
  [[File:Foobar.jpg|thumb|caption]]
 !! html/parsoid
- caption
+ caption
 !! end
 
 !! test
@@ -22269,7 +22809,22 @@ parsoid=html2wt
  ==foo==
 !! end
 
+!!test
+T95794: nowiki escaping should account for leading space at start-of-line in an indent-pre block
+!! options
+parsoid
+!! wikitext
+ * foo
+ * bar
+!! html
++* foo
+* bar
+
+!! end
+
 #### --------------- Behavior Switches --------------------
+
 !! test
 1. Valid behavior switches should be escaped
 !! options
@@ -22294,6 +22849,29 @@ __TOO__
 __|__
 !! end
 
+# We use indent-pre as an indirect way to test for sol-transparent behavior.
+!! test
+Behavior switches should be SOL-transparent
+!! wikitext
+ __TOC__
+
+ 
+ __TOO__
+
+ __TOC__ foo
+
+__TOC__ bar
+!! html/parsoid
+ 
+
+ 
+__TOO__
+
+ foo
+
+bar
+!! end
+
 #### --------------- HTML tags ---------------
 #### 1. a tags
 #### 2. other tags
@@ -22615,6 +23193,8 @@ bar
 
 !!end
 
+# Note that the "style" attribute is really a template parameter here.
+# The = would have to be {{=}} if you wanted the literal.
 !!test
 Empty TD followed by TD with tpl-generated attribute
 !! wikitext
@@ -22775,7 +23355,7 @@ Multi-line image caption generated by templates with/without trailing newlines
 New element inserted (without intervening newlines) after an old sol-transparent node should serialize correctly
 !! options
 parsoid=html2wt
-!! html
+!! html/parsoid
 new para
 
 new heading
@@ -22792,12 +23372,10 @@ new para
 ## a Parsoid serializer test, marking this Parsoid only
 !!test
 Improperly nested inline or quotes tags with whitespace in between
-!!options
-parsoid
 !! wikitext
  x 
 ''' ''x''' ''
-!! html
+!! html/parsoid
  x 
  x 
 
@@ -22805,11 +23383,9 @@ parsoid
 
 !!test
 Encapsulate protected attributes from wt
-!!options
-parsoid
 !! wikitext
 foo
-!! html
+!! html/parsoid
 foo
 
 !!end
@@ -22823,7 +23399,7 @@ Ensure ParagraphWrapper can deal with stray closing pre tags
 parsoid=wt2html
 !! wikitext
 plain text

Foo	Bar
Foo1	Bar1

-!! html +!! html/parsoid plain text !!end @@ -22833,7 +23409,7 @@ plain text parsoid=wt2html !! wikitext hi
ho
-!! html +!! html/parsoid
hi

ho
@@ -22849,7 +23425,7 @@ parsoid=wt2html,wt2wt || || a -!! html +!! html/parsoid
|| ||
@@ -22862,7 +23438,7 @@ Encapsulation properly handles null DSR information from foster box parsoid=wt2html,wt2wt !! wikitext {{echo|

a
foo
bar
}} -!! html +!! html/parsoid foo
bar
!!end @@ -22872,7 +23448,7 @@ parsoid=wt2html,wt2wt parsoid=wt2wt,wt2html !! wikitext {{echo|foo}}
bar
-!! html +!! html/parsoid
foo
@@ -22888,7 +23464,7 @@ parsoid=wt2wt,wt2html parsoid=wt2wt,wt2html !! wikitext

{{echo|foo}}
bar
-!! html +!! html/parsoid
foo
@@ -22905,7 +23481,7 @@ parsoid=wt2wt,wt2html parsoid=wt2wt,wt2html !! wikitext

{{echo|foo
}}bar
-!! html +!! html/parsoid

foo

@@ -22924,7 +23500,7 @@ parsoid=wt2wt,wt2html parsoid=wt2wt,wt2html !! wikitext
{{echo|foo
}}bar
-!! html +!! html/parsoid

foo

@@ -22943,7 +23519,7 @@ parsoid=wt2wt,wt2html parsoid=wt2wt,wt2html !! wikitext foo}}
{{echo|foo
-!! html +!! html/parsoid
foo
@@ -22964,7 +23540,7 @@ parsoid=wt2wt,wt2html parsoid=wt2wt,wt2html !! wikitext

foo
{{echo|foo
}}
ok
-!! html +!! html/parsoid
foo
@@ -22986,7 +23562,7 @@ parsoid=wt2wt,wt2html parsoid=wt2wt,wt2html !! wikitext

{{echo|
foo
}}
bar
-!! html +!! html/parsoid
foo
@@ -22997,6 +23573,8 @@ parsoid=wt2wt,wt2html

!!end +# Note that the wt is broken on purpose: the = should be {{=}} if you +# don't want it to be a template parameter key. !!test 8. Encapsulate foster-parented transclusion content !!options @@ -23007,8 +23585,11 @@ parsoid=wt2wt,wt2html |- |b |} -!! html -
a
{{{1}}}
+!! html/parsoid +
a
+ +
{{{1}}}
+
@@ -23023,7 +23604,7 @@ parsoid=wt2wt,wt2html parsoid=wt2wt,wt2html !! wikitext

b
{{echo|hi
hello}} -!! html +!! html/parsoid
hi
hello
!!end @@ -23038,7 +23619,7 @@ parsoid=wt2html,wt2wt |} |} -!! html +!! html/parsoid

@@ -23066,7 +23647,7 @@ Properly encapsulate empty-content transclusions in fosterable positions Support

foo

new heading

foo

bar

baz

baz

hello there

hi pal

how goes it

it goes well

howdy

ok

hello there

hi pal

how goes it

foo

foo [1]

testing 123

hi there +you

foo [1]

foo

bar

baz

baz

ok