Merge "Fix whitespace trimming in headings"

diff --combined tests/parser/parserTests.txt
index e67ad66,9a4c273..cd3858a
--- 1/tests/parser/parserTests.txt
--- 2/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@@ -12449,32 -12449,6 +12449,32 @@@ parsoid=wt2htm
  <p about="#mwt1" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"hi {{}}"}},"i":0}}]}'>hi {{}}</p>
  !! end
  
 +!! test
 +Preprocessor precedence 18: another rightmost wins scenario
 +!! options
 +parsoid=wt2html
 +!! wikitext
 +{{ -{{{{1|tplarg}}} }} }-
 +!! html/php
 +<p>{{ -{tplarg }} }-
 +</p>
 +!! html/parsoid
 +<p>{{ -{<span about="#mwt1" typeof="mw:Param" data-mw='{"parts":[{"templatearg":{"target":{"wt":"1"},"params":{"1":{"wt":"tplarg"}},"i":0}}]}'>tplarg</span> }} }-</p>
 +!! end
 +
 +!! test
 +Preprocessor precedence 19: break syntax
 +!! options
 +parsoid=wt2html
 +!! wikitext
 +-{{
 +!! html/php
 +<p>-{{
 +</p>
 +!! html/parsoid
 +<p>-{{</p>
 +!! end
 +
  ###
  ### Token Stream Patcher tests
  ###
@@@ -16967,7 -16941,8 +16967,8 @@@ __NOEDITSECTION_
  <h1><span class="mw-headline" id="Header_1">Header 1</span></h1>
  <h2><span class="mw-headline" id="Header_1.1">Header 1.1</span></h2>
  <h2><span class="mw-headline" id="Header_1.2">Header 1.2</span></h2>
- <h1><span class="mw-headline" id="Header_2">Header 2</span></h1>
+ <h1><span class="mw-headline" id="Header_2">Header 2
+ </span></h1>
  <h2><span class="mw-headline" id="Header_2.1">Header 2.1</span></h2>
  <h2><span class="mw-headline" id="Header_2.2">Header 2.2</span></h2>
  
@@@ -30511,7 -30486,8 +30512,8 @@@ headings, and cells. HTML versions of t
  Trim whitespace in wikitext headings, list items, table captions, headings, and cells
  !! wikitext
  __NOTOC__
- ==    <!--c1-->   <!--c2--> Heading    <!--c3--> <!--c4-->  ==
+ ==    <!--c1-->  <!--c2--> Spaces   <!--c3--> <!--c4-->  ==
+ ==            <!--c2-->       <!--c2--> Tabs          <!--c3--><!--c4-->      ==
  *     <!--c1-->   <!--c2-->  List item <!--c3--> <!--c4-->
  ; <!--term to define--> term : <!--term's definition--> definition
  {|
@@@ -30529,7 -30505,8 +30531,8 @@@
    |  <!--c1--> <!--c2--> Table Cell 1 <!--c3--> <!--c4--> ||   Table Cell 2 <!--c5-->
    |} foo   <!--c1-->
  !! html/php+tidy
- <h2><span class="mw-headline" id="Heading">Heading</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Heading">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
+ <h2><span class="mw-headline" id="Spaces">Spaces</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: Spaces">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
+ <h2><span class="mw-headline" id="Tabs">Tabs</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: Tabs">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
  <ul><li>List item</li></ul>
  <dl><dt>term&#160;</dt>
  <dd>definition</dd></dl>
@@@ -30563,20 -30540,19 +30566,19 @@@
  Do not trim whitespace in HTML headings, list items, table captions, headings, and cells
  !! wikitext
  __NOTOC__
- <h2>    <!--c1-->   <!--c2--> Heading    <!--c3--> <!--c4-->  <h2>
+ <h2>    <!--c1-->   <!--c2--> Heading    <!--c3--> <!--c4-->  </h2>
  <ul><li>     <!--c1-->   <!--c2-->  List item <!--c3--> <!--c4-->  </li></ul>
  <table>
  <tr><th> <!--c1--> <!--c2--> Table Heading <!--c3--> <!--c4--> <th></tr>
  <tr><td> <!--c1--> <!--c2--> Table Cell <!--c3--> <!--c4--> <th></tr>
  </table>
  !! html/php+tidy
- <h2>        Heading       </h2><h2>
+ <h2><span class="mw-headline" id="Heading">        Heading       </span></h2>
  <ul><li>          List item    </li></ul>
  <table>
  <tbody><tr><th>   Table Heading   </th><th></th></tr>
  <tr><td>   Table Cell   </td><th></th></tr>
  </tbody></table>
- </h2>
  !! end
  
  !! test