From: jenkins-bot Date: Wed, 21 Mar 2018 20:37:20 +0000 (+0000) Subject: Merge "Clarify -{ => {{ transition" X-Git-Tag: 1.31.0-rc.0~320 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=743eca95e3065abf3091d343a4ab88ee4508483a;hp=-c;p=lhc%2Fweb%2Fwiklou.git Merge "Clarify -{ => {{ transition" --- 743eca95e3065abf3091d343a4ab88ee4508483a diff --combined tests/parser/parserTests.txt index 3f4ecadc9e,c3616ed87c..e67ad66658 --- a/tests/parser/parserTests.txt +++ b/tests/parser/parserTests.txt @@@ -534,8 -534,8 +534,8 @@@ parsoid=wt2htm !! config wgFragmentMode=[ 'html5', 'legacy' ] !! wikitext -== A B -C == +==A B +C== !! html/php

A B @@@ -543,8 -543,8 +543,8 @@@ C A B -C

+C">A B +C !! end !! test @@@ -560,48 -560,48 +560,48 @@@ http://fr.wikipedia.org/wiki/🍠!! test Simple list !! wikitext -* Item 1 -* Item 2 +*Item 1 +*Item 2 !! html - + !! end !! test Italics and bold !! wikitext -* plain -* plain''italic''plain -* plain''italic''plain''italic''plain -* plain'''bold'''plain -* plain'''bold'''plain'''bold'''plain -* plain''italic''plain'''bold'''plain -* plain'''bold'''plain''italic''plain -* plain''italic'''bold-italic'''italic''plain -* plain'''bold''bold-italic''bold'''plain -* plain'''''bold-italic'''italic''plain -* plain'''''bold-italic''bold'''plain -* plain''italic'''bold-italic'''''plain -* plain'''bold''bold-italic'''''plain -* plain l'''italic''plain -* plain l''''bold''' plain -!! html - +*plain +*plain''italic''plain +*plain''italic''plain''italic''plain +*plain'''bold'''plain +*plain'''bold'''plain'''bold'''plain +*plain''italic''plain'''bold'''plain +*plain'''bold'''plain''italic''plain +*plain''italic'''bold-italic'''italic''plain +*plain'''bold''bold-italic''bold'''plain +*plain'''''bold-italic'''italic''plain +*plain'''''bold-italic''bold'''plain +*plain''italic'''bold-italic'''''plain +*plain'''bold''bold-italic'''''plain +*plain l'''italic''plain +*plain l''''bold''' plain +!! html + !! end @@@ -1247,32 -1247,32 +1247,32 @@@ Text-level semantic html elements in wi !! test Ruby markup (W3C-style) !! wikitext -; Mono-ruby for individual base characters -: 日に本ほん語ご -; Group ruby -: 今日きょう -; Jukugo ruby -: 法華経ほけきょう -; Inline ruby -: 東京(とうきょう) -; Double-sided ruby -: 旧金山jiùjīnshānSan Francisco +;Mono-ruby for individual base characters +:日に本ほん語ご +;Group ruby +:今日きょう +;Jukugo ruby +:法華経ほけきょう +;Inline ruby +:東京(とうきょう) +;Double-sided ruby +:旧金山jiùjīnshānSan Francisco ♥HeartCœur ☘ShamrockTrèfle ✶StarÉtoile !! html -
Mono-ruby for individual base characters
-
日に本ほん語ご
-
Group ruby
-
今日きょう
-
Jukugo ruby
-
法華経ほけきょう
-
Inline ruby
-
東京(とうきょう)
-
Double-sided ruby
-
旧金山jiùjīnshānSan Francisco
+
Mono-ruby for individual base characters
+
日に本ほん語ご
+
Group ruby
+
今日きょう
+
Jukugo ruby
+
法華経ほけきょう
+
Inline ruby
+
東京(とうきょう)
+
Double-sided ruby
+
旧金山jiùjīnshānSan Francisco

♥HeartCœur ☘ShamrockTrèfle @@@ -2751,7 -2751,7 +2751,7 @@@ Templates: Strip leading and trailing w

b

c

- + !! end @@@ -2772,7 -2772,7 +2772,7 @@@ Templates: Don't strip whitespace from e}} {{echo| -* f}} +*f}} {{echo| }}g @@@ -2792,7 -2792,7 +2792,7 @@@


- +


g
@@@ -3168,15 -3168,15 +3168,15 @@@
  2c. Indent-Pre and tables (T44252)
  !! wikitext
  {|
 - |+ foo
 - !  | bar
 + |+foo
 + !  |bar
  |}
  !! html
  
 -
 -
foo +foo
bar +bar
!!end @@@ -3186,14 -3186,14 +3186,14 @@@ !! wikitext a {| - | b + |b |} !! html/php
a
  
-
b +b
!! html/parsoid @@@ -3699,19 -3699,19 +3699,19 @@@ HTML-pre: 3: other wikitex !! 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 -3728,10 +3728,10 @@@ Definition list with no spac !! test Definition list with URL link !! wikitext -; http://example.com/ : definition +;http://example.com/ :definition !! html -
http://example.com/ 
-
definition
+
http://example.com/ 
+
definition
!! end @@@ -3748,10 -3748,10 +3748,10 @@@ Definition list with bracketed URL lin !! 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 -
Help:FAQ
-
The least-read page on Wikipedia
+
Help:FAQ
+
The least-read page on Wikipedia
!! end @@@ -3759,13 -3759,13 +3759,13 @@@ !! 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 -
news:alt.wikipedia.rox
-
This isn't even a real newsgroup!
+
news:alt.wikipedia.rox
+
This isn't even a real newsgroup!
!! html/parsoid -
news:alt.wikipedia.rox
This isn't even a real newsgroup!
+
news:alt.wikipedia.rox
This isn't even a real newsgroup!
!! end !! test @@@ -3773,17 -3773,17 +3773,17 @@@ Malformed definition list with colo !! wikitext ; news:alt.wikipedia.rox -- don't crash or enter an infinite loop !! html -
news:alt.wikipedia.rox -- don't crash or enter an infinite loop
+
news:alt.wikipedia.rox -- don't crash or enter an infinite loop
!! 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 -
Wikipedia : The Next Generation
-
OK, I made that up
+
Wikipedia :The Next Generation 
+
OK, I made that up
!! end @@@ -3799,30 -3799,30 +3799,30 @@@ Definition lists: colon in HTML attribu !! 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 -3853,14 +3853,14 @@@ T13748: Literal closing tag 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 -3868,10 +3868,10 @@@ !! test Definition list with empty definition and following paragraph !! wikitext -; term: +;term: Paragraph text !! html -
term
+
term

Paragraph text

@@@ -4049,22 -4049,22 +4049,22 @@@ Table / list interaction: indented tabl !! wikitext :{| |- -| a -* b +|a +*b |- -| c -* d +|c +*d |} !! html
- -
a -
  • b
+
a +
  • b
c -
  • d
+
c +
  • d
!! end @@@ -4172,30 -4172,30 +4172,30 @@@ Definition Lists: Nesting: Test !! 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 -4203,11 +4203,11 @@@ !! test Definition Lists: Mixed Lists: Test 2 !! wikitext -*: d1 -*: d2 +*:d1 +*:d2 !! html -
  • d1
    -
    d2
+
  • d1
    +
    d2
!! end @@@ -4215,11 -4215,11 +4215,11 @@@ !! test Definition Lists: Mixed Lists: Test 3 !! wikitext -*::: d1 -*::: d2 +*:::d1 +*:::d2 !! html -
  • d1
    -
    d2
+
  • d1
    +
    d2
!! end @@@ -4242,10 -4242,10 +4242,10 @@@ Definition Lists: Mixed Lists: Test Definition Lists: Mixed Lists: Test 5 !! wikitext *:d1 -*:: d2 +*::d2 !! html
  • d1 -
    d2
+
d2
!! end @@@ -4254,10 -4254,10 +4254,10 @@@ Definition Lists: Mixed Lists: Test 6 !! wikitext #*:d1 -#*::: d3 +#*:::d3 !! html
    • d1 -
      d3
