g
@@ -3168,15 +3169,15 @@ c
2c. Indent-Pre and tables (T44252)
!! wikitext
{|
- |+ foo
- ! | bar
+ |+foo
+ ! |bar
|}
!! html
-
foo
+
foo
-
bar
+
bar
!!end
@@ -3186,14 +3187,14 @@ c
!! wikitext
a
{|
- | b
+ |b
|}
!! html/php
a
-
b
+
b
!! html/parsoid
@@ -3699,19 +3700,19 @@ HTML-pre: 3: other wikitext
!! test
Simple definition
!! wikitext
-; name : Definition
+;name :Definition
!! html
-
name
-
Definition
+
name
+
Definition
!! end
!! test
Definition list for indentation only
!! wikitext
-: Indented text
+:Indented text
!! html
-
Indented text
+
Indented text
!! end
@@ -3728,10 +3729,10 @@ Definition list with no space
!! test
Definition list with URL link
!! wikitext
-; http://example.com/ : definition
+;http://example.com/ :definition
!! html
-
!! end
@@ -3748,10 +3749,10 @@ Definition list with bracketed URL link
!! test
Definition list with wikilink containing colon
!! wikitext
-; [[Help:FAQ]]: The least-read page on Wikipedia
+; [[Help:FAQ]]:The least-read page on Wikipedia
!! html
-
!! end
@@ -3759,13 +3760,13 @@ Definition list with wikilink containing colon
!! test
Definition list with news link containing colon
!! wikitext
-; news:alt.wikipedia.rox: This isn't even a real newsgroup!
+;news:alt.wikipedia.rox: This isn't even a real newsgroup!
!! html/php
-
!! end
!! test
@@ -3773,17 +3774,17 @@ Malformed definition list with colon
!! wikitext
; news:alt.wikipedia.rox -- don't crash or enter an infinite loop
!! html
-
!! end
!! test
Definition lists: colon in external link text
!! wikitext
-; [http://www.wikipedia2.org/ Wikipedia : The Next Generation]: OK, I made that up
+;[http://www.wikipedia2.org/ Wikipedia :The Next Generation] :OK, I made that up
!! html
-
!! end
@@ -3799,30 +3800,30 @@ Definition lists: colon in HTML attribute
!! test
Definition lists: self-closed tag
!! wikitext
-;one two : two-line fun
+;one two :two-line fun
!! html
one two
-
two-line fun
+
two-line fun
!! end
!! test
Definition lists: ignore colons inside tags
!! wikitext
-;one two : tag fun::: def
+;one two : tag fun:::def
!! html
one two : tag fun::
-
def
+
def
!! end
!! test
Definition lists: excess closed tags
!! wikitext
-;onetwo : bad tag fun
+;onetwo :bad tag fun
!! html/php+tidy
onetwo
-
bad tag fun
+
bad tag fun
!! html/parsoid
onetwo
@@ -3853,14 +3854,14 @@ T13748: Literal closing tags
Definition and unordered list using wiki syntax nested in unordered list using html tags.
!! wikitext
-; term : description
-* unordered
+;term :description
+*unordered
!! html
-
term
-
description
-
unordered
+
term
+
description
+
unordered
!! end
@@ -3868,10 +3869,11 @@ Definition and unordered list using wiki syntax nested in unordered list using h
!! test
Definition list with empty definition and following paragraph
!! wikitext
-; term:
+;term:
+
Paragraph text
!! html
-
term
+
term
Paragraph text
@@ -3957,6 +3959,29 @@ should be left alone
!! end
+!! test
+Definition Lists: Hacky use to indent tables (with content following table)
+!! wikitext
+:{|
+|foo
+|bar
+|} 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
@@ -4049,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
@@ -4172,30 +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
@@ -4203,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
@@ -4215,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
@@ -4242,10 +4269,10 @@ Definition Lists: Mixed Lists: Test 4
Definition Lists: Mixed Lists: Test 5
!! wikitext
*:d1
-*:: d2
+*::d2
!! html
d1
-
d2
+
d2
!! end
@@ -4254,10 +4281,10 @@ Definition Lists: Mixed Lists: Test 5
Definition Lists: Mixed Lists: Test 6
!! wikitext
#*:d1
-#*::: d3
+#*:::d3
!! html
d1
-
d3
+
d3
!! end
@@ -4265,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
@@ -4277,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
@@ -4382,10 +4409,10 @@ Definition Lists: Mixed Lists: Test 12
!! test
Definition Lists: Weird Ones: Test 1
!! wikitext
-*#;*::;; foo : bar (who uses this?)
+*#;*::;;foo :bar (who uses this?)
!! html/php+tidy
-
foo
-
bar (who uses this?)
+
foo
+
bar (who uses this?)
!! html/parsoid
@@ -4402,8 +4429,8 @@ Definition Lists: Weird Ones: Test 1
-
fooÂ
-
bar (who uses this?)
+
fooÂ
+
bar (who uses this?)
@@ -4460,29 +4487,29 @@ Definition Lists: colons occurring in tags
Definition Lists: colons and tables 1
!! wikitext
:{|
-| x
+|x
|}
:{|
-| y
+|y
|}
!! html/php
!! end
!! test
@@ -5988,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
@@ -6005,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
@@ -6022,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
@@ -6042,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
@@ -6088,17 +6117,17 @@ Simple table
Simple table but with multiple dashes for row wikitext
!! wikitext
{|
-| foo
+|foo
|-----
-| bar
+|bar
|}
!! html
!! end
@@ -6178,13 +6207,13 @@ Multiplication table
Accept "||" in table headings
!! wikitext
{|
-!h1 || h2
+!h1||h2
|}
!! html
-
h1
-
h2
+
h1
+
h2
!! end
@@ -6193,12 +6222,12 @@ Accept "||" in table headings
Accept "!!" in table data
!! wikitext
{|
-| Foo!! ||
+|Foo!!||
|}
!! html
-
Foo!!
+
Foo!!
@@ -6212,13 +6241,13 @@ Accept "!!" in table data
Accept "||" in indented table headings
!! wikitext
:{|
-!h1 || h2
+!h1||h2
|}
!! html
-
h1
-
h2
+
h1
+
h2
!! end
@@ -6293,9 +6322,9 @@ Accept empty attributes in td/th cells (td/th cells starting with leading ||)
!! html
-
h1
+
h1
-
a
+
a
!! end
@@ -6305,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
@@ -6324,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
@@ -6339,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
@@ -6359,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
@@ -6399,7 +6428,7 @@ Nested table
!! html
-
α
+
α
@@ -6444,7 +6473,7 @@ Table cell attributes: Pipes protected by nowikis should be treated as a plain c
bar
-
title="foo|" bar
+
title="foo|" bar
!! html/parsoid
@@ -6484,17 +6513,17 @@ parsoid=wt2html,html2html
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
@@ -6502,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
@@ -6523,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
@@ -6580,22 +6609,22 @@ Invalid text in table attributes should be discarded
parsoid=wt2html
!! wikitext
{| boo style='border:1px solid black'
-| boo style='color:blue' | 1
-|boo style='color:blue'| 2
+| boo style='color:blue' |1
+|boo style='color:blue'|2
|}
!! html/php
!! end
@@ -6792,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
@@ -6811,7 +6840,7 @@ Wikitext table with a lot of comments
!! wikitext
{|
-| foo
+|foo
|-
@@ -6821,7 +6850,7 @@ Wikitext table with a lot of comments
!! html
-
foo
+
foo
@@ -6834,18 +6863,18 @@ Wikitext table comments represented in parsoid dom
!! wikitext
{|
|-
-| x
+|x
|}
!! html/php+tidy
-
x
+
x
!! html/parsoid
-
x
+
x
!! end
@@ -6871,14 +6900,14 @@ Table cell with a single comment
!! wikitext
{|
|
-| a
+|a
|}
!! html
-
a
+
a
!! end
@@ -6889,21 +6918,21 @@ Table-cell after a comment-only-empty-line
{|
|a
-| b
+|b
|}
!! html
a
-
b
+
b
!! html/parsoid
a
-
b
+
b
!! end
@@ -6912,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
@@ -6935,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
@@ -6970,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
!! end
@@ -7069,20 +7098,20 @@ Template generated table cell with attributes
!! wikitext
{|
|-
-{{table_attribs_4}} || a || b
+{{table_attribs_4}} ||a||b
|}
!! html/php+tidy
-
-
a
-
b
+
+
a
+
b
!! html/parsoid
-
a
b
+
a
b
!! end
!! test
@@ -7147,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
-
foo
-
bar
+
foo
+
bar
-
baz
-
quux
+
baz
+
quux
!! html/parsoid
@@ -9229,6 +9258,7 @@ language=is
Redirect syntax under text isn't considered a redirect
!! wikitext
some text
+
#redirect [[Main Page]]
!! html/parsoid
some text
@@ -9251,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
@@ -9480,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
@@ -9494,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
@@ -9518,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
@@ -9534,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
@@ -9642,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
@@ -9700,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
@@ -9775,6 +9807,10 @@ Multiple list tags generated by templates
b
c
+!! html/parsoid
+
a
+
b
+
c
!!end
!!test
@@ -9821,29 +9857,29 @@ Test the li-hack (a hack from Tidy days, but doesn't work as advertised with Rem
!!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
!! 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
@@ -9857,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
@@ -9908,7 +9946,7 @@ Unbalanced closing block tags break a list
a
b
-!! html+parsoid
+!! html/parsoid
a
@@ -9944,14 +9982,14 @@ Unclosed formatting tags that straddle lists are closed and reopened
!! 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.
@@ -9966,16 +10004,16 @@ parsoid=wt2html,wt2wt,html2html
1. List embedded in a formatting tag
!! wikitext
-* foo
+*foo
!! html/php+tidy
!! end
@@ -11250,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.
@@ -11338,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
@@ -11367,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
@@ -11828,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
@@ -12072,10 +12110,10 @@ Preprocessor precedence 5: tplarg takes precedence over template
!! wikitext
{{Precedence5|Bullet}}
!! html/php
-
Bar
+
Bar
!! html/parsoid
-
Bar
+
Bar
!! end
!! test
@@ -12165,14 +12203,14 @@ Preprocessor precedence 9: groups of braces
{{Preprocessor precedence 9|Four|Bullet|1|2}}
!! html/php
@@ -12278,14 +12316,14 @@ 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}}
+
{{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
+
foo-{bar}bat
+
foo-{bar}bat
+
foo-{bar}bat
'foo-{bar}bat'
array (
)
@@ -12329,13 +12367,13 @@ 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
-
@@ -12347,18 +12385,18 @@ parsoid=wt2html
!! 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
-
...extra dashes
-
foobat ...should be ok
+
...should be ok
+
...extra dashes
+
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
@@ -12444,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
###
@@ -12908,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
@@ -13037,10 +13101,14 @@ Templates: Wiki Tables: 1a. Fostering of entire template content
a
-!! html+tidy
+!! html/php+tidy
a
+!! html/parsoid
+
a
+
+
!! end
!!test
@@ -15156,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
@@ -15163,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
@@ -16287,7 +16359,7 @@ es:1 fr:1
!! test
Basic section headings
!! wikitext
-== Headline 1 ==
+==Headline 1==
Some text
==Headline 2==
@@ -16309,12 +16381,12 @@ Blah blah
!! test
Section headings with TOC
!! wikitext
-== Headline 1 ==
-=== Subheadline 1 ===
-===== Skipping a level =====
-====== Skipping a level ======
+==Headline 1==
+===Subheadline 1===
+=====Skipping a level=====
+======Skipping a level======
-== Headline 2 ==
+==Headline 2==
Some text
===Another headline===
!! html
@@ -16356,10 +16428,10 @@ Some text
TOC anchors don't collide
!! wikitext
__FORCETOC__
-== Headline 2 ==
-== Headline ==
-== Headline 2 ==
-== Headline ==
+==Headline 2==
+==Headline==
+==Headline 2==
+==Headline==
!! html/php
@@ -16641,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
Contents
@@ -16704,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)
@@ -16749,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
@@ -16770,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]]
@@ -16835,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
@@ -16899,13 +16971,13 @@ HTML headers vs TOC (T25393)
(__NOEDITSECTION__ for clearer output, doesn't matter here)
!! wikitext
!! end
### Note: Above tests excludes the "{{NUMBEROFADMINS}}" magic word because it generates a MySQL error when included.
@@ -20902,20 +20995,20 @@ Illegal character references (T106578)
; Surrogate: ��
; This is an okay astral character: 💩
!! html+tidy
-
Null
-
�
-
FF
-

-
CR
-

-
Control (low)
-

-
Control (high)
-
 Ÿ
-
Surrogate
-
��
-
This is an okay astral character
-
💩
+
Null
+
�
+
FF
+

+
CR
+

+
Control (low)
+

+
Control (high)
+
 Ÿ
+
Surrogate
+
��
+
This is an okay astral character
+
💩
!! end
!! test
@@ -21279,20 +21372,20 @@ parsoid=wt2html
!! test
Definition list code coverage
!! wikitext
-; title : def
-; title : def
+;title : def
+;title : def
;title: def
!! html/php
-
title
-
def
-
title
-
def
+
title
+
def
+
title
+
def
title
-
def
+
def
!! html/parsoid
-
title Â
def
-
titleÂ
def
+
title Â
def
+
titleÂ
def
title
def
!! end
@@ -21537,7 +21630,7 @@ anchorencode encodes like the TOC generator: (T20431)
!! config
wgFragmentMode=[ 'html5', 'legacy' ]
!! wikitext
-=== _ +:.3A%3A _ &&]] x ===
+===_ +:.3A%3A _ &&]] x===
{{anchorencode: _ +:.3A%3A _ &&]] x}}
__NOEDITSECTION__
!! html/php
@@ -21545,7 +21638,7 @@ __NOEDITSECTION__
+:.3A%3A_&&]]_x
!! html/parsoid
-
_ +:.3A%3A _ &&]] x
+
_ +:.3A%3A _ &&]] x
+:.3A%3A_&&]]_x
!! end
@@ -21555,7 +21648,7 @@ anchorencode encodes like the TOC generator: (T20431) (legacy)
!! config
wgFragmentMode=[ 'legacy' ]
!! wikitext
-=== _ +:.3A%3A&&]] ===
+===_ +:.3A%3A&&]]===
{{anchorencode: _ +:.3A%3A&&]] }}
__NOEDITSECTION__
!! html/php
@@ -21839,12 +21932,12 @@ wgFragmentMode=[ 'html5', 'legacy' ]
!! options
language=sr variant=sr-ec
!! wikitext
-== -{Naslov}- ==
+==-{Naslov}-==
Note that even an unprotected headline ID is not affected by language
conversion:
-== Latinski ==
+==Latinski==
!! html/php
!! end
!! test
T2529: Uncovered bullet in a deeply nested list
!! wikitext
-******* Foo {{bullet}}
+*******Foo {{bullet}}
!! html
-
Foo
-
Bar
+
Foo
+
Bar
!! end
@@ -22900,12 +22993,12 @@ y
-
1
-
2
+
1
+
2
-
3
-
4
+
3
+
4
y
@@ -22914,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
@@ -23124,6 +23217,7 @@ Line two
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
@@ -23519,7 +23613,7 @@ comment
Bad images - basic functionality
!! wikitext
[[File:Bad.jpg]]
-!! DISABLED/html/php
+!! html/php+disabled
!! html/parsoid
!! end
@@ -23530,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
@@ -24001,7 +24095,7 @@ T28375: TOC with italics
title=[[Main Page]]
!! wikitext
__TOC__
-== ''Lost'' episodes ==
+==''Lost'' episodes==
!! html/php
Contents
@@ -24013,7 +24107,7 @@ __TOC__
!! html/parsoid
-
Lost episodes
+
Lost episodes
!! end
!! test
@@ -24022,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
@@ -24034,7 +24128,7 @@ __TOC__
!! html/parsoid
-
should be bold then normal text
+
should be bold then normal text
!! end
!! test
@@ -24043,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
@@ -24055,7 +24149,7 @@ __TOC__
!! html/parsoid
-
Image
+
Image
!! end
!! test
@@ -24064,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
@@ -24159,9 +24253,9 @@ Tags with parameters in TOC
parsoid=wt2html
!! wikitext
__TOC__
-== Hello ==
+==Hello==
-== Evilbye ==
+==Evilbye==
!! html/php
Contents
@@ -24175,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
@@ -24212,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
@@ -24235,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
@@ -24254,14 +24348,14 @@ __TOC__
!! html/parsoid
-
test test test
+
test test test
!! end
!! test
Empty
tag in TOC, removed by Sanitizer (T92892)
!! wikitext
__TOC__
-== x ==
+==x==
!! html/php
Contents
@@ -24273,7 +24367,7 @@ __TOC__
!! html/parsoid
-
x
+
x
!! end
!! article
@@ -24425,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
@@ -24715,6 +24809,7 @@ Empty LI and TR nodes should not be stripped from top-level content
* a
*
* b
+
{|
|-
|-
@@ -25670,9 +25765,9 @@ parsoid=html2wt
!! html/php
!! wikitext
-* a b
+* a b
* c
!! end
@@ -28398,9 +28493,9 @@ parsoid=html2wt,wt2wt
|-
|-
|-
-|
+|
-
-|
+|
-
|}
!! html/php+tidy
@@ -28853,7 +28948,7 @@ parsoid={
!! html/parsoid
foo bar
!! wikitext
-== foo bar ==
+== foo bar ==
!! end
!! test
@@ -29384,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 |
# ---------------------------------------------------
@@ -29563,15 +29716,15 @@ parsoid={
!! test
Empty LI (T49673)
!! wikitext
-* a
+*a
*
*
-* b
+*b
!! html+tidy
-
a
-
+
a
-
b
+
+
b
!! end
!! test
@@ -29696,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
@@ -29712,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
04=