-!! end
-
!! test
Simple paragraph
!! wikitext
@@ -549,8 +534,8 @@ parsoid=wt2html
!! config
wgFragmentMode=[ 'html5', 'legacy' ]
!! wikitext
-== A B
-C ==
+==A B
+C==
!! html/php
A B
@@ -558,8 +543,8 @@ C[ A B
-C
+C">A B
+C
!! end
!! test
@@ -572,58 +557,51 @@ http://fr.wikipedia.org/wiki/ðº
!! end
-# Note that the html+tidy output removes the spaces after the
,
-# which is a bug (https://sourceforge.net/p/tidy/bugs/945/, etc).
-# This is an issue for all tests with lists. We intentionally do
-# *not* add html+tidy clauses for these, as we don't want to
-# document/test the broken behavior. (Parsoid matches the non-tidy
-# output in these cases.)
-
!! test
Simple list
!! wikitext
-* Item 1
-* Item 2
+*Item 1
+*Item 2
!! html
-
!! end
@@ -1149,8 +1127,7 @@ The ''[[Main Page]]'''s talk page.
!! end
!! test
-Parsoid only: Quote balancing context should be restricted to td/th cells on the same wikitext line
-(Requires tidy for PHP parser output to be fixed up)
+Quote balancing context should be restricted to td/th cells on the same wikitext line
!! options
parsoid=wt2html,wt2wt
!! wikitext
@@ -1158,20 +1135,15 @@ parsoid=wt2html,wt2wt
!''a!!''b
|''a||''b
|}
-!! html/php+tidy
+!! html+tidy
-
+
a
-
b
+
b
+
a
-
b
-
-
-!! html/parsoid
-
-
a
b
-
a
b
-
+
b
+
!! end
###
@@ -1275,32 +1247,33 @@ Text-level semantic html elements in wikitext
!! test
Ruby markup (W3C-style)
!! wikitext
-; Mono-ruby for individual base characters
-: æ¥æ¬èª
-; Group ruby
-: ä»æ¥
-; Jukugo ruby
-: æ³è¯çµ
-; Inline ruby
-: æ±äº¬
-; Double-sided ruby
-: æ§éå±±
+;Mono-ruby for individual base characters
+:æ¥æ¬èª
+;Group ruby
+:ä»æ¥
+;Jukugo ruby
+:æ³è¯çµ
+;Inline ruby
+:æ±äº¬
+;Double-sided ruby
+:æ§éå±±
+
â¥ââ¶
!! html
-
!! end
-# There is a tidy bug here: https://sourceforge.net/p/tidy/bugs/946/
-# If the non-word-character tag made it through the sanitizer, tidy
-# would munge it up.
!! test
-Non-word characters don't terminate tag names + tidy
+Non-word characters don't terminate tag names
!! wikitext
a
@@ -1352,12 +1322,13 @@ Non-word characters don't terminate tag names + tidy
!! html+tidy
-
<blockquote|>a
-
<bâ> doesn't terminate </bâ>
-
<bä> doesn't terminate </bä>
-
<boo> doesn't terminate </boo>
-
<s.foo> doesn't terminate </s.foo>
-
<sub-ID#1>
+
<blockquote|>a
+
<bâ> doesn't terminate </bâ>
+
<bä> doesn't terminate </bä>
+
<boo> doesn't terminate </boo>
+
<s.foo> doesn't terminate </s.foo>
+
<sub-ID#1>
+
!! end
###
@@ -1390,7 +1361,9 @@ parsoid=wt2html
s
!! html/php+tidy
-
!! end
@@ -1888,6 +1862,7 @@ IE conditional comments
###
### paragraph wrapping tests
###
+
!! test
No block tags
!! wikitext
@@ -1911,21 +1886,23 @@ a
foo
b
!! html+tidy
-
a
-
foo
-
b
+
a
foo
+
b
+
!! end
+# Remex wraps empty tag runs with p-tags.
+# Parsoid strips them out during p-wrapping.
!! test
No p-wrappable content
!! wikitext
x
x
x
-!! html+tidy
-
x
-
x
-
x
+!! html/php+tidy
+
x
+
x
+
x
!! html/parsoid
x
x
@@ -1954,11 +1931,9 @@ a
foo
b
!! html+tidy
-
a
-
-
foo
-
-
b
+
a
foo
+
b
+
!! end
!! test
@@ -1972,10 +1947,8 @@ a
foo
b
foo
!! html+tidy
-
a
-
foo
-
b
-
foo
+
a
foo
+b
foo
!! end
!! test
@@ -1989,14 +1962,8 @@ a
foo
b
foo
!! html+tidy
-
a
-
-
foo
-
-
b
-
-
foo
-
+
a
foo
+b
foo
!! end
!! test
@@ -2016,19 +1983,21 @@ d e
x
foo
z
!! html+tidy
-
foo
-
a
-
b c d e
-
x
-
foo
-
z
+
foo
a
+
b
+c
+d e
+
+x
foo
z
+
!! end
-# Tidy strips out the empty
tags. Parsoid doesn't.
-# So, we have a separate section for Parsoid. We don't want
-# to mimic this stripping behavior in Parsoid. It affects
-# editing experience and also requires us to maintain additional
-# info for RT-ing.
+# The difference between Parsoid & Remex here
+# is because of Parsoid's Tidy-emulation code
+# for p-wrapping. We'll start work to remove this
+# emulation code in Parsoid sooner than later.
+# Remex wraps empty tag runs with p-tags.
+# Parsoid strips them out in a separate pass.
!! test
Empty lines between lines with block tags
!! wikitext
@@ -2058,14 +2027,16 @@ b
e
!! html+tidy
-
-
a
-
b
-
a
-
b
-
b
-
d
-
+
+
+
+
a
+
b
+
+
a
b
+
b
d
+
+
e
!! html/parsoid
@@ -2082,7 +2053,6 @@ b
e
!! end
-## PHP parser emits output which is broken
!! test
Unclosed HTML p-tags should be handled properly
!! wikitext
@@ -2091,11 +2061,10 @@ a
b
!! html/php+tidy
-
-
foo
-
-
a
-
b
+
foo
+
a
+
b
+
!! html/parsoid
foo
a
@@ -2128,9 +2097,55 @@ parsoid=wt2html
a
!! end
+!! test
+No paragraph necessary for SOL transparent template
+!! wikitext
+
foo
+[[Category:Foo]]
+
+
foo
+{{echo|[[Category:Foo]]}}
+!! html/php
+
foo
+
foo
+
+!! html/parsoid
+
foo
+
+
+
foo
+
+!! end
+
+!! test
+Avoid expanding multiline sol transparent template ranges unnecessarily
+!! wikitext
+hi
+
+
+{{echo|
+}}
+
+[[Category:Ho]]
+!! html/php
+
hi
+
+
+
+!! html/parsoid
+
hi
+
+
+
+
+
+
+!! end
+
###
### Preformatted text
###
+
!! test
Preformatted text
!! wikitext
@@ -2276,9 +2291,6 @@ Foo bar baz quux
!! end
-# Note that the p-wrapping is newline sensitive, which could be
-# considered a bug: tidy will wrap only the 'Foo' in the example
-# below in a
tag. (see comment 23-25 of T8200)
!! test
T17491: / in blockquote (2)
!! wikitext
@@ -2289,9 +2301,8 @@ T17491: / in blockquote (2)
!! html+tidy
-
-
Foo
-bar baz quux
+
Foo
bar baz
quux
+
!! end
!! test
@@ -2426,7 +2437,6 @@ parsoid=wt2html
!! end
-# Parsoid doesn't strip empty tags, like Tidy does.
!! test
Empty pre; pre inside other HTML tags (T56946)
!! wikitext
@@ -2436,20 +2446,12 @@ a
foo
-!! html/php
+!! html/php+tidy
a
-
-foo
+
foo
-
-!! html/php+tidy
-
a
-
-
-foo
-
!! html/parsoid
a
@@ -2469,16 +2471,12 @@ HTML pre followed by indent-pre
!! end
-# Note that tidy removes the empty
tags from the start and end.
-# Parsoid does not, by design.
!! test
Block tag pre
!! wikitext
foo
!! html/php+tidy
-
-foo
-
+
foo
!! html/parsoid
foo
!! end
@@ -2641,10 +2639,8 @@ parsoid=wt2html
<pre
!! html/php+tidy
-
-x
-
-
<pre
+
x
+<pre
!! html/parsoid
x
@@ -2694,6 +2690,17 @@ parsoid=wt2html
!! end
+!! test
+Self-closed pre
+!! wikitext
+
+!! html/php
+
+
+!! html/parsoid
+
+!! end
+
!! test
Parsoid: Don't paragraph-wrap fosterable content even if table syntax is unbalanced
!! options
@@ -2745,7 +2752,7 @@ Templates: Strip leading and trailing whitespace from named-param values
!!end
@@ -3170,14 +3187,14 @@ c
!! wikitext
a
{|
- | b
+ |b
|}
!! html/php
a
-
b
+
b
!! html/parsoid
@@ -3260,17 +3277,11 @@ a
c
foo
foo
-!! html+tidy
-
a
-
foo
-
b
-
foo
-
c
-
-
foo
-
-
- foo
+!! html/php+tidy
+
a
foo
+ b
foo
+ c
foo
+
foo
!! end
@@ -3287,12 +3298,10 @@ a
!! html/parsoid
a foo
b
foo
-!! html+tidy
-
-a foo
-
-
b
-
foo
+!! html/php+tidy
+
a foo
+
+ b
foo
!!end
!!test
@@ -3527,7 +3536,8 @@ a b
!! html/php+tidy
-
a b
+
a b
+
!! html/parsoid
a this text should be part of the dl
+!! html/php+tidy
+
+
+
foo
+
+
bar
+
this text should be part of the dl
+!! html/parsoid
+
+
+
foo
+
+
bar
+
this text should be part of the dl
+!! end
+
!! test
Definition Lists: Hacky use to indent tables, with comments (T65979)
!! wikitext
@@ -4045,22 +4074,24 @@ Table / list interaction: indented table with lists in table contents
!! wikitext
:{|
|-
-| a
-* b
+|a
+
+*b
|-
-| c
-* d
+|c
+
+*d
|}
!! html
-
a
-
b
+
a
+
b
-
c
-
d
+
c
+
d
!! end
@@ -4097,13 +4128,11 @@ Table / list interaction: lists nested in tables nested in indented lists
!! test
Definition Lists: Nesting: Multi-level (Parsoid only)
-!! options
-parsoid
!! wikitext
;t1 :d1
;;t2 ::d2
;;;t3 :::d3
-!! html
+!! html/parsoid
t1
d1
@@ -4126,72 +4155,26 @@ parsoid
!! test
-Definition Lists: Nesting: Test 2 (Parsoid only)
+Definition Lists: Nesting: Test 2
!! wikitext
;t1
::d2
-!! html/php+tidy
-
-
t1
+!! html+tidy
+
t1
-
-
d2
-
-
-
-!! html/parsoid
-
-
t1
-
-
-
d2
-
-
-
-
+
d2
!! end
!! test
-Definition Lists: Nesting: Test 3 (Parsoid only)
+Definition Lists: Nesting: Test 3
!! wikitext
:;t1
::::d2
-!! html/php+tidy
-
-
-
-
t1
-
-
+!! html+tidy
+
t1
-
-
d2
-
-
-
-
-
-
-
-!! html/parsoid
-
-
-
-
t1
-
-
-
-
-
d2
-
-
-
-
-
-
-
-
+
d2
!! end
@@ -4216,42 +4199,30 @@ Definition Lists: Nesting: Test 4
!! test
Definition Lists: Mixed Lists: Test 1
!! wikitext
-:;* foo
-::* bar
-:; baz
+:;*foo
+::*bar
+:;baz
!! html/php
-
foo
-
bar
-
baz
+
foo
+
bar
+
baz
!! html/php+tidy
-
-
-
-
-
-
foo
-
bar
-
-
-
-
-
baz
-
-
-
+
foo
+
bar
+
baz
!! html/parsoid
-
foo
+
foo
-
bar
+
bar
-
baz
+
baz
!! end
@@ -4259,11 +4230,11 @@ Definition Lists: Mixed Lists: Test 1
!! test
Definition Lists: Mixed Lists: Test 2
!! wikitext
-*: d1
-*: d2
+*:d1
+*:d2
!! html
-
d1
-
d2
+
d1
+
d2
!! end
@@ -4271,11 +4242,11 @@ Definition Lists: Mixed Lists: Test 2
!! test
Definition Lists: Mixed Lists: Test 3
!! wikitext
-*::: d1
-*::: d2
+*:::d1
+*:::d2
!! html
-
d1
-
d2
+
d1
+
d2
!! end
@@ -4298,10 +4269,10 @@ Definition Lists: Mixed Lists: Test 4
Definition Lists: Mixed Lists: Test 5
!! wikitext
*:d1
-*:: d2
+*::d2
!! html
d1
-
d2
+
d2
!! end
@@ -4310,10 +4281,10 @@ Definition Lists: Mixed Lists: Test 5
Definition Lists: Mixed Lists: Test 6
!! wikitext
#*:d1
-#*::: d3
+#*:::d3
!! html
d1
-
d3
+
d3
!! end
@@ -4321,11 +4292,11 @@ Definition Lists: Mixed Lists: Test 6
!! test
Definition Lists: Mixed Lists: Test 7
!! wikitext
-:* d1
-:* d2
+:*d1
+:*d2
!! html
-
d1
-
d2
+
d1
+
d2
!! end
@@ -4333,11 +4304,11 @@ Definition Lists: Mixed Lists: Test 7
!! test
Definition Lists: Mixed Lists: Test 8
!! wikitext
-:* d1
-::* d2
+:*d1
+::*d2
!! html
-
d1
-
d2
+
d1
+
d2
!! end
@@ -4363,27 +4334,28 @@ Definition Lists: Mixed Lists: Test 10
!! end
+# The Parsoid team disagrees with the PHP parser's seemingly-random
+# rules regarding dd/dt on the next few tests. Parsoid is more
+# consistent, and recognizes the shared nesting and keeps the
+# still-open tags around until the nesting is complete.
+
# This is a regression test for T175099
-# html/php+tidy is insufficient since Tidy covers up the bug.
-# But once Tidy is replaced with RemexHTML, html/php+tidy is good enough
!! test
Definition Lists: Mixed Lists: Test 11
!! wikitext
-; a
-:* b
-!! html/*
-
a
+;a
+:*b
+!! html/php
+
a
-
b
+
b
+!! html/parsoid
+
a
+
b
!! end
-# The Parsoid team disagrees with the PHP parser's seemingly-random
-# rules regarding dd/dt on the next two tests. Parsoid is more
-# consistent, and recognizes the shared nesting and keeps the
-# still-open tags around until the nesting is complete.
-# (And tidy again converts
to
before 'bar'.)
-
+# FIXME: Maybe get rid of this test?
!! test
Definition Lists: Mixed Lists: Test 12
!! wikitext
@@ -4396,42 +4368,10 @@ Definition Lists: Mixed Lists: Test 12
baz
!! html/php+tidy
-
-
-
-
-
-
-
-
-
-
foo
-
-
-
-
-
-
-
bar
-
-
-
-
-
-
-
-
-
boo
-
baz
-
-
-
-
-
-
-
-
-
+
foo
+
bar
+
boo
+
baz
!! html/parsoid
@@ -4462,52 +4402,17 @@ Definition Lists: Mixed Lists: Test 12
!! end
-
-# Another case where tidy converts a
to a
(but Parsoid doesn't).
+# FIXME: Maybe get rid of this test?
# From whitelist:
# * The test is wrong, there are two colons where there should be :;
# * The PHP parser is wrong to close the
after the
containing the
.
!! test
Definition Lists: Weird Ones: Test 1
!! wikitext
-*#;*::;; foo : bar (who uses this?)
-!! html/php
-
@@ -4594,52 +4480,40 @@ Definition Lists: colons occurring in tags
a:b
!! end
+# Parsoid's output differs here again because it shares
+# nesting between the two lists unlike the PHP parser.
+# Unsure which is more desirable.
!! test
Definition Lists: colons and tables 1
!! wikitext
:{|
-| x
+|x
|}
:{|
-| y
+|y
|}
-!! html
+!! html/php
-
x
+
x
-
y
+
y
-!! end
-
-# Parsoid's output (as documented below) differs from php's in this case.
-# This is probably a bug. If we fixup parsoid to match php's output, the
-# above test should pass and the below test case can be removed. It is
-# unclear which output is more desirable.
-
-!! test
-Definition Lists: colons and tables 2
-!! wikitext
-:{|
-| x
-|}
-:{|
-| y
-|}
!! html/parsoid
-
x
+
x
-
y
+
y
!! end
+# FIXME: Does this need a html/php section?
!! test
Definition Lists: template interaction
!! wikitext
@@ -4688,9 +4562,9 @@ Numbered: [3]
!! html/parsoid
-
Numbered:
-Numbered:
-Numbered:
+
Numbered:
+Numbered:
+Numbered:
!!end
!! test
@@ -4729,7 +4603,7 @@ External links: dollar sign in URL (autonumber)
!! end
!! test
@@ -5358,17 +5232,22 @@ External links: link text with spaces
!! end
+# Note edge case difference between PHP and Parsoid here.
!! test
External links: wiki links within external link (T5695)
!! options
parsoid=wt2html,html2html
!! wikitext
[http://example.com [[wikilink]] embedded in ext link]
+
+[http://example.com test [[wikilink]] embedded in ext link]
!! html/php
!! end
# According to https://www.w3.org/TR/2011/WD-html5-20110525/Overview.html#parsing-urls a plain
@@ -5489,7 +5368,7 @@ http://www.example.com/?title=100%25_Bran
!! end
!! test
@@ -5617,17 +5496,16 @@ External link containing double-single-quotes in text embedded in italics (T6598
!! end
+# Don't add the html/php section since the output is broken and there isn't any reason to spec it
!! test
External link containing double-single-quotes with no space separating the url from text in italics
!! wikitext
[http://www.musee-picasso.fr/pages/page_id18528_u1l2.htm''La muerte de Casagemas'' (1901) en el sitio de [[Museo Picasso (ParÃs)|Museo Picasso]].]
-!! html/php
-
!! end
!! test
@@ -6138,15 +6017,15 @@ A table with no data (take 2)
A table with nothing but a caption
!! wikitext
{|
-|+ caption
+|+caption
|}
!! html/php
-
caption
+
caption
!! html/parsoid
-
caption
+
caption
!! end
!! test
@@ -6155,14 +6034,14 @@ A table with caption with default-spaced attributes and a table row
{|
|+ style="color: red;" | caption1
|-
-| foo
+|foo
|}
!! html
-
caption1
+
caption1
-
foo
+
foo
!! end
@@ -6172,18 +6051,18 @@ A table with captions with non-default spaced attributes and a table row
!! wikitext
{|
|+style="color: red;"|caption2
-|+ style="color: red;"| caption3
+|+ style="color: red;"|caption3
|-
-| foo
+|foo
|}
!! html
caption2
-
caption3
+
caption3
-
foo
+
foo
!! end
@@ -6192,23 +6071,23 @@ A table with captions with non-default spaced attributes and a table row
Table td-cell syntax variations
!! wikitext
{|
-| foo bar foo | baz
-| foo bar foo || baz
-| style='color:red;' | baz
-| style='color:red;' || baz
+|foo bar foo|baz
+|foo bar foo||baz
+|style='color:red;'|baz
+|style='color:red;'||baz
|}
!! html
!! end
@@ -6238,17 +6117,17 @@ Simple table
Simple table but with multiple dashes for row wikitext
!! wikitext
{|
-| foo
+|foo
|-----
-| bar
+|bar
|}
!! html
!! end
@@ -6328,13 +6207,13 @@ Multiplication table
Accept "||" in table headings
!! wikitext
{|
-!h1 || h2
+!h1||h2
|}
!! html
-
h1
-
h2
+
h1
+
h2
!! end
@@ -6343,12 +6222,12 @@ Accept "||" in table headings
Accept "!!" in table data
!! wikitext
{|
-| Foo!! ||
+|Foo!!||
|}
!! html
-
Foo!!
+
Foo!!
@@ -6362,13 +6241,13 @@ Accept "!!" in table data
Accept "||" in indented table headings
!! wikitext
:{|
-!h1 || h2
+!h1||h2
|}
!! html
-
h1
-
h2
+
h1
+
h2
!! end
@@ -6420,15 +6299,12 @@ Accept "!!" in table data of mixed wikitext / html syntax
!a
b!!c
|}
-!! html+tidy
+!! html/php+tidy
-
-
a
-
-
-
b!!c
-
-
+
+
a
+
b!!c
+
!! html/parsoid
a
@@ -6446,9 +6322,9 @@ Accept empty attributes in td/th cells (td/th cells starting with leading ||)
!! html
-
h1
+
h1
-
a
+
a
!! end
@@ -6458,13 +6334,13 @@ Accept "| !" at start of line in tables (ignore !-attribute)
!! wikitext
{|
|-
-| !style="color:red" | bar
+|!style="color:red"|bar
|}
!! html
-
bar
+
bar
!!end
@@ -6477,8 +6353,8 @@ Allow +/- in 2nd and later cells in a row, in 1st cell when td-attrs are present
|style='color:red;'|+1
|style='color:blue;'|-1
|-
-| 1 || 2 || 3
-| 1 ||+2 ||-3
+|1||2||3
+|1||+2||-3
|-
| +1
| -1
@@ -6492,18 +6368,18 @@ Allow +/- in 2nd and later cells in a row, in 1st cell when td-attrs are present
-1
-
1
-
2
-
3
+
1
+
2
+
3
-
1
-
+2
+
1
+
+2
-3
-
+1
+
+1
-
-1
+
-1
!!end
@@ -6512,26 +6388,26 @@ Allow +/- in 2nd and later cells in a row, in 1st cell when td-attrs are present
Table rowspan
!! wikitext
{| border=1
-| Cell 1, row 1
-|rowspan=2| Cell 2, row 1 (and 2)
-| Cell 3, row 1
+|Cell 1, row 1
+|rowspan=2|Cell 2, row 1 (and 2)
+|Cell 3, row 1
|-
-| Cell 1, row 2
-| Cell 3, row 2
+|Cell 1, row 2
+|Cell 3, row 2
|}
!! html
-
Cell 1, row 1
+
Cell 1, row 1
-
Cell 2, row 1 (and 2)
+
Cell 2, row 1 (and 2)
-
Cell 3, row 1
+
Cell 3, row 1
-
Cell 1, row 2
+
Cell 1, row 2
-
Cell 3, row 2
+
Cell 3, row 2
!! end
@@ -6552,7 +6428,7 @@ Nested table
!! html
-
α
+
α
@@ -6597,7 +6473,7 @@ Table cell attributes: Pipes protected by nowikis should be treated as a plain c
!! end
!! test
Element attributes with double ! should not be broken up by
!! wikitext
{|
-! hi
ha
ho
+!hi
ha
ho
|}
!! html/php
-
hi
ha
ho
+
hi
ha
ho
!! html/parsoid
-
hi
ha
ho
+
hi
ha
ho
!! end
@@ -6655,17 +6531,17 @@ Element attributes with double ! should not be broken up by
! and || in element attributes should not be parsed as
/
!! wikitext
{|
-|
hi
+|
hi
|}
!! html/php
-
hi
+
hi
!! html/parsoid
-
hi
+
hi
!! end
@@ -6676,18 +6552,18 @@ Element attributes with double ! should not be broken up by
parsoid=wt2html
!! wikitext
{|
-| style="color: red !important;" data-contrived="put this here ||" | foo
+|style="color: red !important;" data-contrived="put this here ||"|foo
|}
!! html/php
-
style="color: red !important;" data-contrived="put this here
-
foo
+
style="color: red !important;" data-contrived="put this here
+
foo
!! html/parsoid
-
style="color: red !important;" data-contrived="put this here
foo
+
style="color: red !important;" data-contrived="put this here
foo
!! end
@@ -6719,7 +6595,7 @@ Don't break on | in extension attribute in template
!! html/parsoid
-
!! end
@@ -6945,17 +6821,17 @@ Table attributes with empty value
parsoid=wt2html,html2html
!! wikitext
{|
-| style=| hello
+| style=|hello
|}
!! html/php
-
hello
+
hello
!! html/parsoid
-
hello
+
hello
!! end
@@ -6964,7 +6840,7 @@ Wikitext table with a lot of comments
!! wikitext
{|
-| foo
+|foo
|-
@@ -6974,7 +6850,7 @@ Wikitext table with a lot of comments
!! html
-
foo
+
foo
@@ -6987,18 +6863,18 @@ Wikitext table comments represented in parsoid dom
!! wikitext
{|
|-
-| x
+|x
|}
!! html/php+tidy
-
-
x
-
-
+
+
+
x
+
!! html/parsoid
-
x
+
x
!! end
@@ -7024,14 +6900,14 @@ Table cell with a single comment
!! wikitext
{|
|
-| a
+|a
|}
!! html
-
a
+
a
!! end
@@ -7042,21 +6918,21 @@ Table-cell after a comment-only-empty-line
{|
|a
-| b
+|b
|}
!! html
a
-
b
+
b
!! html/parsoid
a
-
b
+
b
!! end
@@ -7065,21 +6941,21 @@ Table-cell after a comment-only-empty-line
Build table with {{!}}
!! wikitext
{{{!}} class="wikitable"
-! header
-! second header
+!header
+!second header
{{!}}- style="color:red;"
-{{!}} data {{!}}{{!}} style="color:red;" {{!}} second data
+{{!}}data{{!}}{{!}} style="color:red;" {{!}}second data
{{!}}}
!! html
-
header
+
header
-
second header
+
second header
-
data
-
second data
+
data
+
second data
!! end
@@ -7088,33 +6964,33 @@ Build table with {{!}}
Build table with pipe as data
!! wikitext
{| class="wikitable"
-! header
-! second header
+!header
+!second header
|- style="color:red;"
-| data || style="color:red;" | second data
+|data|| style="color:red;" |second data
|-
-| style="color:red;" | data with | || style="color:red;" | second data with |
+| style="color:red;" |data with | || style="color:red;" | second data with |
|-
-|| data with | ||| second data with |
+||data with | |||second data with |
|}
!! html
-
header
+
header
-
second header
+
second header
-
data
-
second data
+
data
+
second data
-
data with |
-
second data with |
+
data with |
+
second data with |
-
data with |
-
second data with |
+
data with |
+
second data with |
!! end
@@ -7123,25 +6999,25 @@ Build table with pipe as data
Build table with wikilink
!! wikitext
{| class="wikitable"
-! header || second header
+!header||second header
|- style="color:red;"
-| data [[Main Page|linktext]] || second data [[Main Page|linktext]]
+|data [[Main Page|linktext]]||second data [[Main Page|linktext]]
|-
-| data || second data [[Main Page|link|text with pipe]]
+|data||second data [[Main Page|link|text with pipe]]
|}
!! html
@@ -7214,24 +7094,24 @@ parsoid=wt2html,html2html
!! end
!! test
-Table cells not properly parsed in an implicit-td context
+Template generated table cell with attributes
!! wikitext
{|
|-
-{{table_attribs_4}} || a || b
+{{table_attribs_4}} ||a||b
|}
!! html/php+tidy
-
+
+
a
-
b
-
-
+
b
+
!! html/parsoid
-
a
b
+
a
b
!! end
!! test
@@ -7244,21 +7124,18 @@ parsoid=wt2html,wt2wt
|} bar
{|
-|baz
-|}quux
-!! html+tidy
-
-
-
foo
-
-
-
bar
+|baz
+|}quux
+!! html+tidy
-
-
baz
-
-
-
quux
+
+
foo
+
bar
+
+
+
baz
+
quux
+
!! end
!! test
@@ -7299,17 +7176,17 @@ Parsoid: Row-syntax table headings followed by comment & table cells
parsoid=wt2html,wt2wt
!! wikitext
{|
-! foo || bar
- || baz || quux
+!foo||bar
+ ||baz||quux
|}
!! html/php
+has query
+is just fragment
!! end
!! test
@@ -9380,6 +9258,7 @@ language=is
Redirect syntax under text isn't considered a redirect
!! wikitext
some text
+
#redirect [[Main Page]]
!! html/parsoid
some text
@@ -9402,9 +9281,9 @@ Redirect followed by block on the same line
!! options
parsoid=wt2html
!! wikitext
-#REDIRECT [[Main Page]]== hi ==
+#REDIRECT [[Main Page]]==hi==
!! html/parsoid
-
hi
+
hi
!! end
!! test
@@ -9475,8 +9354,9 @@ parsoid=wt2html
!! html+tidy
-
-
+
+
+
!! end
!! test
@@ -9568,10 +9448,9 @@ foo bar
!! html+tidy
-
-
foo
-
-
bar
+
+foo
bar
+
!! end
!! test
@@ -9620,8 +9499,8 @@ Horizontal ruler -- Supports content following dashes on same line
Foo
!! html+tidy
-
-
Foo
+
Foo
+
!! end
###
@@ -9631,11 +9510,11 @@ Horizontal ruler -- Supports content following dashes on same line
Common list
!! wikitext
*Common list
-* item 2
+*item 2
*item 3
!! html
Common list
-
item 2
+
item 2
item 3
!! end
@@ -9645,21 +9524,22 @@ Numbered list
!! wikitext
#Numbered list
#item 2
-# item 3
+#item 3
!! html
Numbered list
item 2
-
item 3
+
item 3
!! end
+# the switch from level 3 to ordered should not introduce a newline between
!! test
Mixed list
!! wikitext
*Mixed list
-*# with numbers
-** and bullets
-*# and numbers
+*#with numbers
+**and bullets
+*#and numbers
*bullets again
**bullet level 2
***bullet level 3
@@ -9669,13 +9549,13 @@ Mixed list
**#Number on level 3
*#number level 2
*Level 1
-*** Level 3
-#** Level 3, but ordered
+***Level 3
+#**Level 3, but ordered
!! html
Mixed list
-
with numbers
-
and bullets
-
and numbers
+
with numbers
+
and bullets
+
and numbers
bullets again
bullet level 2
bullet level 3
@@ -9685,43 +9565,43 @@ Mixed list
Number on level 3
number level 2
Level 1
-
Level 3
-
Level 3, but ordered
+
Level 3
+
Level 3, but ordered
!! end
!! test
1. Nested mixed wikitext and html list
!! wikitext
-* hi
-*
ho
-* hi
-** ho
+*hi
+*
ho
+*hi
+**ho
!! html/php
-
hi
-
ho
-
hi
-
ho
+
hi
+
ho
+
hi
+
ho
!! html/parsoid
-
hi
-
ho
-
hi
-
ho
+
hi
+
ho
+
hi
+
ho
!! end
!! test
2. Nested mixed wikitext and html list (incompatible)
!! wikitext
-; hi
-: {{echo|
ho
}}
+;hi
+:{{echo|
ho
}}
!! html/php
-
hi
-
ho
+
hi
+
ho
!! html/parsoid
-
hi
-
ho
+
hi
+
ho
!! end
!! test
@@ -9793,24 +9673,24 @@ Nested lists 6 (both elements empty)
!! test
Nested lists 7 (skip initial nesting levels)
!! wikitext
-*** foo
+***foo
!! html
-
foo
+
foo
!! end
!! test
Nested lists 8 (multiple nesting transitions)
!! wikitext
-* foo
-*** bar
-** baz
-* boo
+*foo
+***bar
+**baz
+*boo
!! html
-
foo
-
bar
-
baz
-
boo
+
foo
+
bar
+
baz
+
boo
!! end
@@ -9851,60 +9731,61 @@ parsoid
!! test
List items are not parsed correctly following a
block (T2785)
!! wikitext
-*
foo
-*
bar
-* zar
+*
foo
+*
bar
+*zar
!! html/php
-
foo
-
bar
-
zar
+
foo
+
bar
+
zar
!! html/parsoid
-
foo
-
bar
-
zar
+
foo
+
bar
+
zar
!! end
+# FIXME: Might benefit from a html/parsoid since this has a template
!! test
List items from template
!! wikitext
{{inner list}}
-* item 2
+*item 2
-* item 0
+*item 0
{{inner list}}
-* item 2
+*item 2
-* item 0
-* notSOL{{inner list}}
-* item 2
+*item 0
+*notSOL{{inner list}}
+*item 2
!! html
-
item 1
-
item 2
-
item 0
-
item 1
-
item 2
-
item 0
-
notSOL
-
item 1
-
item 2
+
item 1
+
item 2
+
item 0
+
item 1
+
item 2
+
item 0
+
notSOL
+
item 1
+
item 2
!! end
!! test
List interrupted by empty line or heading
!! wikitext
-* foo
+*foo
-** bar
-== A heading ==
-* Another list item
+**bar
+==A heading==
+*Another list item
!! html
-
!!end
@@ -9922,11 +9803,14 @@ Multiple list tags generated by templates
!! html+tidy
-
-
a
-
b
-
c
-
+
a
+
b
+
c
+
+!! html/parsoid
+
a
+
b
+
c
!!end
!!test
@@ -9966,36 +9850,36 @@ Replacing whitespace with tabs still doesn't break the list (gerrit 78327)
!!end
+# FIXME: Parsoid has a dedicated DOM pass to mimic this Tidy-specific li-hack
+# That pass could possibly be removed.
!!test
-Test the li-hack
-(The PHP parser relies on Tidy for the hack)
+Test the li-hack (a hack from Tidy days, but doesn't work as advertised with Remex)
!!options
parsoid=wt2html,wt2wt
!! wikitext
-* foo
-*
li-hack
-* {{echo|
templated li-hack}}
-*
unsupported li-hack with preceding comments
+*foo
+*
li-hack
+*{{echo|
templated li-hack}}
+*
unsupported li-hack with preceding comments
not a li-hack
!! html+tidy
+
foo
+
li-hack
+
templated li-hack
+
unsupported li-hack with preceding comments
-
foo
-
li-hack
-
templated li-hack
-
unsupported li-hack with preceding comments
-
-
-
not a li-hack
+
not a li-hack
+
!! html/parsoid
foo
-
li-hack
-
templated li-hack
-
unsupported li-hack with preceding comments
+
li-hack
+
templated li-hack
+
unsupported li-hack with preceding comments
not a li-hack
@@ -10009,24 +9893,26 @@ Parsoid: Make sure nested lists are serialized on their own line even if HTML co
!! options
parsoid
!! wikitext
-# foo
-## bar
-* foo
-** bar
-: foo
-:: bar
+#foo
+##bar
+
+*foo
+**bar
+
+:foo
+::bar
!! html
-
foo
-
bar
+
foo
+
bar
-
foo
-
bar
+
foo
+
bar
-
foo
-
bar
+
foo
+
bar
!! end
@@ -10048,101 +9934,103 @@ parsoid
# tags (parse, minimize scope of fixup, and roundtrip back)
# ------------------------------------------------------------------------
+# Remex and Parsoid output stems from list handling diffs because Parsoid & PHP parser.
+# Parsoid's list handling is more aware of block structure.
!! test
Unbalanced closing block tags break a list
-(php parser relies on Tidy to fix up)
!! wikitext
*a
*b
!! html+tidy
-
+
a
+
b
+!! html/parsoid
+
a
-
-
-
-
+
+
b
-
-
+
!! end
-# Parsoid fails this test, but it might be tricky to support properly.
-# See T70395.
!! test
Unbalanced closing non-block tags don't break a list
-(php parser relies on Tidy to fix up)
!! wikitext
*a
*b
!! html/php+tidy
-
-
a
-
b
-
+
+
+
a
+
b
!! html/parsoid
-
a
-
-
b
-
+
a
+
b
!! end
+# Parsoid does some post-dom-building cleanup
+# which is why its output differs from Remex.
!! test
Unclosed formatting tags that straddle lists are closed and reopened
-(php parser relies on Tidy to fix up)
!! options
parsoid=wt2html,wt2wt,html2html
!! wikitext
-# a
-# b
+# a
+#b
!! html/php+tidy
-
-
a
-
b
-
+
a
+
b
!! html/parsoid
-
a
-
b
+
a
+
b
!! end
+# Output is ugly because of all the misnested tag fixups.
+# Remex is wrapping p-tags around empty elements.
+# Parsoid has special-case handling of this pattern of
+# wrapping lists in formatting tags.
+# FIXME: Should we remove this code from Parsoid? Or add
+# special support in Remex? If the latter, maybe just wait
+# for Parsoid to become the default parser.
# See T70395.
!!test
1. List embedded in a formatting tag
!! wikitext
-* foo
+*foo
!! html/php+tidy
-
-
foo
-
+
+
foo
+
!! html/parsoid
-
foo
+
foo
!!end
-## Ugly Parsoid output here
-## Not sure what the right output is.
+# Output is ugly because of all the misnested tag fixups
+# Remex is wrapping p-tags around empty elements.
+# Parsoid has code that strips useless p-tags.
!!test
-2. List embedded in a formatting tag
+2. List embedded in a formatting tag in a misnested way
!! wikitext
*a
*b
!! html/php+tidy
-
!!end
-# Ugly Parsoid and PHP parser output here
-# Not sure if we want to make this a test!
-#
-## !!test
-## 3. Unclosed formatting tags in list elements
-## !! wikitext
-## *a
-## *b
-## !! html/php+tidy
-##
-##
a
-##
b
-##
-## !! html/parsoid
-##
-##
a
-##
-##
b
-##
-## !!end
-
-# This is a bug in the PHP parser + tidy combination.
-# (The tag gets parsed as text and html-escaped by PHP,
-# and then fostered out of the table by tidy.)
-# We believe the Parsoid output to be correct.
!! test
Table with missing opening
tag
!! options
@@ -10188,10 +10051,9 @@ parsoid=wt2html,wt2wt
!! html+tidy
-
-
foo
+
foo
-
+
!! end
###
@@ -10332,35 +10194,35 @@ Magic Word: {{CURRENTTIMESTAMP}}
!! test
Magic Words LOCAL (UTC)
!! wikitext
-* {{LOCALMONTH}}
-* {{LOCALMONTH1}}
-* {{LOCALMONTHNAME}}
-* {{LOCALMONTHNAMEGEN}}
-* {{LOCALMONTHABBREV}}
-* {{LOCALDAY}}
-* {{LOCALDAY2}}
-* {{LOCALDAYNAME}}
-* {{LOCALYEAR}}
-* {{LOCALTIME}}
-* {{LOCALHOUR}}
-* {{LOCALWEEK}}
-* {{LOCALDOW}}
-* {{LOCALTIMESTAMP}}
-!! html
-
!! end
!! test
@@ -11432,11 +11288,11 @@ Templates with templated name
!! html
foo
-
item 1
+
item 1
!! html/parsoid
foo
-
item 1
+
item 1
!! end
## Regression test; the output here isn't really that interesting.
@@ -11474,12 +11330,7 @@ Template with thumb image (with link in description)
This is a test template with parameter
linkcaption
!! end
@@ -11525,28 +11376,28 @@ T2553: link with two variables in a piped link
Abort table cell attribute parsing on wikilink
!! wikitext
{|
-| testing [[one|two]] | three || four
-| testing one two | three || four
-| testing="[[one|two]]" | three || four
+|testing [[one|two]] |three||four
+|testing one two |three||four
+|testing="[[one|two]]" |three||four
|}
!! html/php
!! end
@@ -11554,11 +11405,11 @@ Abort table cell attribute parsing on wikilink
Don't abort table cell attribute parsing if wikilink is found in template arg
!! wikitext
{|
-| Test {{#tag:ref|One two "[[three]]" four}}
+|Test {{#tag:ref|One two "[[three]]" four}}
|}
!! html/parsoid
!! end
@@ -11763,21 +11614,13 @@ Templates with intersecting and overlapping ranges
{{echo|{{!}}hi}}
|}
!! html/php+tidy
-
ha
-
ho
-
-
-
-
-
-
hi
-
-
-
-
-
-
-
+
ha
+
+
ho
+
+
+
hi
+
!! html/parsoid
ha
@@ -12023,32 +11866,32 @@ Includes and comments at SOL
!! options
parsoid=wt2html,html2html
!! wikitext
-== hu ==
+==hu==
some
-* stuff
-* here
+*stuff
+*here
-can have stuff=== here ===
+can have stuff===here===
!! html/php
hu
some
-
stuff
-
here
+
stuff
+
here
here
!! html/parsoid
-
hu
+
hu
some
-
stuff
-
here
+
stuff
+
here
-
here
+
here
!! end
@@ -12267,10 +12110,10 @@ Preprocessor precedence 5: tplarg takes precedence over template
!! wikitext
{{Precedence5|Bullet}}
!! html/php
-
Bar
+
Bar
!! html/parsoid
-
Bar
+
Bar
!! end
!! test
@@ -12360,14 +12203,14 @@ Preprocessor precedence 9: groups of braces
{{Preprocessor precedence 9|Four|Bullet|1|2}}
!! html/php
@@ -12473,43 +12316,34 @@ Preprocessor precedence 12: broken language converter closed by brace.
parsoid=wt2html
!! wikitext
This form breaks the template, which is unfortunate:
-* {{echo|foo-{bar}bat}}
+*{{echo|foo-{bar}bat}}
But if the broken language converter markup is inside an extension
tag, nothing bad happens:
-* foo-{bar}bat
-* {{echo|foo-{bar}bat}}
-*
This form breaks the template, which is unfortunate:
-
-
{{echo|foo-{bar}bat}}
-
-
But if the broken language converter markup is inside an extension tag, nothing bad happens:
-
-
foo-{bar}bat
-
foo-{bar}bat
-
-
-foo-{bar}bat
-
-
-
-foo-{bar}bat
-
-
-
-'foo-{bar}bat'
+
This form breaks the template, which is unfortunate:
+
+
{{echo|foo-{bar}bat}}
+
But if the broken language converter markup is inside an extension
+tag, nothing bad happens:
+
+
foo-{bar}bat
+
foo-{bar}bat
+
foo-{bar}bat
+
foo-{bar}bat
+
'foo-{bar}bat'
array (
)
-
-'foo-{bar}bat'
+
'foo-{bar}bat'
array (
)
@@ -12533,40 +12367,36 @@ Preprocessor precedence 13: broken language converter in external link
!! options
parsoid=wt2html
!! wikitext
-* [http://example.com/-{foo Example in URL]
-* [http://example.com Example in -{link} description]
-* {{echo|[http://example.com/-{foo Breaks template, however]}}
+*[http://example.com/-{foo Example in URL]
+*[http://example.com Example in -{link} description]
+*{{echo|[http://example.com/-{foo Breaks template, however]}}
!! html/php+tidy
-
!! end
!! test
Preprocessor precedence 14: broken language converter in comment
!! wikitext
-* ...should be ok
-* ...extra dashes
-* {{echo|foobat}} ...should be ok
+*...should be ok
+*...extra dashes
+*{{echo|foobat}}...should be ok
!! html/php+tidy
-
-
...should be ok
+
...should be ok
...extra dashes
-
foobat ...should be ok
-
+
foobat...should be ok
!! html/parsoid
-
...should be ok
-
...extra dashes
-
foobat ...should be ok
+
...should be ok
+
...extra dashes
+
foobat...should be ok
!! end
@@ -12592,17 +12422,23 @@ __NOTOC__ __NOEDITSECTION__
6
!! html/php+tidy
1 foo[bar 1
-
1
+
1
+
2 foo[[bar 2
-
2
+
2
+
3 foo{bar 3
-
3
+
3
+
4 foo{{bar 4
-
4
+
4
+
5 foo{{{bar 5
-
5
+
5
+
6 foo-{bar 6
-
6
+
6
+
!! html/parsoid
1 foo[bar 1
@@ -12646,6 +12482,32 @@ parsoid=wt2html
hi {{}}
!! end
+!! test
+Preprocessor precedence 18: another rightmost wins scenario
+!! options
+parsoid=wt2html
+!! wikitext
+{{ -{{{{1|tplarg}}} }} }-
+!! html/php
+
{{ -{tplarg }} }-
+
+!! html/parsoid
+
{{ -{tplarg }} }-
+!! end
+
+!! test
+Preprocessor precedence 19: break syntax
+!! options
+parsoid=wt2html
+!! wikitext
+-{{
+!! html/php
+
-{{
+
+!! html/parsoid
+
-{{
+!! end
+
###
### Token Stream Patcher tests
###
@@ -12775,9 +12637,7 @@ Templates: 2. Inside a block tag
!! html+tidy
Foo
-
-
Foo
-
+
Foo
!!end
!!test
@@ -12816,9 +12676,9 @@ Templates: P-wrapping: 1c. Templates on consecutive lines
bar
baz
!! html+tidy
-
Foo
-
bar
-
baz
+
Foo
+
+bar
baz
!! end
!!test
@@ -13112,17 +12972,17 @@ Templates: Support for templates generating attributes and content
4. Entities and nowikis inside templated attributes should be handled correctly inside templated tables
!! wikitext
{|
-| {{table_attribs_6}} hi
+|{{table_attribs_6}} hi
|}
!! html/php
-
hi
+
hi
!! html/parsoid
-
hi
+
hi
!! end
@@ -13241,12 +13101,13 @@ Templates: Wiki Tables: 1a. Fostering of entire template content
a
-!! html+tidy
-
a
-
-
-
-
+!! html/php+tidy
+
+a
+
+!! html/parsoid
+
a
+
!! end
@@ -13266,14 +13127,18 @@ foo
-!! html+tidy
+!! html/php+tidy
+
foo
+
+
+
+
+!! html/parsoid
+
foo
-
-
-
-
-
+
+
!! end
@@ -13290,13 +13155,15 @@ a
b
-!! html+tidy
-
a
-
b
-
-
-
-
+!! html/php+tidy
+
+a
+
b
+
+!! html/parsoid
+
a
b
+
+
!! end
@@ -13366,7 +13233,7 @@ Templates: Wiki Tables: 7. Fosterable s should get fostered
!!html/parsoid
-[1]
!! end
!! test
@@ -14545,18 +14346,11 @@ thumbsize=220
123
456
!! html/php+tidy
-
123456
-
123
-
-
456 123
-
-
-
-
-
-
-
-
456
+
123456
+
+123
456
+123
456
+
!! html/parsoid
123456
123
456
@@ -14703,7 +14497,7 @@ Image with link parameter, wgNoFollowLinks set to false
[[Image:foobar.jpg|link=http://example.com/]]
!! config
wgNoFollowLinks=false
-!! html
+!! html/php
!! end
@@ -14714,7 +14508,7 @@ Image with link parameter, wgNoFollowDomainExceptions
[[Image:foobar.jpg|link=http://example.com/]]
!! config
wgNoFollowDomainExceptions='example.com'
-!! html
+!! html/php
!! html/parsoid
-Please mailto:nobody@example.com
+Please mailto:nobody@example.com
!! end
# Pending resolution to T2368
@@ -15430,6 +15224,10 @@ Image: caption containing leading space
bar
!!end
+# html/php output not have newlines after table, td, th, etc. because
+# Linker::makeThumbLink2() replaces the newlines with spaces since
+# the table is inside a caption.
+# FIXME: Verify if that circa 2004 fix is still required.
!! test
Image: caption containing a table
!! options
@@ -15437,21 +15235,21 @@ parsoid=wt2html,wt2wt,html2html
!! wikitext
[[Image:Foobar.jpg|thumb|200px|This is an example image thumbnail caption with a table
{|
-! Foo !! Bar
+!Foo!!Bar
|-
-| Foo1 || Bar1
+|Foo1||Bar1
|}
and some more text.]]
!! html/php
-
This is an example image thumbnail caption with a table
Foo
Bar
Foo1
Bar1
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
-
Foo
Bar
+
Foo
Bar
-
Foo1
+
Foo1
Bar1
and some more text.
!! end
@@ -15463,7 +15261,7 @@ T5090: External links other than http: in image captions
!! html/parsoid
-This caption has irc and Secure ext links in it.
+This caption has irc and Secure ext links in it.
!! end
!! test
@@ -15799,7 +15597,7 @@ T93580: 1. Templated inside block images
!! html/parsoid
-Caption with templated ref: [1]
+Caption with templated ref: [1]
@@ -16914,9 +16713,9 @@ Link inside a section heading
TOC regression (T14077)
!! wikitext
__TOC__
-== title 1 ==
-=== title 1.1 ===
-== title 2 ==
+==title 1==
+===title 1.1===
+==title 2==
!! html
!!end
# Parsoid doesn't wt2wt this cleanly because it adds s.
@@ -16977,19 +16776,19 @@ Header with special characters (T27462)
!! wikitext
The tooltips shall not show entities to the user (ie. be double escaped)
-== text > text ==
+==text > text==
section 1
-== text < text ==
+==text < text==
section 2
-== text & text ==
+==text & text==
section 3
-== text ' text ==
+==text ' text==
section 4
-== text " text ==
+==text " text==
section 5
!! html/php
The tooltips shall not show entities to the user (ie. be double escaped)
@@ -17022,19 +16821,19 @@ section 5
!! html/parsoid
The tooltips shall not show entities to the user (ie. be double escaped)
-
text > text
+
text > text
section 1
-
text < text
+
text < text
section 2
-
text & text
+
text & text
section 3
-
text ' text
+
text ' text
section 4
-
text " text
+
text " text
section 5
!! end
@@ -17043,22 +16842,22 @@ Header with space, plus and underscore as entity
!! wikitext
Id should not contain + for spaces
-== Space between Text ==
+==Space between Text==
section 1
-== Space-Entity between Text ==
+==Space-Entity between Text==
section 2
-== Plus+between+Text ==
+==Plus+between+Text==
section 3
-== Plus-Entity+between+Text ==
+==Plus-Entity+between+Text==
section 4
-== Underscore_between_Text ==
+==Underscore_between_Text==
section 5
-== Underscore-Entity_between_Text ==
+==Underscore-Entity_between_Text==
section 6
[[#Space between Text]]
@@ -17108,22 +16907,22 @@ section 6
!! html/parsoid
Id should not contain + for spaces
-
Space between Text
+
Space between Text
section 1
-
Space-EntitybetweenText
+
Space-EntitybetweenText
section 2
-
Plus+between+Text
+
Plus+between+Text
section 3
-
Plus-Entity+between+Text
+
Plus-Entity+between+Text
section 4
-
Underscore_between_Text
+
Underscore_between_Text
section 5
-
Underscore-Entity_between_Text
+
Underscore-Entity_between_Text
section 6
#Space between Text
@@ -17172,13 +16971,13 @@ HTML headers vs TOC (T25393)
(__NOEDITSECTION__ for clearer output, doesn't matter here)
!! wikitext
!!end
!! test
@@ -17357,23 +17157,37 @@ parsoid=wt2html,html2html
HTML rocks
!! end
+# FIXME Parsoid doesn't actually match PHP here.
+# Probably we should use the synthetic or
+# extensions for this test, which are enabled when running parser tests.
+!! test
+Extension tag in attribute value
+!! wikitext
+ok
+!! html/php+disabled
+
+!! end
+
!! test
table with multiple empty attribute values
!! options
parsoid=wt2html,html2html
!! wikitext
{| title= id=
-| hi
+|hi
|}
!! html/php
-
hi
+
hi
!! html/parsoid
-
hi
+
hi
!! end
@@ -17414,12 +17228,12 @@ HTML multiple attributes correction
Table multiple attributes correction
!! wikitext
{|
-!+ class="error" class="awesome"| status
+!+ class="error" class="awesome"|status
|}
!! html
-
status
+
status
!!end
@@ -17464,11 +17278,9 @@ Remember AT&T?
text with character entity: eacute
!! wikitext
I always thought é was a cute letter.
-!! html
+!! html+tidy
!! end
!! test
@@ -17546,12 +17358,11 @@ Ensure that HTML adoption agency algorithm is properly implemented.
!! end
# This was T43545 in the PHP parser.
-# Note that tidy doesn't handle this correctly.
!! test
Nesting of
!! wikitext
XYZ
-!! html
+!! html+tidy
XYZ
!! end
@@ -17560,22 +17371,20 @@ Nesting of
# Note that there are some other nestable tags (b, i, etc) which are
# not covered; see T53081 for discussion.
-# Note that tidy doesn't handle this correctly.
!! test
Nesting of
!! wikitext
XYZ
-!! html
+!! html+tidy
XYZ
!! end
-# Note that tidy doesn't handle this correctly.
!! test
Nesting of
!! wikitext
XYZ
-!! html
+!! html+tidy
XYZ
!! end
@@ -17585,10 +17394,10 @@ Nesting of
!! wikitext
XYZ
!! html+tidy
-
XYZ
+
XYZ
+
!! end
-# Note that tidy doesn't handle this correctly.
!! test
Nesting of
!! wikitext
@@ -17598,7 +17407,6 @@ Nesting of
!! end
-# Note that tidy doesn't handle this correctly.
!! test
Nesting of
!! wikitext
@@ -17643,6 +17451,7 @@ Media link with text
# FIXME: this is still bad HTML tag nesting
# FIXME: doBlockLevels won't wrap this in a paragraph because it contains a div
+# Parsoid & Remex fix the p-wrapping since they operate on the DOM.
!! test
Media link with nasty text
!! wikitext
@@ -17650,9 +17459,8 @@ Media link with nasty text
!! html/php
Safe Link<div style="display:none">" onmouseover="alert(document.cookie)" onfoo="</div>
-!! html+php/tidy
-
!! end
@@ -18256,11 +18064,12 @@ Expansion of multi-line templates in attribute values (T8255 sanity check 2)
!! end
!! test
-Tags which are hidden from Tidy cannot pass through the Sanitizer
+Tags which are hidden from tidiers cannot pass through the Sanitizer
!! wikitext
!! html+tidy
-
<mw:toc><script>alert();</script></mw:toc>
+
<mw:toc><script>alert();</script></mw:toc>
+
!! end
###
@@ -18504,6 +18313,27 @@ this is a '''test'''
this is a test
!! end
+!! test
+Parser hook: horizontal rule inside extension tag that outputs
+!! wikitext
+
+Hello
+
+Goodbye
+
+!! html/php
+
+'
+Hello
+
+Goodbye
+'
+array (
+)
+
+
+!! end
+
###
### (see tests/parser/parserTestsParserHook.php for the extension)
###
@@ -18565,14 +18395,14 @@ Nested template calls
### Sanitizer
###
-# HTML+Tidy strips out empty tags completely. Parsoid doesn't.
-# FIXME: Wikitext for this first test doesn't match its title.
+# Remex wraps empty tag runs with p-tags.
+# Parsoid strips them out during p-wrapping.
!! test
Sanitizer: Closing of open tags
!! wikitext
!! end
!! test
@@ -19144,43 +18951,34 @@ parsoid=wt2html,html2html
!! end
# Known to produce bogus xml (extra )
+# Don't add the html/php section since it generates broken HTML
!! test
Fuzz testing: Parser16
!! wikitext
{|
!https://||||||
-!! html
+!! html+tidy
-
+
https://
-
-
-
-!! html+tidy
-
-
-
https://
-
-
-
-
-
+
+
!! end
!! test
Fuzz testing: Parser21
!! wikitext
{|
-! irc://{{ftp://a" onmouseover="alert('hello world');"
+!irc://{{ftp://a" onmouseover="alert('hello world');"
|
!! html
!! end
### Note: Above tests excludes the "{{NUMBEROFADMINS}}" magic word because it generates a MySQL error when included.
@@ -20573,7 +20368,7 @@ image4 |300px| centre
!! end
@@ -20975,7 +20770,7 @@ File:Foobar.jpg|alt=galleryalt|link=Wikilink
!! html/parsoid
-
+
!! end
@@ -21009,11 +20804,11 @@ File:Foobar.jpg|alt=galleryalt|link=http://www.example.org
Gallery override link with absolute external link with LanguageConverter
!! options
language=zh
-!! input
+!! wikitext
File:foobar.jpg|caption|alt=galleryalt|link=http://www.example.org
-!! result
+!! html/php
!! end
!! test
Centre-aligned image
!! wikitext
[[Image:foobar.jpg|centre]]
-!! html
+!! html/php
-!!end
+!! html/parsoid
+
+!! end
!! test
None-aligned image
!! wikitext
[[Image:foobar.jpg|none]]
-!! html
+!! html/php
-!!end
+!! html/parsoid
+
+!! end
!! test
Width + Height sized image (using px) (height is ignored)
!! wikitext
[[Image:foobar.jpg|640x480px]]
-!! html
+!! html/php
-!!end
+!! html/parsoid
+
+!! end
!! test
Width-sized image (using px, no following whitespace)
!! wikitext
[[Image:foobar.jpg|640px]]
-!! html
+!! html/php
-!!end
+!! html/parsoid
+
+!! end
!! test
Width-sized image (using px, with following whitespace - test regression from r39467)
!! wikitext
[[Image:foobar.jpg|640px ]]
-!! html
+!! html/php
+!! html/parsoid
+
!!end
!! test
Width-sized image (using px, with preceding whitespace - test regression from r39467)
!! wikitext
[[Image:foobar.jpg| 640px]]
-!! html
+!! html/php
-!!end
+!! html/parsoid
+
+!! end
!! test
Image with page parameter
@@ -21439,7 +21240,7 @@ Images with the "|" character in the comment
!! end
-# Plain MediaWiki does not remove empty lists, but tidy actually does.
-# Templates in Wikipedia rely on this behavior, as tidy has always been
-# enabled there. These tests are normally run *without* tidy, so specify the
-# full output here.
-# To test realistic parsing behavior, apply a tidy-like transformation to both
-# the expected output and your parser's output.
!! test
-T2529: Uncovered bullet leaving empty list, normally removed by tidy
+T2529: Uncovered bullet in a deeply nested list
!! wikitext
-******* Foo {{bullet}}
+*******Foo {{bullet}}
!! html
-
Foo
-
Bar
+
Foo
+
Bar
!! end
@@ -23199,12 +22993,12 @@ y
-
1
-
2
+
1
+
2
-
3
-
4
+
3
+
4
y
@@ -23213,10 +23007,10 @@ y
!! test
T2529: Uncovered bullet in parser function result
!! wikitext
-* Foo {{lc:{{bullet}} }}
+*Foo {{lc:{{bullet}} }}
!! html
-
Foo
-
bar
+
Foo
+
bar
!! end
@@ -23369,14 +23163,17 @@ Line two
!! end
+# doBlockLevels screws up this output and Remex cleans up as much as it can.
+# Parsoid seems to do a better job here since its p-wrapper is probably smarter.
!! test
Nesting tags, paragraphs on lines which begin with
!! wikitext
A
B
!! html/php+tidy
-
A
-
B
+
A
+
B
+
!! html/parsoid
A
@@ -23396,9 +23193,8 @@ Line two
Line two
!! html+tidy
-
-
Line one Line two
-
+
Line one
+Line two
!! end
!! test
@@ -23416,10 +23212,12 @@ Line two
!! html+tidy
-
Line one
-Line two
+
Line one
+
+Line two
!! end
+# Parsoid's output is broken on this because of Tidy-compatibility cruft
!! test
T8200: paragraphs inside blockquotes (extra line break on close)
!! wikitext
@@ -23434,9 +23232,9 @@ Line two
!! html+tidy
-
-
Line one
-
Line two
+
Line one
+
Line two
+
!! end
@@ -23455,13 +23253,9 @@ Line two
-!! html+tidy
-
-
Line one
-
Line two
-
!! end
+# FIXME: Why does/should the blockquote+div combo suppress p-wrapping here?
!! test
Paragraphs inside blockquotes/divs (no extra line breaks)
!! wikitext
@@ -23540,9 +23334,11 @@ wgLinkHolderBatchSize=0
Free external link invading image caption
!! wikitext
[[Image:Foobar.jpg|thumb|http://x|hello]]
-!! html
+!! html/php
hello
+!! html/parsoid
+hello
!! end
!! test
@@ -23555,25 +23351,29 @@ language=fa
!! end
@@ -23824,7 +23624,7 @@ Bad images - T18039: text after bad image disappears
Foo bar
[[File:Bad.jpg]]
Bar foo
-!! DISABLED/html/php
+!! html/php+disabled
Two
@@ -24295,7 +24095,7 @@ T28375: TOC with italics
title=[[Main Page]]
!! wikitext
__TOC__
-== ''Lost'' episodes ==
+==''Lost'' episodes==
!! html/php
Contents
@@ -24307,7 +24107,7 @@ __TOC__
!! html/parsoid
-
Lost episodes
+
Lost episodes
!! end
!! test
@@ -24316,7 +24116,7 @@ T28375: TOC with bold
title=[[Main Page]]
!! wikitext
__TOC__
-== '''should be bold''' then normal text ==
+=='''should be bold''' then normal text==
!! html/php
Contents
@@ -24328,7 +24128,7 @@ __TOC__
!! html/parsoid
-
should be bold then normal text
+
should be bold then normal text
!! end
!! test
@@ -24337,7 +24137,7 @@ T35845: Headings become cursive in TOC when they contain an image
title=[[Main Page]]
!! wikitext
__TOC__
-== Image [[Image:foobar.jpg]] ==
+==Image [[Image:foobar.jpg]]==
!! html/php
Contents
@@ -24349,7 +24149,7 @@ __TOC__
!! html/parsoid
-
Image
+
Image
!! end
!! test
@@ -24358,7 +24158,7 @@ T35845 (2): Headings become bold in TOC when they contain a blockquote
title=[[Main Page]]
!! wikitext
__TOC__
-==
!! end
# Don't expect Parsoid to roundtrip this until the php parser comes closer to
@@ -24469,9 +24253,9 @@ Tags with parameters in TOC
parsoid=wt2html
!! wikitext
__TOC__
-== Hello ==
+==Hello==
-== Evilbye ==
+==Evilbye==
!! html/php
Contents
@@ -24485,24 +24269,24 @@ __TOC__
!! html/parsoid
-
Hello
+
Hello
-
b">Evilbye
+
b">Evilbye
!! end
!! test
span tags with directionality in TOC
!! wikitext
__TOC__
-== C++ ==
+==C++==
-== ××× ×! ==
+==××× ×!==
-== The attributes on these span tags must be deleted from the TOC ==
+==The attributes on these span tags must be deleted from the TOC==
-== All attributes on these span tags must be deleted from the TOC ==
+==All attributes on these span tags must be deleted from the TOC==
-== Attributes after dir on these span tags must be deleted from the TOC ==
+==Attributes after dir on these span tags must be deleted from the TOC==
!! html/php
Contents
@@ -24522,18 +24306,18 @@ __TOC__
!! html/parsoid
-
C++
-
××× ×!
-
The attributes on these span tags must be deleted from the TOC
-
All attributes on these span tags must be deleted from the TOC
-
Attributes after dir on these span tags must be deleted from the TOC
+
C++
+
××× ×!
+
The attributes on these span tags must be deleted from the TOC
+
All attributes on these span tags must be deleted from the TOC
+
Attributes after dir on these span tags must be deleted from the TOC
!! end
!! test
T74884: bdi element in ToC
!! wikitext
__TOC__
-== test ==
+==test==
!! html/php
Contents
@@ -24545,14 +24329,14 @@ __TOC__
!! html/parsoid
-
test
+
test
!! end
!! test
T35715: s/strike element in ToC
!! wikitext
__TOC__
-== test test test ==
+==test test test==
!! html/php
Contents
@@ -24564,17 +24348,14 @@ __TOC__
!! html/parsoid
-
test test test
+
test test test
!! end
-# Note that the html output does not have the , but the
-# html+tidy output *does*. This is because the empty is
-# removed by the sanitizer, but only when tidy is *not* enabled (!).
!! test
Empty
tag in TOC, removed by Sanitizer (T92892)
!! wikitext
__TOC__
-== x ==
+==x==
!! html/php
!! end
!! article
@@ -24750,17 +24519,17 @@ new support for bdi element (T33817)
Ignore pipe between table row attributes
!! wikitext
{|
-| quux
+|quux
|- id=foo | style='color: red'
-| bar
+|bar
|}
!! html
-
quux
+
quux
-
bar
+
bar
!! end
@@ -24774,15 +24543,46 @@ Language parser function
!! end
+!!test
+Padleft and padright (default 0-padding)
+!! wikitext
+{{padleft:xyz|5}}
+{{padright:xyz|5}}
+!! html/php
+
00xyz
+xyz00
+
+!! html/parsoid
+
00xyz
+xyz00
+!! end
+
+!!test
+Padleft and padright (partial fill)
+!! wikitext
+{{padleft:xyz|6|ab}}
+{{padright:xyz|6|ab}}
+!! html/php
+
abaxyz
+xyzaba
+
+!! html/parsoid
+
abaxyz
+xyzaba
+!! end
+
!!test
Padleft and padright as substr
!! wikitext
{{padleft:|3|abcde}}
{{padright:|3|abcde}}
-!! html
+!! html/php
abc
abc
+!! html/parsoid
+
abc
+abc
!! end
!!test
@@ -24806,7 +24606,7 @@ T36939 - Case insensitive link parsing ([HttP://])
@@ -25009,6 +24809,7 @@ Empty LI and TR nodes should not be stripped from top-level content
* a
*
* b
+
{|
|-
|-
@@ -25363,6 +25164,21 @@ a
!! end
+!! test
+Headings: Used as horizontal rule
+!! config
+wgFragmentMode=[ 'html5', 'legacy' ]
+!! options
+parsoid=wt2html
+!! wikitext
+===============
+!! html/php
+
@@ -26859,13 +26672,13 @@ Accept empty td cell attribute
Non-empty attributes in th-cells
!! wikitext
{|
-! Foo !! style="color: red" | Bar
+!Foo!! style="color: red" |Bar
|}
!! html
-
Foo
-
Bar
+
Foo
+
Bar
!!end
@@ -26874,13 +26687,13 @@ Non-empty attributes in th-cells
Accept empty attributes in th-cells
!! wikitext
{|
-!| foo !!| bar
+!|foo!!|bar
|}
!! html
-
foo
-
bar
+
foo
+
bar
!!end
@@ -26889,17 +26702,17 @@ Accept empty attributes in th-cells
Empty table rows go away
!! wikitext
{|
-| Hello
-| there
+|Hello
+|there
|- class="foo"
|-
|}
!! html
-
Hello
+
Hello
-
there
+
there
@@ -26929,11 +26742,9 @@ RT-ed inter-element separators should be valid separators
!!end
-# Parsoid-only since PHP parser relies on Tidy for correct output
+# Parsoid-only test of a DOM pass
!!test
Trailing newlines in a deep dom-subtree that ends a wikitext line should be migrated out
-!!options
-parsoid
!! wikitext
{|
|foo
@@ -26943,7 +26754,7 @@ bar
{|
|foo
|}
-!! html
+!! html/parsoid
foo
bar
@@ -27043,13 +26854,13 @@ Indent and comment before table row
!! wikitext
{|
|-
- | there
+ |there
|}
!! html/php
!! wikitext
-* a b
+* a b
* c
!! end
@@ -28515,7 +28326,7 @@ WTS of autolinks with nowikis (round-trip)
!! wikitext
xhttp://cscott.netx
!! html/parsoid
-
!! end
# this is the "easy" test because it leaves in place all the
@@ -28583,18 +28394,25 @@ Magic links inside links (not autolinked)
[http://foo.com PMID 1234]
[http://foo.com ISBN 123456789x]
!! html+tidy
-
!! end
!! test
@@ -29151,7 +28948,7 @@ parsoid={
!! html/parsoid
foo bar
!! wikitext
-== foo bar ==
+== foo bar ==
!! end
!! test
@@ -29682,6 +29479,64 @@ y
}}
!! end
+!! test
+New list is serialized on newlines
+!! options
+parsoid=html2wt
+!! html/parsoid
+
The quick brown fox jumps over the lazy dog.
+
Yesterday
+
Today
+
Tomorrow
+
The quick onyx goblin jumps over the lazy dwarf.
+!! wikitext
+The quick brown fox jumps over the lazy dog.
+
+* Yesterday
+* Today
+* Tomorrow
+
+The quick onyx goblin jumps over the lazy dwarf.
+!! end
+
+!! test
+New lists in formatting elements serialized w/o newlines
+!! options
+parsoid=html2wt
+!! html/parsoid
+
+
+
+
123
+
+
+
+
+
hi
+!! wikitext
+
+* 123
+
+
+
+* hi
+
+!! end
+
+!! test
+New list in table doesn't need newlines
+!! options
+parsoid=html2wt
+!! html/parsoid
+
test
123
+!! wikitext
+{|
+|
+* test
+* 123
+|}
+!! end
+
# ---------------------------------------------------
# End of tests spec'ing wikitext serialization norms |
# ---------------------------------------------------
@@ -29861,17 +29716,15 @@ parsoid={
!! test
Empty LI (T49673)
!! wikitext
-* a
+*a
*
*
-* b
-!! html/php+tidy
-
-
a
+*b
+!! html+tidy
+
a
-
b
-
+
b
!! end
!! test
@@ -29879,13 +29732,9 @@ Thumbnail output
!! wikitext
[[File:Thumb.png|thumb]]
!! html/php+tidy
-
-
-
-
-
-
-
+
+!! html/parsoid
+
!! end
!! test
@@ -30000,14 +29849,14 @@ Decoding of HTML entities in headings and links for IDs and link fragments (T103
!! config
wgFragmentMode=[ 'html5', 'legacy' ]
!! wikitext
-== A&B&C&D&amp;E ==
+==A&B&C&D&amp;E==
[[#A&B&C&D&amp;E]]
!! html/php
!! end
@@ -30016,7 +29865,7 @@ Decoding of HTML entities in headings and links for IDs and link fragments (T103
!! config
wgFragmentMode=[ 'legacy' ]
!! wikitext
-== A&B&C&D&amp;E ==
+==A&B&C&D&amp;E==
[[#A&B&C&D&amp;E]]
!! html/php
is not accepted in HTML
+!! test
+Do not trim whitespace in HTML headings, list items, table captions, headings, and cells
+!! wikitext
+__NOTOC__
+
Heading
+
List item
+
+
Table Heading
+
Table Cell
+
+!! html/php+tidy
+
Heading
+
List item
+
+
Table Heading
+
Table Cell
+
+!! end
+
+!! test
+Do not trim whitespace in links and quotes
+!! wikitext
+foo '' italic '' and ''' bold '''
+[[Foo| some text ]]
+!! html/php+tidy
+
+!! end
+
+!! test
+Remove p tags surrounding a single element in a figcaption
+!! options
+parsoid=html2wt
+!! wikitext
+[[File:Foobar.jpg|right|200x200px|Caption]]
+!! html/parsoid
+
Caption
+!! end
+
+!! test
+Selser preserves lack of newline before list and allows newline after the list
+!! options
+parsoid={
+ "modes": ["selser"],
+ "scrubWikitext": true,
+ "changes": [
+ [ "ul", "after", "
footer
" ]
+ ]
+}
+!! wikitext
+header
+*foo
+*bar
+!! wikitext/edited
+header
+*foo
+*bar
+
+footer
+!! end
+
+
+!! test
+Selser does not introduce newlines between unedited paragraph preceding the list
+!! options
+parsoid={
+ "modes": ["selser"],
+ "changes": [
+ [ "table tbody tr td p:last-child", "empty" ]
+ ]
+}
+!! wikitext
+{|
+|
+header
+*foo
+*bar
+footer
+|}
+!! wikitext/edited
+{|
+|
+header
+*foo
+*bar
+
+|}
+!! end
+
+!! test
+Selser does not introduce newlines between unedited paragraph following the list
+!! options
+parsoid={
+ "modes": ["selser"],
+ "changes": [
+ [ "table tbody tr td p:first-child", "empty" ]
+ ]
+}
+!! wikitext
+{|
+|
+header
+*foo
+*bar
+footer
+|}
+!! wikitext/edited
+{|
+|
+
+*foo
+*bar
+footer
+|}
+!! end
+
+!! test
+Remove a list item but do not insert newline above list
+!! options
+parsoid={
+ "modes": ["selser"],
+ "changes": [
+ [ "ul li:last-child", "remove" ]
+ ]
+}
+!! wikitext
+header
+*foo
+*bar
+footer
+!! wikitext/edited
+header
+*foo
+footer
+!! end
This is RFC 12354
04=
-05=