+
d3
!! end @@@ -4265,11 -4265,11 +4265,11 @@@ !! test Definition Lists: Mixed Lists: Test 7 !! wikitext -:* d1 -:* d2 +:*d1 +:*d2 !! html -
  • d1
  • -
  • d2
+
  • d1
  • +
  • d2
!! end @@@ -4277,11 -4277,11 +4277,11 @@@ !! test Definition Lists: Mixed Lists: Test 8 !! wikitext -:* d1 -::* d2 +:*d1 +::*d2 !! html -
  • d1
-
  • d2
+
  • d1
+
  • d2
!! end @@@ -4382,10 -4382,10 +4382,10 @@@ Definition Lists: Mixed Lists: Test 1 !! test Definition Lists: Weird Ones: Test 1 !! wikitext -*#;*::;; foo : bar (who uses this?) +*#;*::;;foo :bar (who uses this?) !! html/php+tidy -
    1. foo 
      -
      • bar (who uses this?)
+
    1. foo 
      +
      • bar (who uses this?)
!! html/parsoid
  • @@@ -4402,8 -4402,8 +4402,8 @@@
    -
    foo 
    -
    bar (who uses this?)
    +
    foo 
    +
    bar (who uses this?)
    @@@ -4460,29 -4460,29 +4460,29 @@@ Definition Lists: colons occurring in t Definition Lists: colons and tables 1 !! wikitext :{| -| x +|x |} :{| -| y +|y |} !! html/php
    -
    x +x
    -
    y +y
    !! html/parsoid
    -
    x +x
    -
    y +y
    !! end @@@ -5543,61 -5543,61 +5543,61 @@@ IPv6 urls, autolink format (T23261 http://[2404:130:0:1000::187:2]/index.php Examples from RFC 2373, section 2.2: -* http://[1080::8:800:200C:417A]/unicast -* http://[FF01::101]/multicast -* http://[::1]/loopback -* http://[::]/unspecified -* http://[::13.1.68.3]/ipv4compat -* http://[::FFFF:129.144.52.38]/ipv4compat +*http://[1080::8:800:200C:417A]/unicast +*http://[FF01::101]/multicast +*http://[::1]/loopback +*http://[::]/unspecified +*http://[::13.1.68.3]/ipv4compat +*http://[::FFFF:129.144.52.38]/ipv4compat Examples from RFC 2732, section 2: -* http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html -* http://[1080:0:0:0:8:800:200C:417A]/index.html -* http://[3ffe:2a00:100:7031::1] -* http://[1080::8:800:200C:417A]/foo -* http://[::192.9.5.5]/ipng -* http://[::FFFF:129.144.52.38]:80/index.html -* http://[2010:836B:4179::836B:4179] +*http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html +*http://[1080:0:0:0:8:800:200C:417A]/index.html +*http://[3ffe:2a00:100:7031::1] +*http://[1080::8:800:200C:417A]/foo +*http://[::192.9.5.5]/ipng +*http://[::FFFF:129.144.52.38]:80/index.html +*http://[2010:836B:4179::836B:4179] !! html/php

    http://[2404:130:0:1000::187:2]/index.php

    Examples from RFC 2373, section 2.2:

    - +

    Examples from RFC 2732, section 2:

    - + !! html/parsoid

    http://[2404:130:0:1000::187:2]/index.php

    Examples from RFC 2373, section 2.2:

    - +

    Examples from RFC 2732, section 2:

    - + !! end !! test @@@ -5606,61 -5606,61 +5606,61 @@@ IPv6 urls, bracketed format (T23261 [http://[2404:130:0:1000::187:2]/index.php test] Examples from RFC 2373, section 2.2: -* [http://[1080::8:800:200C:417A] unicast] -* [http://[FF01::101] multicast] -* [http://[::1]/ loopback] -* [http://[::] unspecified] -* [http://[::13.1.68.3] ipv4compat] -* [http://[::FFFF:129.144.52.38] ipv4compat] +*[http://[1080::8:800:200C:417A] unicast] +*[http://[FF01::101] multicast] +*[http://[::1]/ loopback] +*[http://[::] unspecified] +*[http://[::13.1.68.3] ipv4compat] +*[http://[::FFFF:129.144.52.38] ipv4compat] Examples from RFC 2732, section 2: -* [http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html 1] -* [http://[1080:0:0:0:8:800:200C:417A]/index.html 2] -* [http://[3ffe:2a00:100:7031::1] 3] -* [http://[1080::8:800:200C:417A]/foo 4] -* [http://[::192.9.5.5]/ipng 5] -* [http://[::FFFF:129.144.52.38]:80/index.html 6] -* [http://[2010:836B:4179::836B:4179] 7] +*[http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html 1] +*[http://[1080:0:0:0:8:800:200C:417A]/index.html 2] +*[http://[3ffe:2a00:100:7031::1] 3] +*[http://[1080::8:800:200C:417A]/foo 4] +*[http://[::192.9.5.5]/ipng 5] +*[http://[::FFFF:129.144.52.38]:80/index.html 6] +*[http://[2010:836B:4179::836B:4179] 7] !! html/php

    test

    Examples from RFC 2373, section 2.2:

    - +

    Examples from RFC 2732, section 2:

    - + !! html/parsoid

    test

    Examples from RFC 2373, section 2.2:

    - +

    Examples from RFC 2732, section 2:

    - + !! end !! test @@@ -5988,15 -5988,15 +5988,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 -6005,14 +6005,14 @@@ A table with caption with default-space {| |+ style="color: red;" | caption1 |- -| foo +|foo |} !! html - -
    caption1 +caption1
    foo +foo
    !! end @@@ -6022,18 -6022,18 +6022,18 @@@ A table with captions with non-default !! wikitext {| |+style="color: red;"|caption2 -|+ style="color: red;"| caption3 +|+ style="color: red;"|caption3 |- -| foo +|foo |} !! html - -
    caption2 caption3 +caption3
    foo +foo
    !! end @@@ -6042,23 -6042,23 +6042,23 @@@ 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 - - - + - - - +
    baz +baz foo bar foo baz +foo bar foobaz baz +baz style='color:red;' baz +style='color:red;'baz
    !! end @@@ -6067,19 -6067,19 +6067,19 @@@ Simple table !! wikitext {| -| 1 || 2 +|1||2 |- -| 3 || 4 +|3||4 |} !! html - - + - - +
    1 2 +12
    3 4 +34
    !! end @@@ -6088,17 -6088,17 +6088,17 @@@ Simple table but with multiple dashes for row wikitext !! wikitext {| -| foo +|foo |----- -| bar +|bar |} !! html - -
    foo +foo
    bar +bar
    !! end @@@ -6109,67 -6109,67 +6109,67 @@@ Multiplication tabl {| border="1" cellpadding="2" |+Multiplication table |- -! × !! 1 !! 2 !! 3 +!×!!1!!2!!3 |- -! 1 -| 1 || 2 || 3 +!1 +|1||2||3 |- -! 2 -| 2 || 4 || 6 +!2 +|2||4||6 |- -! 3 -| 3 || 6 || 9 +!3 +|3||6||9 |- -! 4 -| 4 || 8 || 12 +!4 +|4||8||12 |- -! 5 -| 5 || 10 || 15 +!5 +|5||10||15 |} !! html - - - - + + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + +
    Multiplication table
    × 1 2 3 +×123
    1 +1 1 2 3 +123
    2 +2 2 4 6 +246
    3 +3 3 6 9 +369
    4 +4 4 8 12 +4812
    5 +5 5 10 15 +51015
    !! end @@@ -6178,13 -6178,13 +6178,13 @@@ Accept "||" in table headings !! wikitext {| -!h1 || h2 +!h1||h2 |} !! html - - +
    h1 h2 +h1h2
    !! end @@@ -6193,12 -6193,12 +6193,12 @@@ Accept "!!" in table data !! wikitext {| -| Foo!! || +|Foo!!|| |} !! html - +
    Foo!! Foo!!
    @@@ -6212,13 -6212,13 +6212,13 @@@ Accept "||" in indented table headings !! wikitext :{| -!h1 || h2 +!h1||h2 |} !! html
    - - +
    h1 h2 +h1h2
    !! end @@@ -6293,9 -6293,9 +6293,9 @@@ Accept empty attributes in td/th cells !! html - -
    h1 +h1 a +a
    !! end @@@ -6305,13 -6305,13 +6305,13 @@@ Accept "| !" at start of line in table !! wikitext {| |- -| !style="color:red" | bar +|!style="color:red"|bar |} !! html -
    bar +bar
    !!end @@@ -6324,8 -6324,8 +6324,8 @@@ Allow +/- in 2nd and later cells in a r |style='color:red;'|+1 |style='color:blue;'|-1 |- -| 1 || 2 || 3 -| 1 ||+2 ||-3 +|1||2||3 +|1||+2||-3 |- | +1 | -1 @@@ -6339,18 -6339,18 +6339,18 @@@ -1 - 1 - 2 - 3 +1 +2 +3 - 1 -+2 +1 ++2 -3 - +1 ++1 - -1 +-1 !!end @@@ -6359,26 -6359,26 +6359,26 @@@ 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 -6399,7 +6399,7 @@@ Nested tabl !! html - - +
    α +α @@@ -6444,7 -6444,7 +6444,7 @@@ Table cell attributes: Pipes protected -
    bar title="foo|" bar +title="foo|" bar
    !! html/parsoid @@@ -6484,17 -6484,17 +6484,17 @@@ parsoid=wt2html,html2htm 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 -6502,17 +6502,17 @@@ ! and || in element attributes should not be parsed as
    / !! wikitext {| -|
    hi
    +|
    hi
    |} !! html/php -
    hi
    +
    hi
    !! html/parsoid - +
    hi
    hi
    !! end @@@ -6523,18 -6523,18 +6523,18 @@@ 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 herefoo
    !! html/parsoid - +
    style="color: red !important;" data-contrived="put this here foo
    style="color: red !important;" data-contrived="put this herefoo
    !! end @@@ -6580,22 -6580,22 +6580,22 @@@ Invalid text in table attributes shoul 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 - -
    1 +1 2 +2
    !! html/parsoid - - + +
    1 212
    !! end @@@ -6640,7 -6640,7 +6640,7 @@@ parsoid=
    Foo style="color:red;"style="color:red;" Bar Foo @@@ -6754,14 -6754,14 +6754,14 @@@ parsoid=wt2html,html2htm {| |- -! foo +!foo |} !! html/* -
    foo +foo
    !! end @@@ -6774,14 -6774,14 +6774,14 @@@ parsoid=wt2html,html2htm {| |- -| foo +|foo |} !! html/* -
    foo +foo
    !! end @@@ -6792,17 -6792,17 +6792,17 @@@ Table attributes with empty valu parsoid=wt2html,html2html !! wikitext {| -| style=| hello +| style=|hello |} !! html/php -
    hello +hello
    !! html/parsoid - +
    hello
    hello
    !! end @@@ -6811,7 -6811,7 +6811,7 @@@ Wikitext table with a lot of comment !! wikitext {| -| foo +|foo |- @@@ -6821,7 -6821,7 +6821,7 @@@ !! html -
    foo +foo
    @@@ -6834,18 -6834,18 +6834,18 @@@ Wikitext table comments represented in !! wikitext {| |- -| x +|x |} !! html/php+tidy -
    x +x
    !! html/parsoid - +
    x
    x
    !! end @@@ -6871,14 -6871,14 +6871,14 @@@ Table cell with a single commen !! wikitext {| | -| a +|a |} !! html -
    a +a
    !! end @@@ -6889,21 -6889,21 +6889,21 @@@ Table-cell after a comment-only-empty-l {| |a -| b +|b |} !! html -
    a b +b
    !! html/parsoid - +
    a b
    b
    !! end @@@ -6912,21 -6912,21 +6912,21 @@@ 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 +datasecond data
    !! end @@@ -6935,33 -6935,33 +6935,33 @@@ 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 +datasecond data
    data with | second data with | +data with |second data with |
    data with | second data with | +data with |second data with |
    !! end @@@ -6970,25 -6970,25 +6970,25 @@@ 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 - - + - - + - - +
    header second header +headersecond header
    data linktext second data linktext +data linktextsecond data linktext
    data second data link|text with pipe +datasecond data link|text with pipe
    !! end @@@ -7069,20 -7069,20 +7069,20 @@@ Template generated table cell with attr !! wikitext {| |- -{{table_attribs_4}} || a || b +{{table_attribs_4}} ||a||b |} !! html/php+tidy - - - + +
    a b +ab
    !! html/parsoid - + !! end !! test @@@ -7147,17 -7147,17 +7147,17 @@@ Parsoid: Row-syntax table headings foll parsoid=wt2html,wt2wt !! wikitext {| -! foo || bar - || baz || quux +!foo||bar + ||baz||quux |} !! html/php
    a b
    ab
    - - + - - +
    foo bar +foobar baz quux +bazquux
    !! html/parsoid @@@ -9251,9 -9251,9 +9251,9 @@@ Redirect followed by block on the same !! options parsoid=wt2html !! wikitext -#REDIRECT [[Main Page]]== hi == +#REDIRECT [[Main Page]]==hi== !! html/parsoid -

    hi

    +

    hi

    !! end !! test @@@ -9480,11 -9480,11 +9480,11 @@@ Horizontal ruler -- Supports content fo Common list !! wikitext *Common list -* item 2 +*item 2 *item 3 !! html
    • Common list
    • -
    • item 2
    • +
    • item 2
    • item 3
    !! end @@@ -9494,11 -9494,11 +9494,11 @@@ Numbered lis !! wikitext #Numbered list #item 2 -# item 3 +#item 3 !! html
    1. Numbered list
    2. item 2
    3. -
    4. item 3
    +
  • item 3
  • !! end @@@ -9506,9 -9506,9 +9506,9 @@@ 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 -9518,13 +9518,13 @@@ **#Number on level 3 *#number level 2 *Level 1 -*** Level 3 -#** Level 3, but ordered +***Level 3 +#**Level 3, but ordered !! html
    • Mixed list -
      1. with numbers
      -
      • and bullets
      -
      1. and numbers
    • +
      1. with numbers
      +
      • and bullets
      +
      1. and numbers
    • bullets again
      • bullet level 2
        • bullet level 3 @@@ -9534,43 -9534,43 +9534,43 @@@
        • Number on level 3
        1. 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 -9642,24 +9642,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,61 -9700,60 +9700,61 @@@ parsoi !! 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 -
    • foo
    -
      • bar
    +
    • foo
    +
      • bar

    A heading[edit]

    -
    • Another list item
    +
    • Another list item
    !!end @@@ -9776,10 -9775,6 +9776,10 @@@ Multiple list tags generated by templat
  • b
  • c
  • +!! html/parsoid +
  • a +
  • b +
  • c
  • !!end !!test @@@ -9826,29 -9821,29 +9826,29 @@@ Test the li-hack (a hack from Tidy days !!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 @@@ -9862,24 -9857,24 +9862,24 @@@ Parsoid: Make sure nested lists are ser !! options parsoid !! wikitext -# foo -## bar -* foo -** bar -: foo -:: bar +#foo +##bar +*foo +**bar +:foo +::bar !! html
        -
      1. foo
          -
        1. bar
        2. +
        3. foo
            +
          1. bar
          -
        • foo
            -
          • bar
          • +
          • foo
              +
            • bar
          -
          foo
          -
          bar
          +
          foo
          +
          bar
          !! end @@@ -9913,7 -9908,7 +9913,7 @@@ Unbalanced closing block tags break a l
          • a
        • b
        • -!! html+parsoid +!! html/parsoid
          • a
          @@@ -9949,14 -9944,14 +9949,14 @@@ Unclosed formatting tags that straddle !! options parsoid=wt2html,wt2wt,html2html !! wikitext -# a -# b +# a +#b !! html/php+tidy -
          1. a
          2. -
          3. b
          +
          1. a
          2. +
          3. b
          !! html/parsoid -
          1. a
          2. -
          3. b
          +
          1. a
          2. +
          3. b
          !! end # Output is ugly because of all the misnested tag fixups. @@@ -9971,16 -9966,16 +9971,16 @@@ 1. List embedded in a formatting tag !! wikitext -* foo +*foo !! html/php+tidy

          -

          • foo

          +

          • foo

          !! html/parsoid
            -
          • foo
          • +
          • foo
          !!end @@@ -10161,35 -10156,35 +10161,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 -
          • 01
          • -
          • 1
          • -
          • January
          • -
          • January
          • -
          • Jan
          • -
          • 1
          • -
          • 01
          • -
          • Thursday
          • -
          • 1970
          • -
          • 00:02
          • -
          • 00
          • -
          • 1
          • -
          • 4
          • -
          • 19700101000203
          +*{{LOCALMONTH}} +*{{LOCALMONTH1}} +*{{LOCALMONTHNAME}} +*{{LOCALMONTHNAMEGEN}} +*{{LOCALMONTHABBREV}} +*{{LOCALDAY}} +*{{LOCALDAY2}} +*{{LOCALDAYNAME}} +*{{LOCALYEAR}} +*{{LOCALTIME}} +*{{LOCALHOUR}} +*{{LOCALWEEK}} +*{{LOCALDOW}} +*{{LOCALTIMESTAMP}} +!! html +
          • 01
          • +
          • 1
          • +
          • January
          • +
          • January
          • +
          • Jan
          • +
          • 1
          • +
          • 01
          • +
          • Thursday
          • +
          • 1970
          • +
          • 00:02
          • +
          • 00
          • +
          • 1
          • +
          • 4
          • +
          • 19700101000203
          !! end @@@ -11255,11 -11250,11 +11255,11 @@@ Templates with templated nam !! html

          foo

          -
          • item 1
          +
          • item 1
          !! html/parsoid

          foo

          -
          • item 1
          +
          • item 1
          !! end ## Regression test; the output here isn't really that interesting. @@@ -11343,28 -11338,28 +11343,28 @@@ T2553: link with two variables in a pip 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 - - + - - + - - +
          testing two | three four +testing two |threefour three four +threefour testing="two" | three four +testing="two" |threefour
          !! html/parsoid - - - + + +
          testing two | three four three four testing="two" | three four
          testing two |threefourthreefourtesting="two" |threefour
          !! end @@@ -11372,11 -11367,11 +11372,11 @@@ 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 - +
          Test One two "three" four
          Test One two "three" four
          !! end @@@ -11490,12 -11485,12 +11490,12 @@@ foo {{table}

          - - + - - +
          1 2 +12
          3 4 +34
          !! end @@@ -11510,12 -11505,12 +11510,12 @@@ fo

          - - + - - +
          1 2 +12
          3 4 +34
          !! end @@@ -11833,32 -11828,32 +11833,32 @@@ Includes and comments at SO !! 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 @@@ -12077,10 -12072,10 +12077,10 @@@ Preprocessor precedence 5: tplarg take !! wikitext {{Precedence5|Bullet}} !! html/php -
          • Bar
          +
          • Bar
          !! html/parsoid -
          • Bar
          +
          • Bar
          !! end !! test @@@ -12170,14 -12165,14 +12170,14 @@@ Preprocessor precedence 9: groups of br {{Preprocessor precedence 9|Four|Bullet|1|2}} !! html/php
          4
          -
          {Four}
          +
          {Four}
          5
          -
          -
          • Bar
          +
          +
          • Bar
          6
          -
          Four
          +
          Four
          7
          -
          {Bullet}
          +
          {Bullet}
          !! html/parsoid
          @@@ -12215,21 -12210,21 +12215,21 @@@ language=z {{Preprocessor precedence 10|Three|raw2|Bullet|1|2}} !! html/php
          1
          -
          raw
          +
          raw
          2
          -
          -
          -
          • Bar-
          +
          -
          +
          • Bar-
          3
          -
          -Three-
          +
          -Three-
          4
          -
          raw2
          +
          raw2
          5
          -
          -
          -
          • Bar-
          +
          -
          +
          • Bar-
          6
          -
          -Three-
          +
          -Three-
          7
          -
          raw2
          +
          raw2
          !! html/parsoid
          @@@ -12283,14 -12278,14 +12283,14 @@@ Preprocessor precedence 12: broken lang 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}} -*
          foo-{bar}bat
          -* {{echo|
          foo-{bar}bat
          }} +*foo-{bar}bat +*{{echo|foo-{bar}bat}} +*
          foo-{bar}bat
          +*{{echo|
          foo-{bar}bat
          }} foo-{bar}bat {{echo|foo-{bar}bat}} @@@ -12298,14 -12293,14 +12298,14 @@@ !! html/php+tidy

          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 (
            )
          @@@ -12334,13 -12329,13 +12334,13 @@@ Preprocessor precedence 13: broken lang
            !! 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
           -
           +
            !! html/parsoid
            
          • Example in URL
          • @@@ -12352,18 -12347,18 +12352,18 @@@ !! 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 @@@ -12449,6 -12444,32 +12449,32 @@@ parsoid=wt2htm

            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 ### @@@ -12913,17 -12934,17 +12939,17 @@@ Templates: Support for templates genera 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 @@@ -13042,14 -13063,10 +13068,14 @@@ Templates: Wiki Tables: 1a. Fostering o a
    -!! html+tidy +!! html/php+tidy a
    +!! html/parsoid +

    a

    + +
    !! end !!test @@@ -15165,10 -15182,6 +15191,10 @@@ Image: caption containing leading spac
    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 @@@ -15176,21 -15189,21 +15202,21 @@@ parsoid=wt2html,wt2wt,html2htm !! 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
    FooBar
    Foo1 Foo1 Bar1
    and some more text.
    !! end @@@ -16300,7 -16313,7 +16326,7 @@@ es:1 fr: !! test Basic section headings !! wikitext -== Headline 1 == +==Headline 1== Some text ==Headline 2== @@@ -16322,12 -16335,12 +16348,12 @@@ Blah bla !! 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 @@@ -16369,10 -16382,10 +16395,10 @@@ TOC anchors don't collide !! wikitext __FORCETOC__ -== Headline 2 == -== Headline == -== Headline 2 == -== Headline == +==Headline 2== +==Headline== +==Headline 2== +==Headline== !! html/php

    Contents

      @@@ -16397,16 -16410,16 +16423,16 @@@ Handling of sections up to level 6 and !! options parsoid=wt2html !! wikitext -= Level 1 Heading= -== Level 2 Heading== -=== Level 3 Heading=== -==== Level 4 Heading==== -===== Level 5 Heading===== -====== Level 6 Heading====== -======= Level 7 Heading======= -======== Level 8 Heading======== -========= Level 9 Heading========= -========== Level 10 Heading========== +=Level 1 Heading= +==Level 2 Heading== +===Level 3 Heading=== +====Level 4 Heading==== +=====Level 5 Heading===== +======Level 6 Heading====== +=======Level 7 Heading======= +========Level 8 Heading======== +=========Level 9 Heading========= +==========Level 10 Heading========== !! html/php

      Contents

      @@@ -16444,33 -16457,33 +16470,33 @@@

      Level 4 Heading[edit]

      Level 5 Heading[edit]
      Level 6 Heading[edit]
      -
      = Level 7 Heading=[edit]
      -
      == Level 8 Heading==[edit]
      -
      === Level 9 Heading===[edit]
      -
      ==== Level 10 Heading====[edit]
      +
      =Level 7 Heading=[edit]
      +
      ==Level 8 Heading==[edit]
      +
      ===Level 9 Heading===[edit]
      +
      ====Level 10 Heading====[edit]
      !! html/parsoid -

      Level 1 Heading

      -

      Level 2 Heading

      -

      Level 3 Heading

      -

      Level 4 Heading

      -
      Level 5 Heading
      -
      Level 6 Heading
      -
      = Level 7 Heading=
      -
      == Level 8 Heading==
      -
      === Level 9 Heading===
      -
      ==== Level 10 Heading====
      +

      Level 1 Heading

      +

      Level 2 Heading

      +

      Level 3 Heading

      +

      Level 4 Heading

      +
      Level 5 Heading
      +
      Level 6 Heading
      +
      =Level 7 Heading=
      +
      ==Level 8 Heading==
      +
      ===Level 9 Heading===
      +
      ====Level 10 Heading====
      !! end !! test TOC regression (T11764) !! wikitext -== title 1 == -=== title 1.1 === -==== title 1.1.1 ==== -=== title 1.2 === -== title 2 == -=== title 2.1 === +==title 1== +===title 1.1=== +====title 1.1.1==== +===title 1.2=== +==title 2== +===title 2.1=== !! html

      Contents

        @@@ -16522,12 -16535,12 +16548,12 @@@ TOC with wgMaxTocLevel=3 (T8204 !! options wgMaxTocLevel=3 !! wikitext -== title 1 == -=== title 1.1 === -==== title 1.1.1 ==== -=== title 1.2 === -== title 2 == -=== title 2.1 === +==title 1== +===title 1.1=== +====title 1.1.1==== +===title 1.2=== +==title 2== +===title 2.1=== !! html

        Contents

          @@@ -16588,8 -16601,8 +16614,8 @@@ wgMaxTocLevel= !! test Resolving duplicate section names !! wikitext -== Foo bar == -== Foo bar == +==Foo bar== +==Foo bar== !! html

          Foo bar[edit]

          Foo bar[edit]

          @@@ -16599,8 -16612,8 +16625,8 @@@ !! test Resolving duplicate section names with differing case (T12721) !! wikitext -== Foo bar == -== Foo Bar == +==Foo bar== +==Foo Bar== !! html

          Foo bar[edit]

          Foo Bar[edit]

          @@@ -16654,9 -16667,9 +16680,9 @@@ Link inside a section headin TOC regression (T14077) !! wikitext __TOC__ -== title 1 == -=== title 1.1 === -== title 2 == +==title 1== +===title 1.1=== +==title 2== !! html

          Contents

            @@@ -16717,19 -16730,19 +16743,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) @@@ -16762,19 -16775,19 +16788,19 @@@ !! 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 @@@ -16783,22 -16796,22 +16809,22 @@@ Header with space, plus and underscore !! 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]] @@@ -16848,22 -16861,22 +16874,22 @@@ !! html/parsoid

            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 @@@ -16912,13 -16925,13 +16938,13 @@@ HTML headers vs TOC (T25393 (__NOEDITSECTION__ for clearer output, doesn't matter here) !! wikitext

            Header 1

            -== Header 1.1 == -== Header 1.2 == +==Header 1.1== +==Header 1.2==

            Header 2

            -== Header 2.1 == -== Header 2.2 == +==Header 2.1== +==Header 2.2== __NOEDITSECTION__ !! html/php

            Contents

            @@@ -16947,13 -16960,13 +16973,13 @@@ !! html/parsoid

            Header 1

            -

            Header 1.1

            -

            Header 1.2

            +

            Header 1.1

            +

            Header 1.2

            Header 2

            -

            Header 2.1

            -

            Header 2.2

            +

            Header 2.1

            +

            Header 2.2

            !! end @@@ -17117,17 -17130,17 +17143,17 @@@ table with multiple empty attribute val parsoid=wt2html,html2html !! wikitext {| title= id= -| hi +|hi |} !! html/php -
            hi +hi
            !! html/parsoid - +
            hi
            hi
            !! end @@@ -17168,12 -17181,12 +17194,12 @@@ HTML multiple attributes correctio Table multiple attributes correction !! wikitext {| -!+ class="error" class="awesome"| status +!+ class="error" class="awesome"|status |} !! html -
            status +status
            !!end @@@ -17399,8 -17412,9 +17425,8 @@@ Media link with nasty tex !! html/php Safe Link<div style="display:none">" onmouseover="alert(document.cookie)" onfoo="</div> -!! html+php/tidy -

            Safe Link

            -
            " onmouseover="alert(document.cookie)" onfoo="
            +!! html/php+tidy +

            Safe Link

            " onmouseover="alert(document.cookie)" onfoo="
            !! html/parsoid

            Safe Link

            @@@ -17924,12 -17938,12 +17950,12 @@@ MSIE 6 CSS safety test: Repetition mark Table attribute legitimate extension !! wikitext {| -!+ style="color:blue"| status +!+ style="color:blue"|status |} !! html -
            status +status
            !!end @@@ -17938,12 -17952,12 +17964,12 @@@ Table attribute safety !! wikitext {| -!+ style="border-width:expression(0+alert(document.cookie))"| status +!+ style="border-width:expression(0+alert(document.cookie))"|status |} !! html -
            status +status
            !! end @@@ -18821,7 -18835,7 +18847,7 @@@ Fuzz testing: Parser1 !! test Fuzz testing: Parser14 !! wikitext -== onmouseover= == +==onmouseover=== http://__TOC__ !! html/php

            onmouseover=[edit]

            @@@ -18840,7 -18854,7 +18866,7 @@@ http://

            !! html/parsoid -

            onmouseover=

            +

            onmouseover=

            http://__TOC__

            !! end @@@ -18892,12 -18906,12 +18918,12 @@@ Fuzz testing: Parser1 Fuzz testing: Parser21 !! wikitext {| -! irc://{{ftp://a" onmouseover="alert('hello world');" +!irc://{{ftp://a" onmouseover="alert('hello world');" | !! html - @@@ -20068,23 -20082,23 +20094,23 @@@ xx !! test Handling of in URLs !! wikitext -** irc:// a +*irc:// a !! html/php - + !! html/parsoid - + !! end !! test Handling of %0A in URLs !! wikitext -** irc://%0Aa +*irc://%0Aa !! html/php - + !! html/parsoid - + !! end # The PHP parser strips the empty tags out for giggles; parsoid doesn't. @@@ -20154,51 -20168,51 +20180,51 @@@ Say the magic wor !! options title=[[Parser test]] !! wikitext -* {{PAGENAME}} -* {{PAGENAMEE}} -* {{FULLPAGENAME}} -* {{FULLPAGENAMEE}} -* {{BASEPAGENAME}} -* {{BASEPAGENAMEE}} -* {{SUBPAGENAME}} -* {{SUBPAGENAMEE}} -* {{ROOTPAGENAME}} -* {{ROOTPAGENAMEE}} -* {{TALKPAGENAME}} -* {{TALKPAGENAMEE}} -* {{SUBJECTPAGENAME}} -* {{SUBJECTPAGENAMEE}} -* {{NAMESPACEE}} -* {{NAMESPACE}} -* {{NAMESPACENUMBER}} -* {{TALKSPACE}} -* {{TALKSPACEE}} -* {{SUBJECTSPACE}} -* {{SUBJECTSPACEE}} -* {{Dynamic|{{NUMBEROFUSERS}}|{{NUMBEROFPAGES}}|{{CURRENTVERSION}}|{{CONTENTLANGUAGE}}|{{DIRECTIONMARK}}|{{CURRENTTIMESTAMP}}|{{NUMBEROFARTICLES}}}} -!! html -
            • Parser test
            • -
            • Parser_test
            • -
            • Parser test
            • -
            • Parser_test
            • -
            • Parser test
            • -
            • Parser_test
            • -
            • Parser test
            • -
            • Parser_test
            • -
            • Parser test
            • -
            • Parser_test
            • -
            • Talk:Parser test
            • -
            • Talk:Parser_test
            • -
            • Parser test
            • -
            • Parser_test
            • -
            • -
            • -
            • 0
            • -
            • Talk
            • -
            • Talk
            • -
            • -
            • -
            • Template:Dynamic
            +*{{PAGENAME}} +*{{PAGENAMEE}} +*{{FULLPAGENAME}} +*{{FULLPAGENAMEE}} +*{{BASEPAGENAME}} +*{{BASEPAGENAMEE}} +*{{SUBPAGENAME}} +*{{SUBPAGENAMEE}} +*{{ROOTPAGENAME}} +*{{ROOTPAGENAMEE}} +*{{TALKPAGENAME}} +*{{TALKPAGENAMEE}} +*{{SUBJECTPAGENAME}} +*{{SUBJECTPAGENAMEE}} +*{{NAMESPACEE}} +*{{NAMESPACE}} +*{{NAMESPACENUMBER}} +*{{TALKSPACE}} +*{{TALKSPACEE}} +*{{SUBJECTSPACE}} +*{{SUBJECTSPACEE}} +*{{Dynamic|{{NUMBEROFUSERS}}|{{NUMBEROFPAGES}}|{{CURRENTVERSION}}|{{CONTENTLANGUAGE}}|{{DIRECTIONMARK}}|{{CURRENTTIMESTAMP}}|{{NUMBEROFARTICLES}}}} +!! html +
            • Parser test
            • +
            • Parser_test
            • +
            • Parser test
            • +
            • Parser_test
            • +
            • Parser test
            • +
            • Parser_test
            • +
            • Parser test
            • +
            • Parser_test
            • +
            • Parser test
            • +
            • Parser_test
            • +
            • Talk:Parser test
            • +
            • Talk:Parser_test
            • +
            • Parser test
            • +
            • Parser_test
            • +
            • +
            • +
            • 0
            • +
            • Talk
            • +
            • Talk
            • +
            • +
            • +
            • Template:Dynamic
            !! end ### Note: Above tests excludes the "{{NUMBEROFADMINS}}" magic word because it generates a MySQL error when included. @@@ -20914,20 -20928,20 +20940,20 @@@ Illegal character references (T106578 ; Surrogate: �� ; This is an okay astral character: 💩 !! html+tidy -
            Null
            -
            &#00;
            -
            FF
            -
            &#xC;
            -
            CR
            -
            &#xD;
            -
            Control (low)
            -
            &#8;
            -
            Control (high)
            -
            &#x7F; &#x9F;
            -
            Surrogate
            -
            &#xD83D;&#xDCA9;
            -
            This is an okay astral character
            -
            💩
            +
            Null
            +
            &#00;
            +
            FF
            +
            &#xC;
            +
            CR
            +
            &#xD;
            +
            Control (low)
            +
            &#8;
            +
            Control (high)
            +
            &#x7F; &#x9F;
            +
            Surrogate
            +
            &#xD83D;&#xDCA9;
            +
            This is an okay astral character
            +
            💩
            !! end !! test @@@ -21291,20 -21305,20 +21317,20 @@@ parsoid=wt2htm !! 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 @@@ -21549,7 -21563,7 +21575,7 @@@ anchorencode encodes like the TOC gener !! config wgFragmentMode=[ 'html5', 'legacy' ] !! wikitext -=== _ +:.3A%3A _ &&]] x === +===_ +:.3A%3A _ &&]] x=== {{anchorencode: _ +:.3A%3A _ &&]] x}} __NOEDITSECTION__ !! html/php @@@ -21557,7 -21571,7 +21583,7 @@@

            +:.3A%3A_&&]]_x

            !! html/parsoid -

            _ +:.3A%3A _ &&]] x

            +

            _ +:.3A%3A _ &&]] x

            +:.3A%3A_&&]]_x

            !! end @@@ -21567,7 -21581,7 +21593,7 @@@ anchorencode encodes like the TOC gener !! config wgFragmentMode=[ 'legacy' ] !! wikitext -=== _ +:.3A%3A&&]] === +===_ +:.3A%3A&&]]=== {{anchorencode: _ +:.3A%3A&&]] }} __NOEDITSECTION__ !! html/php @@@ -21851,12 -21865,12 +21877,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

            Naslov[уреди]

            Ноте тхат евен ан унпротецтед хеадлине ИД ис нот аффецтед бy лангуаге @@@ -21865,7 -21879,7 +21891,7 @@@

            Латински[уреди]

            !! html/parsoid -

            +

            Note that even an unprotected headline ID is not affected by language conversion:

            @@@ -22752,7 -22766,7 +22778,7 @@@ parsoid=wt2html,wt2wt,html2htm
            irc://{{ftp://a" onmouseover="alert('hello world');" +irc://{{ftp://a" onmouseover="alert('hello world');"
            -
            B +B
            !! html/parsoid @@@ -22883,20 -22897,20 +22909,20 @@@ language=s !! test T2529: Uncovered bullet !! wikitext -* Foo {{bullet}} +*Foo {{bullet}} !! html -
            • Foo
            • -
            • Bar
            +
            • Foo
            • +
            • Bar
            !! end !! test T2529: Uncovered bullet in a deeply nested list !! wikitext -******* Foo {{bullet}} +*******Foo {{bullet}} !! html -
                        • Foo
            • -
            • Bar
            +
                        • Foo
            • +
            • Bar
            !! end @@@ -22912,12 -22926,12 +22938,12 @@@

            - - + - - +
            1 2 +12
            3 4 +34

            y

            @@@ -22926,10 -22940,10 +22952,10 @@@ !! test T2529: Uncovered bullet in parser function result !! wikitext -* Foo {{lc:{{bullet}} }} +*Foo {{lc:{{bullet}} }} !! html -
            • Foo
            • -
            • bar
            +
            • Foo
            • +
            • bar
            !! end @@@ -23136,7 -23150,6 +23162,7 @@@ 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 @@@ -23532,7 -23545,7 +23558,7 @@@ commen Bad images - basic functionality !! wikitext [[File:Bad.jpg]] -!! DISABLED/html/php +!! html/php+disabled !! html/parsoid

            !! end @@@ -23543,7 -23556,7 +23569,7 @@@ Bad images - T18039: text after bad ima Foo bar [[File:Bad.jpg]] Bar foo -!! DISABLED/html/php +!! html/php+disabled

            Foo bar

            Bar foo

            @@@ -23721,13 -23734,13 +23747,13 @@@ showindicator [[Main Page]] [[File:Foobar.jpg|25px|link=]] [[File:Foobar.jpg|25px]] -* foo -* bar +*foo +*bar foo Preformatted
            Broken tag {| class=wikitable -| cell +|cell |} Two @@@ -23737,8 -23750,8 +23763,8 @@@ paragraphsMain Page 03=Foobar.jpg 04=Foobar.jpg -05=
            • foo
            • -
            • bar
            +05=
            • foo
            • +
            • bar
            06=foo 07=
            Preformatted
            @@@ -23747,7 -23760,7 +23773,7 @@@
              
              09=
             -
            cell +cell
            10=

            Two @@@ -24014,7 -24027,7 +24040,7 @@@ T28375: TOC with italic title=[[Main Page]] !! wikitext __TOC__ -== ''Lost'' episodes == +==''Lost'' episodes== !! html/php

            Contents

              @@@ -24026,7 -24039,7 +24052,7 @@@ !! html/parsoid -

              Lost episodes

              +

              Lost episodes

              !! end !! test @@@ -24035,7 -24048,7 +24061,7 @@@ T28375: TOC with bol title=[[Main Page]] !! wikitext __TOC__ -== '''should be bold''' then normal text == +=='''should be bold''' then normal text== !! html/php

              Contents

                @@@ -24047,7 -24060,7 +24073,7 @@@ !! html/parsoid -

                should be bold then normal text

                +

                should be bold then normal text

                !! end !! test @@@ -24056,7 -24069,7 +24082,7 @@@ T35845: Headings become cursive in TOC title=[[Main Page]] !! wikitext __TOC__ -== Image [[Image:foobar.jpg]] == +==Image [[Image:foobar.jpg]]== !! html/php

                Contents

                  @@@ -24068,7 -24081,7 +24094,7 @@@ !! html/parsoid -

                  Image

                  +

                  Image

                  !! end !! test @@@ -24077,7 -24090,7 +24103,7 @@@ T35845 (2): Headings become bold in TO title=[[Main Page]] !! wikitext __TOC__ -==
                  Quote
                  == +==
                  Quote
                  == !! html/php

                  Contents

                    @@@ -24097,7 -24110,7 +24123,7 @@@

                    Quote

                    [edit]

                    !! html/parsoid -

                    Quote

                    +

                    Quote

                    !! end !! test @@@ -24108,7 -24121,7 +24134,7 @@@ wgFragmentMode=[ 'html5', 'legacy' title=[[Main Page]] !! wikitext __TOC__ -== Proof: 2 < 3 == +==Proof: 2 < 3== Hanc marginis exiguitas non caperet. QED !! html/php @@@ -24124,7 -24137,7 +24150,7 @@@ QE

                    !! html/parsoid -

                    Proof: 2 < 3

                    +

                    Proof: 2 < 3

                    Hanc marginis exiguitas non caperet. QED

                    !! end @@@ -24133,9 -24146,9 +24159,9 @@@ Multiple tags in TOC !! wikitext __TOC__ -== Foo Bar == +==Foo Bar== -== Foo
                    Bar
                    == +==Foo
                    Bar
                    == !! html/php

                    Contents

                      @@@ -24159,9 -24172,9 +24185,9 @@@

                      Foo

                      Bar

                      [edit]

                      !! html/parsoid -

                      Foo Bar

                      +

                      Foo Bar

                      -

                      Foo
                      Bar

                      +

                      Foo
                      Bar

                      !! end # Don't expect Parsoid to roundtrip this until the php parser comes closer to @@@ -24172,9 -24185,9 +24198,9 @@@ Tags with parameters in TO parsoid=wt2html !! wikitext __TOC__ -== Hello == +==Hello== -== Evilbye == +==Evilbye== !! html/php

                      Contents

                        @@@ -24188,24 -24201,24 +24214,24 @@@ !! 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

                          @@@ -24225,18 -24238,18 +24251,18 @@@ !! 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

                            @@@ -24248,14 -24261,14 +24274,14 @@@ !! html/parsoid -

                            test

                            +

                            test

                            !! end !! test T35715: s/strike element in ToC !! wikitext __TOC__ -== test test test == +==test test test== !! html/php

                            Contents

                              @@@ -24267,14 -24280,14 +24293,14 @@@ !! 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

                                @@@ -24286,7 -24299,7 +24312,7 @@@ !! html/parsoid -

                                x

                                +

                                x

                                !! end !! article @@@ -24438,17 -24451,17 +24464,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 @@@ -24554,11 -24567,11 +24580,11 @@@ Disable TO notoc !! wikitext Lead -== Section 1 == -== Section 2 == -== Section 3 == -== Section 4 == -== Section 5 == +==Section 1== +==Section 2== +==Section 3== +==Section 4== +==Section 5== !! html

                                Lead

                                @@@ -25683,9 -25696,9 +25709,9 @@@ parsoid=html2w !! html/php - -
                                <foo +<foo bar> +bar>
                                !! end @@@ -26575,12 -26588,12 +26601,12 @@@ parsoid=wt2html,html2htm Accept empty td cell attribute !! wikitext {| -| align="center" | foo || | +| align="center" |foo|| | |} !! html - +
                                foo foo
                                @@@ -26590,13 -26603,13 +26616,13 @@@ Non-empty attributes in th-cells !! wikitext {| -! Foo !! style="color: red" | Bar +!Foo!! style="color: red" |Bar |} !! html - - +
                                Foo Bar +FooBar
                                !!end @@@ -26605,13 -26618,13 +26631,13 @@@ Accept empty attributes in th-cells !! wikitext {| -!| foo !!| bar +!|foo!!|bar |} !! html - - +
                                foo bar +foobar
                                !!end @@@ -26620,17 -26633,17 +26646,17 @@@ Empty table rows go away !! wikitext {| -| Hello -| there +|Hello +|there |- class="foo" |- |} !! html - -
                                Hello +Hello there +there
                                @@@ -26772,13 -26785,13 +26798,13 @@@ Indent and comment before table ro !! wikitext {| |- - | there + |there |} !! html/php -
                                there +there
                                !! html/parsoid @@@ -27711,7 -27724,7 +27737,7 @@@ parsoid=html2w !! html/parsoid
                                • a
                                  b
                                • c
                                !! wikitext -* a
                                b +* a
                                b * c !! end @@@ -28411,9 -28424,9 +28437,9 @@@ parsoid=html2wt,wt2w |- |- |- -|
                                +|
                                - -|
                                +|
                                - |} !! html/php+tidy @@@ -28866,7 -28879,7 +28892,7 @@@ parsoid= !! html/parsoid

                                foo
                                bar

                                !! wikitext -== foo
                                bar == +== foo
                                bar == !! end !! test @@@ -29576,15 -29589,15 +29602,15 @@@ parsoid= !! test Empty LI (T49673) !! wikitext -* a +*a * * -* b +*b !! html+tidy -
                                • a
                                • -
                                • +
                                  • a
                                  • +
                                  • -
                                  • b
                                  +
                                • b
                                !! end !! test @@@ -29709,14 -29722,14 +29735,14 @@@ Decoding of HTML entities in headings a !! config wgFragmentMode=[ 'html5', 'legacy' ] !! wikitext -== A&B&C&amp;D&amp;amp;E == +==A&B&C&amp;D&amp;amp;E== [[#A&B&C&amp;D&amp;amp;E]] !! html/php

                                A&B&C&amp;D&amp;amp;E[edit]

                                #A&B&C&amp;D&amp;amp;E

                                !! html/parsoid -

                                A&B&C&amp;D&amp;amp;E

                                +

                                A&B&C&amp;D&amp;amp;E

                                #A&B&C&amp;D&amp;amp;E

                                !! end @@@ -29725,7 -29738,7 +29751,7 @@@ Decoding of HTML entities in headings a !! config wgFragmentMode=[ 'legacy' ] !! wikitext -== A&B&C&amp;D&amp;amp;E == +==A&B&C&amp;D&amp;amp;E== [[#A&B&C&amp;D&amp;amp;E]] !! html/php

                                A&B&C&amp;D&amp;amp;E[edit]

                                @@@ -29778,17 -29791,17 +29804,17 @@@ HTML5 ids: fallback to legac !! config wgFragmentMode=[ 'html5', 'legacy' ] !! wikitext -== Foo bar == +==Foo bar== -== foo Bar == +==foo Bar== -== Тест == +==Тест== -== Тест == +==Тест== -== тест == +==тест== -== Hey < # " > % : ' == +==Hey < # " > % : '== [[#Foo bar]] [[#foo Bar]] [[#Тест]] [[#тест]] [[#Hey < # " > % : ']] {{anchorencode:💩}} @@@ -29819,20 -29832,20 +29845,20 @@@

                                #啤酒 #啤酒

                                !! html/parsoid -

                                Foo bar

                                +

                                Foo bar

                                -

                                foo Bar

                                +

                                foo Bar

                                -

                                Тест

                                +

                                Тест

                                -

                                Тест

                                +

                                Тест

                                -

                                тест

                                +

                                тест

                                -

                                Hey < # " > % : '

                                +

                                Hey < # " > % : '

                                #Foo bar #foo Bar #Тест #тест #Hey < # " > % : '

                                -

                                💩

                                +

                                💩

                                #啤酒 #啤酒

                                @@@ -29844,17 -29857,17 +29870,17 @@@ HTML5 ids: legacy with a fallback to mo !! config wgFragmentMode=[ 'legacy', 'html5' ] !! wikitext -== Foo bar == +==Foo bar== -== foo Bar == +==foo Bar== -== Тест == +==Тест== -== Тест == +==Тест== -== тест == +==тест== -== Hey < # " > % : ' == +==Hey < # " > % : '== [[#Foo bar]] [[#foo Bar]] [[#Тест]] [[#тест]] [[#Hey < # " > % : ']] {{anchorencode:💩}} @@@ -29892,17 -29905,17 +29918,17 @@@ HTML5 ids: no legac !! config wgFragmentMode=[ 'html5' ] !! wikitext -== Foo bar == +==Foo bar== -== foo Bar == +==foo Bar== -== Тест == +==Тест== -== Тест == +==Тест== -== тест == +==тест== -== Hey < # " > % : ' == +==Hey < # " > % : '== [[#Foo bar]] [[#foo Bar]] [[#Тест]] [[#тест]] [[#Hey < # " > % : ']] {{anchorencode:💩}} @@@ -29939,16 -29952,13 +29965,16 @@@ T90902: Normalize weird characters in s !! config wgFragmentMode=[ 'html5', 'legacy' ] !! wikitext -== Foo bar == +==Foo bar== [[#Foo bar]] !! html/php

                                Foo bar[edit]

                                #Foo bar

                                +!! html/parsoid +

                                Foo bar

                                +

                                #Foo bar

                                !! end !! test @@@ -30004,40 -30014,40 +30030,40 @@@ parsoid= "wrapSections": true } !! wikitext -= 1 = +=1= a -= 2 = +=2= b -== 2.1 == +==2.1== c -== 2.2 == +==2.2== d -=== 2.2.1 === +===2.2.1=== e -= 3 = +=3= f !! html/parsoid -

                                1

                                +

                                1

                                a

                                -

                                2

                                +

                                2

                                b

                                -

                                2.1

                                +

                                2.1

                                c

                                -

                                2.2

                                +

                                2.2

                                d

                                -

                                2.2.1

                                +

                                2.2.1

                                e

                                -

                                3

                                +

                                3

                                f

                                @@@ -30056,13 -30066,13 +30082,13 @@@ Para 2 with a
                                nested in it

                                Para 1.

                                @@@ -30071,13 -30081,13 +30097,13 @@@

                                Para 3.

                                -

                                1

                                +

                                1

                                a

                                -

                                2

                                +

                                2

                                b

                                -

                                2.1

                                +

                                2.1

                                c

                                @@@ -30090,29 -30100,29 +30116,29 @@@ parsoid= "wrapSections": true } !! wikitext -= 1 = +=1= a {{echo|1= -== 1.1 == +==1.1== b }} -== 1.2 == +==1.2== c -= 2 = +=2= d !! html/parsoid -

                                1

                                +

                                1

                                a

                                -

                                1.1

                                +

                                1.1

                                b

                                -

                                1.2

                                +

                                1.2

                                c

                                -

                                2

                                +

                                2

                                d

                                !! end @@@ -30126,26 -30136,26 +30152,26 @@@ parsoid= "modes": ["wt2html", "wt2wt"] } !! wikitext -= 1 = +=1= a {{echo|1= -== 1.1 == +==1.1== b -=== 1.1.1 === +===1.1.1=== d }} -= 2 = +=2= e !! html/parsoid -

                                1

                                +

                                1

                                a

                                -

                                1.1

                                +

                                1.1

                                b

                                -

                                1.1.1

                                +

                                1.1.1

                                d

                                -

                                2

                                +

                                2

                                e

                                !! end @@@ -30159,32 -30169,32 +30185,32 @@@ parsoid= "modes": ["wt2html", "wt2wt"] } !! wikitext -= 1 = +=1= a {{echo|1= x -== 1.1 == +==1.1== b ==1.2== c ===1.2.1=== d }} -= 2 = +=2= e !! html/parsoid

                                1

                                a

                                -

                                x

                                -

                                1.1

                                +

                                x

                                +

                                1.1

                                b

                                1.2

                                c

                                1.2.1

                                d

                                -

                                2

                                +

                                2

                                e

                                !! end @@@ -30203,7 -30213,7 +30229,7 @@@ parsoid= a {{echo| -= 1 = +=1= b }} @@@ -30213,8 -30223,8 +30239,8 @@@

                                a

                                - -

                                1

                                + +

                                1

                                b

                                @@@ -30233,32 -30243,32 +30259,32 @@@ parsoid= "wrapSections": true } !! wikitext -= 1 = +=1= a {{echo|1= -= 2 = +=2= b -== 2.1 == +==2.1== c }} d -= 3 = +=3= e !! html/parsoid -

                                1

                                +

                                1

                                a

                                -

                                2

                                +

                                2

                                b

                                -

                                2.1

                                +

                                2.1

                                c

                                d

                                -

                                3

                                +

                                3

                                e

                                !! end @@@ -30276,31 -30286,31 +30302,31 @@@ parsoid= "modes": ["wt2html", "wt2wt"] } !! wikitext -= 1 = +=1= a {{echo|1= -== 1.2 == +==1.2== b -= 2 = +=2= c }} d -= 3 = +=3= e !! html/parsoid -

                                1

                                +

                                1

                                a

                                -

                                1.2

                                +

                                1.2

                                b

                                -

                                2

                                +

                                2

                                c

                                d

                                -

                                3

                                +

                                3

                                e

                                !! end @@@ -30314,39 -30324,39 +30340,39 @@@ parsoid= foo
                                -= 1 = +=1= a -== 1.1 == +==1.1== b -= 2 = +=2= c
                                -= 3 = +=3= d -== 3.1 == +==3.1== e !! html/parsoid

                                foo

                                -

                                1

                                +

                                1

                                a

                                -

                                1.1

                                +

                                1.1

                                b

                                -

                                2

                                +

                                2

                                c

                                -

                                3

                                +

                                3

                                d

                                -

                                3.1

                                +

                                3.1

                                e

                                !! end @@@ -30360,44 -30370,44 +30386,44 @@@ parsoid= !! wikitext foo -= 1 = +=1= a
                                b -== 1.1 == +==1.1== c -= 2 = +=2= d
                                e -= 3 = +=3= f -== 3.1 == +==3.1== g !! html/parsoid

                                foo

                                -

                                1

                                +

                                1

                                a

                                b

                                -

                                1.1

                                +

                                1.1

                                c

                                -

                                2

                                +

                                2

                                d

                                e

                                -

                                3

                                +

                                3

                                f

                                -

                                3.1

                                +

                                3.1

                                g

                                !! end @@@ -30413,21 -30423,21 +30439,21 @@@ fo

                                a

                                -= b = +=b=

                                c

                                -= d = +=d= !! html/parsoid

                                foo

                                a

                                -

                                b

                                +

                                b

                                c

                                -

                                d

                                +

                                d

                                !! end !! test @@@ -30439,18 -30449,18 +30465,18 @@@ parsoid= !! wikitext -= 1 = +=1= a -= 2 = +=2= b !! html/parsoid
                                -

                                1

                                +

                                1

                                a

                                -

                                2

                                +

                                2

                                b

                                !! end @@@ -30463,103 -30473,15 +30489,103 @@@ parsoid= !! wikitext foo {{echo|
                                -== a == -== b == +==a== +==b==
                                }} !! html/parsoid

                                foo

                                -
                                -

                                a

                                -

                                b

                                +
                                +

                                a

                                +

                                b

                                !! end + +########################################################################## +Tests demonstrating white-space insensitivity in input wikitext +for wikitext headings, wikitext list items, and wikitext table captions, +headings, and cells. HTML versions of the same should preserve whitespace. +########################################################################## +!! test +Trim whitespace in wikitext headings, list items, table captions, headings, and cells +!! wikitext +__NOTOC__ +== Heading == +* List item +; term : definition +{| +|+ Table Caption +|- +! Table Heading 1 !! Table Heading 2 +|- +| Table Cell 1 || Table Cell 2 +|- +| class="foo" || Table Cell 3 +|- +| testing [[one|two]] | some content +|} +: {| + | Table Cell 1 || Table Cell 2 + |} foo +!! html/php+tidy +

                                Heading[edit]

                                +
                                • List item
                                +
                                term 
                                +
                                definition
                                + + + + + + + + + + + + +
                                Table Caption +
                                Table Heading 1Table Heading 2 +
                                Table Cell 1Table Cell 2 +
                                class="foo"Table Cell 3 +
                                testing two | some content +
                                +
                                + + +
                                Table Cell 1Table Cell 2 +
                                foo
                                +!! end + +# Looks like
    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 +

    foo italic and bold + some text +

    +!! end