[MediaWiki-commits] [Gerrit] Sync up with Parsoid parserTests. - change (mediawiki/core)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/193980

Change subject: Sync up with Parsoid parserTests.
......................................................................

Sync up with Parsoid parserTests.

This now aligns with Parsoid commit 7608aeabdc1e47ce3dbfffd3ded85eecad647260

Change-Id: I4cb8f04b9d7988e5138c8f040fadeb0b7a9348f9
---
M tests/parser/parserTests.txt
1 file changed, 158 insertions(+), 107 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/80/193980/1

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index dec9338..32c7a39 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -6238,6 +6238,27 @@
 |}
 !! end
 
+!!test
+Testing serialization after deletion of table cells
+!!options
+parsoid={
+  "modes": ["wt2wt"],
+  "changes": [
+    ["#x", "remove"]
+  ]
+}
+!!wikitext
+{|
+!h1 !!h2 !!h3
+| id="x" |c1 {{!}}{{!}}{{!}}c2 |||c3
+|}
+!! wikitext/edited
+{|
+!h1 !!h2 !!h3
+|c2 |||c3
+|}
+!!end
+
 ###
 ### Internal links
 ###
@@ -19732,13 +19753,13 @@
 C <ref name="y" />
 <references />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{}}'><a 
href="#cite_note-1">[1]</a></span>
-B <span about="#mwt4" class="reference" id="cite_ref-x_2-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{"name":"x"}}'><a 
href="#cite_note-x-2">[2]</a></span>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span>
+B <span about="#mwt4" class="reference" id="cite_ref-x_2-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-x-2"},"attrs":{"name":"x"}}'><a
 href="#cite_note-x-2">[2]</a></span>
 C <span about="#mwt6" class="reference" id="cite_ref-y_3-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","attrs":{"name":"y"}}'><a 
href="#cite_note-y-3">[3]</a></span></p>
-<ol class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{}}'>
-<li id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> foo</li>
-<li id="cite_note-x-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-x_2-0">↑</a></span> foo</li>
-<li id="cite_note-y-3"><span rel="mw:referencedBy"><a 
href="#cite_ref-y_3-0">↑</a></span></li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt8" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">foo</span></li>
+<li about="#cite_note-x-2" id="cite_note-x-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-x_2-0">↑</a></span> <span id="mw-reference-text-cite_note-x-2" 
class="mw-reference-text">foo</span></li>
+<li about="#cite_note-y-3" id="cite_note-y-3"><span rel="mw:referencedBy"><a 
href="#cite_ref-y_3-0">↑</a></span> <span id="mw-reference-text-cite_note-y-3" 
class="mw-reference-text"></span></li>
 </ol>
 !!end
 
@@ -19751,10 +19772,10 @@
 B <ref name="x" />
 <references />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-x_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{"name":"x"}}'><a 
href="#cite_note-x-1">[1]</a></span>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-x_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-x-1"},"attrs":{"name":"x"}}'><a
 href="#cite_note-x-1">[1]</a></span>
 B <span about="#mwt4" class="reference" id="cite_ref-x_1-1" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","attrs":{"name":"x"}}'><a 
href="#cite_note-x-1">[1]</a></span></p>
-<ol class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{}}'>
-<li id="cite_note-x-1"><span rel="mw:referencedBy">↑ <a 
href="#cite_ref-x_1-0">1.0</a> <a href="#cite_ref-x_1-1">1.1</a></span> foo</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt6" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-x-1" id="cite_note-x-1"><span rel="mw:referencedBy">↑ <a 
href="#cite_ref-x_1-0">1.0</a> <a href="#cite_ref-x_1-1">1.1</a></span> <span 
id="mw-reference-text-cite_note-x-1" class="mw-reference-text">foo</span></li>
 </ol>
 !!end
 
@@ -19768,11 +19789,11 @@
 C <ref name= x  />
 <references />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-x_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{"name":"x"}}'><a 
href="#cite_note-x-1">[1]</a></span>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-x_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-x-1"},"attrs":{"name":"x"}}'><a
 href="#cite_note-x-1">[1]</a></span>
 B <span about="#mwt4" class="reference" id="cite_ref-x_1-1" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","attrs":{"name":"x"}}'><a 
href="#cite_note-x-1">[1]</a></span>
 C <span about="#mwt6" class="reference" id="cite_ref-x_1-2" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","attrs":{"name":"x"}}'><a 
href="#cite_note-x-1">[1]</a></span></p>
-<ol class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{}}'>
-<li id="cite_note-x-1"><span rel="mw:referencedBy">↑ <a 
href="#cite_ref-x_1-0">1.0</a> <a href="#cite_ref-x_1-1">1.1</a> <a 
href="#cite_ref-x_1-2">1.2</a></span> foo</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt8" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-x-1" id="cite_note-x-1"><span rel="mw:referencedBy">↑ <a 
href="#cite_ref-x_1-0">1.0</a> <a href="#cite_ref-x_1-1">1.1</a> <a 
href="#cite_ref-x_1-2">1.2</a></span> <span 
id="mw-reference-text-cite_note-x-1" class="mw-reference-text">foo</span></li>
 </ol>
 !!end
 
@@ -19785,9 +19806,9 @@
 A <ref name="constructor">foo</ref>
 <references />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-constructor_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{"name":"constructor"}}'><a
 href="#cite_note-constructor-1">[1]</a></span></p>
-<ol class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{}}'>
-<li id="cite_note-constructor-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-constructor_1-0">↑</a></span> foo</li>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-constructor_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-constructor-1"},"attrs":{"name":"constructor"}}'><a
 href="#cite_note-constructor-1">[1]</a></span></p>
+<ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-constructor-1" id="cite_note-constructor-1"><span 
rel="mw:referencedBy"><a href="#cite_ref-constructor_1-0">↑</a></span> <span 
id="mw-reference-text-cite_note-constructor-1" 
class="mw-reference-text">foo</span></li>
 </ol>
 !!end
 
@@ -19802,11 +19823,11 @@
 
 <references />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" data-mw='{"name":"ref","body":{"html":"This is a 
&lt;b data-parsoid=&#39;{\"dsr\":[19,40,3,3]}&#39;>&lt;a rel=\"mw:WikiLink\" 
href=\"./Bolded_link\" title=\"Bolded link\" 
data-parsoid=&#39;{\"stx\":\"simple\",\"a\":{\"href\":\"./Bolded_link\"},\"sa\":{\"href\":\"bolded
 link\"},\"dsr\":[22,37,2,2]}&#39;>bolded link&lt;/a>&lt;/b> and this is a 
&lt;span about=\"#mwt3\" typeof=\"mw:Transclusion\" 
data-parsoid=&#39;{\"pi\":[[{\"k\":\"1\",\"spc\":[\"\",\"\",\"\",\"\"]}]],\"dsr\":[55,76,null,null]}&#39;
 
data-mw=&#39;{\"parts\":[{\"template\":{\"target\":{\"wt\":\"echo\",\"href\":\"./Template:Echo\"},\"params\":{\"1\":{\"wt\":\"transclusion\"}},\"i\":0}}]}&#39;>transclusion&lt;/span>\n"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span></p>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span></p>
 
 <ol class="references" typeof="mw:Extension/references" about="#mwt5" 
data-mw='{"name":"references","attrs":{}}'>
-<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> This is a <b><a rel="mw:WikiLink" 
href="./Bolded_link" title="Bolded link">bolded link</a></b> and this is a 
<span about="#mwt3" typeof="mw:Transclusion" 
data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"transclusion"}},"i":0}}]}'>transclusion</span>
-</li>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">This is a <b><a rel="mw:WikiLink" href="Bolded_link" 
title="Bolded link">bolded link</a></b> and this is a <span about="#mwt3" 
typeof="mw:Transclusion" 
data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"transclusion"}},"i":0}}]}'>transclusion</span>
+</span></li>
 </ol>
 !!end
 
@@ -19823,13 +19844,13 @@
 
 <references />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" data-mw='{"name":"ref","body":{"html":"foo\n bar\n 
baz\n"},"attrs":{}}'><a href="#cite_note-1">[1]</a></span></p>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span></p>
 
 <ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'>
-<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> foo
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">foo
  bar
  baz
-</li>
+</span></li>
 </ol>
 !!end
 
@@ -19853,10 +19874,10 @@
 
 <references />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo\n\nbar\n\n\nbaz\n\n\n\nbooz\n"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span></p>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span></p>
 
 <ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'>
-<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> foo
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">foo
 
 bar
 
@@ -19866,7 +19887,7 @@
 
 
 booz
-</li>
+</span></li>
 </ol>
 !!end
 
@@ -19879,9 +19900,9 @@
 
 <references />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" data-mw='{"name":"ref","body":{"html":"foo &lt;span 
typeof=\"mw:Nowiki\" 
data-parsoid=&#39;{\"src\":\"{{\",\"dsr\":[12,14,0,0]}&#39;>{{&lt;/span>echo|"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span> B C<span typeof="mw:Nowiki">}}</span></p>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span> B C<span typeof="mw:Nowiki">}}</span></p>
 <ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'>
-<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> foo <span typeof="mw:Nowiki">{{</span>echo|</li>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">foo <span typeof="mw:Nowiki" 
data-parsoid='{"src":"{{","dsr":[12,14,0,0]}'>{{</span>echo|</span></li>
 </ol>
 !!end
 
@@ -19893,9 +19914,9 @@
 A <ref> foo <!--</ref> B C
 <references />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" data-mw='{"name":"ref","body":{"html":"foo 
&lt;!---->"},"attrs":{}}'><a href="#cite_note-1">[1]</a></span> B C</p>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span> B C</p>
 <ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'>
-<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> foo <!----></li>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">foo <!----></span></li>
 </ol>
 !!end
 
@@ -19908,11 +19929,11 @@
 
 <references />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" data-mw='{"name":"ref","body":{"html":"&lt;b 
data-parsoid=&#39;{\"stx\":\"html\",\"autoInsertedEnd\":true,\"dsr\":[8,16,3,0]}&#39;>
 foo &lt;/b>"},"attrs":{}}'><a href="#cite_note-1">[1]</a></span> B C</p>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span> B C</p>
 
 
 <ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'>
-<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <b 
data-parsoid='{"stx":"html","autoInsertedEnd":true}'> foo </b></li>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text"><b 
data-parsoid='{"stx":"html","autoInsertedEnd":true}'> foo </b></span></li>
 </ol>
 !!end
 
@@ -19925,11 +19946,11 @@
 C <ref>bar</ref> D
 <references />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{}}'><a 
href="#cite_note-1">[1]</a></span> B
-C <span about="#mwt4" class="reference" id="cite_ref-2" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"bar"},"attrs":{}}'><a 
href="#cite_note-2">[2]</a></span> D</p>
-<ol class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{}}'>
-<li id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> foo</li>
-<li id="cite_note-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-2">↑</a></span> bar</li>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span> B
+C <span about="#mwt4" class="reference" id="cite_ref-2" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-2"},"attrs":{}}'><a
 href="#cite_note-2">[2]</a></span> D</p>
+<ol class="references" typeof="mw:Extension/references" about="#mwt6" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">foo</span></li>
+<li about="#cite_note-2" id="cite_note-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-2">↑</a></span> <span id="mw-reference-text-cite_note-2" 
class="mw-reference-text">bar</span></li>
 </ol>
 !!end
 
@@ -19953,10 +19974,9 @@
 <span about="#mwt4" class="reference" id="cite_ref-2" rel="dc:references" 
typeof="mw:Extension/ref" data-mw='{"name":"ref","attrs":{}}'><a 
href="#cite_note-2">[2]</a></span></p>
 
 <p>c</p>
-<ol class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{}}'>
-<li id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span></li>
-<li id="cite_note-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-2">↑</a></span></li>
-</ol>
+<ol class="references" typeof="mw:Extension/references" about="#mwt6" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text"></span></li>
+<li about="#cite_note-2" id="cite_note-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-2">↑</a></span> <span id="mw-reference-text-cite_note-2" 
class="mw-reference-text"></span></li></ol>
 !!end
 
 !!test
@@ -19969,11 +19989,12 @@
 </ref> B
 <references />
 !! html
-<p><span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{}}'><a 
href="#cite_note-1">[1]</a></span> A
-<span about="#mwt4" class="reference" id="cite_ref-2" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"bar\n"},"attrs":{}}'><a 
href="#cite_note-2">[2]</a></span> B</p>
-<ol class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{}}'>
-<li id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> foo</li>
-<li id="cite_note-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-2">↑</a></span> bar</li>
+<p><span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span> A
+<span about="#mwt4" class="reference" id="cite_ref-2" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-2"},"attrs":{}}'><a
 href="#cite_note-2">[2]</a></span> B</p>
+<ol class="references" typeof="mw:Extension/references" about="#mwt6" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">foo</span></li>
+<li about="#cite_note-2" id="cite_note-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-2">↑</a></span> <span id="mw-reference-text-cite_note-2" 
class="mw-reference-text">bar
+</span></li>
 </ol>
 !!end
 
@@ -19986,10 +20007,10 @@
 
 <references />
 !! html
-<p><span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" data-mw='{"name":"ref","body":{"html":"foo 
&amp;lt;ref>bar&amp;lt;/ref> baz"},"attrs":{}}'><a 
href="#cite_note-1">[1]</a></span></p>
-
+<p><span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span>
+</p>
 <ol class="references" typeof="mw:Extension/references" about="#mwt5" 
data-mw='{"name":"references","attrs":{}}'>
-<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> foo &lt;ref>bar&lt;/ref> baz</li>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">foo &lt;ref>bar&lt;/ref> baz</span></li>
 </ol>
 !!end
 
@@ -20003,10 +20024,10 @@
 
 <references />
 !! html
-<p>A1 <span about="#mwt3" class="reference" id="cite_ref-a_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{"name":"a"}}'><a 
href="#cite_note-a-1">[1]</a></span> A2 <span about="#mwt4" class="reference" 
id="cite_ref-a_1-1" rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","attrs":{"name":"a"}}'><a 
href="#cite_note-a-1">[1]</a></span>
-B1 <span about="#mwt7" class="reference" id="cite_ref-b_2-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","attrs":{"name":"b"}}'><a 
href="#cite_note-b-2">[2]</a></span> B2 <span about="#mwt8" class="reference" 
id="cite_ref-b_2-1" rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"bar"},"attrs":{"name":"b"}}'><a 
href="#cite_note-b-2">[2]</a></span></p>
+<p>A1 <span about="#mwt3" class="reference" id="cite_ref-a_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-a-1"},"attrs":{"name":"a"}}'><a
 href="#cite_note-a-1">[1]</a></span> A2 <span about="#mwt4" class="reference" 
id="cite_ref-a_1-1" rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","attrs":{"name":"a"}}'><a 
href="#cite_note-a-1">[1]</a></span>
+B1 <span about="#mwt7" class="reference" id="cite_ref-b_2-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","attrs":{"name":"b"}}'><a 
href="#cite_note-b-2">[2]</a></span> B2 <span about="#mwt8" class="reference" 
id="cite_ref-b_2-1" rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-b-2"},"attrs":{"name":"b"}}'><a
 href="#cite_note-b-2">[2]</a></span></p>
 
-<ol class="references" typeof="mw:Extension/references" about="#mwt10" 
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-a-1" 
id="cite_note-a-1"><span rel="mw:referencedBy">↑ <a 
href="#cite_ref-a_1-0">1.0</a> <a href="#cite_ref-a_1-1">1.1</a></span> 
foo</li><li about="#cite_note-b-2" id="cite_note-b-2"><span 
rel="mw:referencedBy">↑ <a href="#cite_ref-b_2-0">2.0</a> <a 
href="#cite_ref-b_2-1">2.1</a></span> bar</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt10" 
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-a-1" 
id="cite_note-a-1"><span rel="mw:referencedBy">↑ <a 
href="#cite_ref-a_1-0">1.0</a> <a href="#cite_ref-a_1-1">1.1</a></span> <span 
id="mw-reference-text-cite_note-a-1" 
class="mw-reference-text">foo</span></li><li about="#cite_note-b-2" 
id="cite_note-b-2"><span rel="mw:referencedBy">↑ <a 
href="#cite_ref-b_2-0">2.0</a> <a href="#cite_ref-b_2-1">2.1</a></span> <span 
id="mw-reference-text-cite_note-b-2" class="mw-reference-text">bar</span></li>
 </ol>
 !!end
 
@@ -20020,10 +20041,9 @@
 
 <references />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{}}'><a 
href="#cite_note-1">[1]</a></span></p>
-
+<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span></p>
 <ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'>
-<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> foo</li></ol>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">foo</span></li></ol>
 !!end
 
 !!test
@@ -20035,11 +20055,12 @@
 
 <references />
 !!html
-<p><span class="reference" id="cite_ref-a_b_1-0" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{"name":"a b"}}'><a 
href="#cite_note-a_b-1">[1]</a></span>
+<p><span class="reference" id="cite_ref-a_b_1-0" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-a_b-1"},"attrs":{"name":"a
 b"}}'><a href="#cite_note-a_b-1">[1]</a></span>
 </p>
 
-<ol class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{}}'>
-<li id="cite_note-a_b-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-a_b_1-0">↑</a></span> foo</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-a_b-1" id="cite_note-a_b-1"><span 
rel="mw:referencedBy"><a href="#cite_ref-a_b_1-0">↑</a></span> <span 
id="mw-reference-text-cite_note-a_b-1" class="mw-reference-text">foo</span></li>
+</ol>
 !!end
 
 !!test
@@ -20051,11 +20072,12 @@
 
 <references />
 !!html
-<p><span class="reference" id="cite_ref-.7B.7Becho.7Ca.7D.7D_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{"name":"{{echo|a}}"}}'><a 
href="#cite_note-.7B.7Becho.7Ca.7D.7D-1">[1]</a></span>
+<p><span class="reference" id="cite_ref-.7B.7Becho.7Ca.7D.7D_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-.7B.7Becho.7Ca.7D.7D-1"},"attrs":{"name":"{{echo|a}}"}}'><a
 href="#cite_note-.7B.7Becho.7Ca.7D.7D-1">[1]</a></span>
 </p>
 
-<ol class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{}}'>
-<li id="cite_note-.7B.7Becho.7Ca.7D.7D-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-.7B.7Becho.7Ca.7D.7D_1-0">↑</a></span> foo</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-.7B.7Becho.7Ca.7D.7D-1" 
id="cite_note-.7B.7Becho.7Ca.7D.7D-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-.7B.7Becho.7Ca.7D.7D_1-0">↑</a></span> <span 
id="mw-reference-text-cite_note-.7B.7Becho.7Ca.7D.7D-1" 
class="mw-reference-text">foo</span></li>
+</ol>
 !!end
 
 !!test
@@ -20067,9 +20089,29 @@
 
 <references />
 !! html
-<p>1 <span about="#mwt3" class="reference" id="cite_ref-a_.26_b_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{"name":"a &amp; b"}}'><a 
href="#cite_note-a_.26_b-1">[1]</a></span> 2 <span about="#mwt4" 
class="reference" id="cite_ref-a_.26_b_1-1" rel="dc:references" 
typeof="mw:Extension/ref" data-mw='{"name":"ref","attrs":{"name":"a &amp;amp; 
b"}}'><a href="#cite_note-a_.26_b-1">[1]</a></span>
+<p>1 <span about="#mwt3" class="reference" id="cite_ref-a_.26_b_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-a_.26_b-1"},"attrs":{"name":"a
 &amp; b"}}'><a href="#cite_note-a_.26_b-1">[1]</a></span> 2 <span 
about="#mwt4" class="reference" id="cite_ref-a_.26_b_1-1" rel="dc:references" 
typeof="mw:Extension/ref" data-mw='{"name":"ref","attrs":{"name":"a &amp;amp; 
b"}}'><a href="#cite_note-a_.26_b-1">[1]</a></span>
+</p>
+<ol class="references" typeof="mw:Extension/references" about="#mwt6" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-a_.26_b-1" id="cite_note-a_.26_b-1"><span 
rel="mw:referencedBy">↑ <a href="#cite_ref-a_.26_b_1-0">1.0</a> <a 
href="#cite_ref-a_.26_b_1-1">1.1</a></span> <span 
id="mw-reference-text-cite_note-a_.26_b-1" 
class="mw-reference-text">foo</span></li>
+</ol>
+!!end
 
-<ol class="references" typeof="mw:Extension/references" about="#mwt10" 
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-a_.26_b-1" 
id="cite_note-a_.26_b-1"><span rel="mw:referencedBy">↑ <a 
href="#cite_ref-a_.26_b_1-0">1.0</a> <a 
href="#cite_ref-a_.26_b_1-1">1.1</a></span> foo</li>
+!!test
+Ref: 20. ref-tags with identical names but different content should keep it
+!!options
+parsoid
+!! wikitext
+A <ref name="foo">Foo one</ref>
+B <ref name="foo">Foo two</ref>
+C <ref name="foo" />
+
+<references />
+!! html
+<p>A <span about="#mwt2" class="reference" id="cite_ref-foo_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-foo-1"},"attrs":{"name":"foo"}}'><a
 href="#cite_note-foo-1">[1]</a></span>
+B <span about="#mwt4" class="reference" id="cite_ref-foo_1-1" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"Foo two"},"attrs":{"name":"foo"}}'><a 
href="#cite_note-foo-1">[1]</a></span>
+C <span about="#mwt6" class="reference" id="cite_ref-foo_1-2" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","attrs":{"name":"foo"}}'><a 
href="#cite_note-foo-1">[1]</a></span></p>
+
+<ol class="references" typeof="mw:Extension/references" about="#mwt8" 
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-foo-1" 
id="cite_note-foo-1"><span rel="mw:referencedBy">↑ <a 
href="#cite_ref-foo_1-0">1.0</a> <a href="#cite_ref-foo_1-1">1.1</a> <a 
href="#cite_ref-foo_1-2">1.2</a></span> <span 
id="mw-reference-text-cite_note-foo-1" class="mw-reference-text">Foo 
one</span></li>
 </ol>
 !!end
 
@@ -20080,7 +20122,7 @@
 !! wikitext
 <references />
 !! html
-<ol about="#mwt2" class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{}}'></ol>
+<ol class="references" typeof="mw:Extension/references" about="#mwt2" 
data-mw='{"name":"references","attrs":{}}'></ol>
 !!end
 
 !!test
@@ -20096,16 +20138,18 @@
 <references />
 <references group="b" />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{"group":"a"}}'><a 
href="#cite_note-1">[a 1]</a></span>
-B <span about="#mwt4" class="reference" id="cite_ref-2" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"bar"},"attrs":{"group":"b"}}'><a 
href="#cite_note-2">[b 1]</a></span>
-C <span class="reference" id="cite_ref-3" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"baz"},"attrs":{}}'><a 
href="#cite_note-3">[1]</a></span></p>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{"group":"a"}}'><a
 href="#cite_note-1">[a 1]</a></span>
+B <span about="#mwt4" class="reference" id="cite_ref-2" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-2"},"attrs":{"group":"b"}}'><a
 href="#cite_note-2">[b 1]</a></span>
+C <span class="reference" id="cite_ref-3" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-3"},"attrs":{}}'><a
 href="#cite_note-3">[1]</a></span></p>
 
-<ol class="references" typeof="mw:Extension/references" about="#mwt6" 
data-mw='{"name":"references","attrs":{"group":"a"}}'><li about="#cite_note-1" 
id="cite_note-1"><span rel="mw:referencedBy"><a href="#cite_ref-1">↑</a></span> 
foo</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt8" 
data-mw='{"name":"references","attrs":{"group":"a"}}'>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">foo</span></li>
 </ol>
-<ol class="references" typeof="mw:Extension/references" about="#mwt6" 
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-3" 
id="cite_note-3"><span rel="mw:referencedBy"><a href="#cite_ref-3">↑</a></span> 
baz</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt10" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-3" id="cite_note-3"><span rel="mw:referencedBy"><a 
href="#cite_ref-3">↑</a></span> <span id="mw-reference-text-cite_note-3" 
class="mw-reference-text">baz</span></li>
 </ol>
-<ol class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{"group":"b"}}'>
-<li id="cite_note-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-2">↑</a></span> bar</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt12" 
data-mw='{"name":"references","attrs":{"group":"b"}}'>
+<li about="#cite_note-2" id="cite_note-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-2">↑</a></span> <span id="mw-reference-text-cite_note-2" 
class="mw-reference-text">bar</span></li>
 </ol>
 !!end
 
@@ -20122,14 +20166,15 @@
 
 <references />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{}}'><a 
href="#cite_note-1">[1]</a></span></p>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span></p>
 
-<ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" 
id="cite_note-1"><span rel="mw:referencedBy"><a href="#cite_ref-1">↑</a></span> 
foo</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" 
id="cite_note-1"><span rel="mw:referencedBy"><a href="#cite_ref-1">↑</a></span> 
<span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">foo</span></li>
 </ol>
 
-<p>B <span about="#mwt6" class="reference" id="cite_ref-2" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"bar"},"attrs":{}}'><a 
href="#cite_note-2">[1]</a></span></p>
+<p>B <span about="#mwt6" class="reference" id="cite_ref-2" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-2"},"attrs":{}}'><a
 href="#cite_note-2">[1]</a></span></p>
 
-<ol class="references" typeof="mw:Extension/references" about="#mwt8" 
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-2" 
id="cite_note-2"><span rel="mw:referencedBy"><a href="#cite_ref-2">↑</a></span> 
bar</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt8" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-2" id="cite_note-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-2">↑</a></span> <span id="mw-reference-text-cite_note-2" 
class="mw-reference-text">bar</span></li>
 </ol>
 !!end
 
@@ -20147,15 +20192,15 @@
 
 <references />
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"afoo"},"attrs":{"group":"a"}}'><a 
href="#cite_note-1">[a 1]</a></span>
-B <span about="#mwt4" class="reference" id="cite_ref-2" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"bfoo"},"attrs":{}}'><a 
href="#cite_note-2">[1]</a></span></p>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{"group":"a"}}'><a
 href="#cite_note-1">[a 1]</a></span>
+B <span about="#mwt4" class="reference" id="cite_ref-2" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-2"},"attrs":{}}'><a
 href="#cite_note-2">[1]</a></span></p>
 
-<ol class="references" typeof="mw:Extension/references" about="#mwt6" 
data-mw='{"name":"references","attrs":{"group":"a"}}'><li about="#cite_note-1" 
id="cite_note-1"><span rel="mw:referencedBy"><a href="#cite_ref-1">↑</a></span> 
afoo</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt6" 
data-mw='{"name":"references","attrs":{"group":"a"}}'><li about="#cite_note-1" 
id="cite_note-1"><span rel="mw:referencedBy"><a href="#cite_ref-1">↑</a></span> 
<span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">afoo</span></li>
 </ol>
 
-<p>C <span about="#mwt8" class="reference" id="cite_ref-3" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"cfoo"},"attrs":{}}'><a 
href="#cite_note-3">[2]</a></span></p>
+<p>C <span about="#mwt8" class="reference" id="cite_ref-3" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-3"},"attrs":{}}'><a
 href="#cite_note-3">[2]</a></span></p>
 
-<ol class="references" typeof="mw:Extension/references" about="#mwt10" 
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-2" 
id="cite_note-2"><span rel="mw:referencedBy"><a href="#cite_ref-2">↑</a></span> 
bfoo</li><li about="#cite_note-3" id="cite_note-3"><span 
rel="mw:referencedBy"><a href="#cite_ref-3">↑</a></span> cfoo</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt10" 
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-2" 
id="cite_note-2"><span rel="mw:referencedBy"><a href="#cite_ref-2">↑</a></span> 
<span id="mw-reference-text-cite_note-2" 
class="mw-reference-text">bfoo</span></li><li about="#cite_note-3" 
id="cite_note-3"><span rel="mw:referencedBy"><a href="#cite_ref-3">↑</a></span> 
<span id="mw-reference-text-cite_note-3" 
class="mw-reference-text">cfoo</span></li>
 </ol>
 !!end
 
@@ -20173,10 +20218,10 @@
 </references>
 !! html
 <p>A <span about="#mwt2" class="reference" id="cite_ref-a_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","attrs":{"name":"a"}}'><a 
href="#cite_note-a-1">[1]</a></span>
-B <span about="#mwt4" class="reference" id="cite_ref-b_2-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"bar"},"attrs":{"name":"b"}}'><a 
href="#cite_note-b-2">[2]</a></span></p>
+B <span about="#mwt4" class="reference" id="cite_ref-b_2-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-b-2"},"attrs":{"name":"b"}}'><a
 href="#cite_note-b-2">[2]</a></span></p>
 
 
-<ol class="references" typeof="mw:Extension/references" about="#mwt6" 
data-mw='{"name":"references","body":{"extsrc":"&lt;ref 
name=\"a\">foo&lt;/ref>\nThis should just get lost.","html":"\n&lt;span 
about=\"#mwt8\" class=\"reference\" rel=\"dc:references\" 
typeof=\"mw:Extension/ref\" data-parsoid=&#39;{\"dsr\":[59,82,14,6]}&#39; 
data-mw=&#39;{\"name\":\"ref\",\"body\":{\"html\":\"foo\"},\"attrs\":{\"name\":\"a\"}}&#39;>&lt;a
 href=\"#cite_note-a-1\">[1]&lt;/a>&lt;/span>\n"},"attrs":{}}'><li 
about="#cite_note-a-1" id="cite_note-a-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-a_1-0">↑</a></span> foo</li><li about="#cite_note-b-2" 
id="cite_note-b-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-b_2-0">↑</a></span> bar</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt6" 
data-mw='{"name":"references","body":{"extsrc":"&lt;ref 
name=\"a\">foo&lt;/ref>\nThis should just get lost.","html":"\n&lt;span 
about=\"#mwt8\" class=\"reference\" rel=\"dc:references\" 
typeof=\"mw:Extension/ref\" data-parsoid=&#39;{\"dsr\":[59,82,14,6]}&#39; 
data-mw=&#39;{\"name\":\"ref\",\"body\":{\"id\":\"mw-reference-text-cite_note-a-1\"},\"attrs\":{\"name\":\"a\"}}&#39;>&lt;a
 href=\"#cite_note-a-1\">[1]&lt;/a>&lt;/span>\n"},"attrs":{}}'><li 
about="#cite_note-a-1" id="cite_note-a-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-a_1-0">↑</a></span> <span id="mw-reference-text-cite_note-a-1" 
class="mw-reference-text">foo</span></li><li about="#cite_note-b-2" 
id="cite_note-b-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-b_2-0">↑</a></span> <span id="mw-reference-text-cite_note-b-2" 
class="mw-reference-text">bar</span></li>
 </ol>
 !!end
 
@@ -20187,7 +20232,8 @@
 !! wikitext
 <ref>Foo</ref> {{echo|<references />}}
 !! html
-<p><span about="#mwt3" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"Foo"},"attrs":{}}'><a 
href="#cite_note-1">[1]</a></span></p> <ol class="references" 
typeof="mw:Extension/references mw:Transclusion" about="#mwt4" 
data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"&lt;references
 />"}},"i":0}}]}'><li about="#cite_note-1" id="cite_note-1"><span 
rel="mw:referencedBy"><a href="#cite_ref-1">↑</a></span> Foo</li></ol>
+<p><span about="#mwt3" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span></p> <ol class="references" 
typeof="mw:Extension/references mw:Transclusion" about="#mwt4" 
data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"&lt;references
 />"}},"i":0}}]}'><li about="#cite_note-1" id="cite_note-1"><span 
rel="mw:referencedBy"><a href="#cite_ref-1">↑</a></span> <span 
id="mw-reference-text-cite_note-1" class="mw-reference-text">Foo</span></li>
+</ol>
 !!end
 
 !! test
@@ -20204,12 +20250,17 @@
 <ref name="b">foo</ref>
 </references>
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" data-mw='{"name":"ref","body":{"html":"foo bar for 
a"},"attrs":{}}'><a href="#cite_note-1">[1]</a></span>
-B <span about="#mwt4" class="reference" id="cite_ref-b_2-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","attrs":{"group":"X","name":"b"}}'><a 
href="#cite_note-b-2">[X 1]</a></span></p>
+<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span>
+B <span about="#mwt4" class="reference" id="cite_ref-b_2-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","attrs":{"group":"X","name":"b"}}'><a 
href="#cite_note-b-2">[X 1]</a></span>
+</p>
 
-<ol class="references" typeof="mw:Extension/references" about="#mwt6" 
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" 
id="cite_note-1"><span rel="mw:referencedBy"><a href="#cite_ref-1">↑</a></span> 
foo bar for a</li></ol>
+<ol class="references" typeof="mw:Extension/references" about="#mwt6" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">foo bar for a</span></li>
+</ol>
 
-<ol class="references" typeof="mw:Extension/references" about="#mwt8" 
data-mw='{"name":"references","body":{"extsrc":"&lt;ref 
name=\"b\">foo&lt;/ref>","html":"\n&lt;span about=\"#mwt10\" 
class=\"reference\" rel=\"dc:references\" typeof=\"mw:Extension/ref\" 
data-parsoid=&#39;{\"dsr\":[96,119,14,6]}&#39; 
data-mw=&#39;{\"name\":\"ref\",\"body\":{\"html\":\"foo\"},\"attrs\":{\"name\":\"b\"}}&#39;>&lt;a
 href=\"#cite_note-b-2\">[X 1]&lt;/a>&lt;/span>\n"},"attrs":{"group":"X"}}'><li 
about="#cite_note-b-2" id="cite_note-b-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-b_2-0">↑</a></span> foo</li></ol>
+<ol class="references" typeof="mw:Extension/references" about="#mwt8" 
data-mw='{"name":"references","body":{"extsrc":"&lt;ref 
name=\"b\">foo&lt;/ref>","html":"\n&lt;span about=\"#mwt10\" 
class=\"reference\" rel=\"dc:references\" typeof=\"mw:Extension/ref\" 
data-parsoid=&#39;{\"dsr\":[96,119,14,6]}&#39; 
data-mw=&#39;{\"name\":\"ref\",\"body\":{\"id\":\"mw-reference-text-cite_note-b-2\"},\"attrs\":{\"name\":\"b\"}}&#39;>&lt;a
 href=\"#cite_note-b-2\">[X 1]&lt;/a>&lt;/span>\n"},"attrs":{"group":"X"}}'>
+<li about="#cite_note-b-2" id="cite_note-b-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-b_2-0">↑</a></span> <span id="mw-reference-text-cite_note-b-2" 
class="mw-reference-text">foo</span></li>
+</ol>
 !! end
 
 !! test
@@ -20221,7 +20272,8 @@
 <references />
 !! html
 <p>X<span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Transclusion  mw:Extension/ref" 
data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"&lt;ref>foo
 {{echo|&lt;b>bar&lt;/b>}} and {{echo|baz}} boo&lt;/ref>"}},"i":0}}]}'><a 
href="#cite_note-1">[1]</a></span></p>
-<ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" 
id="cite_note-1"><span rel="mw:referencedBy"><a href="#cite_ref-1">↑</a></span> 
foo <b data-parsoid='{"stx":"html"}'>bar</b> and baz boo</li></ol>
+<ol class="references" typeof="mw:Extension/references" about="#mwt7" 
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" 
id="cite_note-1"><span rel="mw:referencedBy"><a href="#cite_ref-1">↑</a></span> 
<span id="mw-reference-text-cite_note-1" class="mw-reference-text">foo <b 
data-parsoid='{"stx":"html"}'>bar</b> and baz boo</span></li>
+</ol>
 !!end
 
 # This test only works in wt2html now as the <references /> are always 
generated
@@ -20236,12 +20288,12 @@
 A <ref>foo</ref>
 B <ref group="inexistent">bar</ref>
 !! html
-<p>A <span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{}}'><a 
href="#cite_note-1">[1]</a></span> B <span about="#mwt4" class="reference" 
id="cite_ref-2" rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"bar"},"attrs":{"group":"inexistent"}}'><a
 href="#cite_note-2">[inexistent 1]</a></span></</p>
-<ol about="#mwt5" class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{}}'>
-<li id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> foo</li>
+<p>A <span class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span> B <span class="reference" id="cite_ref-2" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-2"},"attrs":{"group":"inexistent"}}'><a
 href="#cite_note-2">[inexistent 1]</a></span></p>
+<ol class="references" typeof="mw:Extension/references" about="#mwt5" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">foo</span></li>
 </ol>
-<ol about="#mwt6" class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{"group":"inexistent"}}'>
-<li id="cite_note-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-2">↑</a></span> bar</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt6" 
data-mw='{"name":"references","attrs":{"group":"inexistent"}}'>
+<li about="#cite_note-2" id="cite_note-2"><span rel="mw:referencedBy"><a 
href="#cite_ref-2">↑</a></span> <span id="mw-reference-text-cite_note-2" 
class="mw-reference-text">bar</span></li>
 </ol>
 !! end
 
@@ -20253,9 +20305,9 @@
 <ref name="test &amp; me">hi</ref>
 <references />
 !! html
-<p><span about="#mwt2" class="reference" id="cite_ref-test_.26_me_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"hi"},"attrs":{"name":"test &amp;amp; 
me"}}'><a href="#cite_note-test_.26_me-1">[1]</a></span></p>
-<ol class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{}}'>
-<li id="cite_note-test_.26_me-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-test_.26_me_1-0">↑</a></span> hi</li>
+<p><span about="#mwt2" class="reference" id="cite_ref-test_.26_me_1-0" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-test_.26_me-1"},"attrs":{"name":"test
 &amp;amp; me"}}'><a href="#cite_note-test_.26_me-1">[1]</a></span></p>
+<ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-test_.26_me-1" id="cite_note-test_.26_me-1"><span 
rel="mw:referencedBy"><a href="#cite_ref-test_.26_me_1-0">↑</a></span> <span 
id="mw-reference-text-cite_note-test_.26_me-1" 
class="mw-reference-text">hi</span></li>
 </ol>
 !! end
 
@@ -20270,11 +20322,9 @@
 
 <references>
 !! html
-<p>a<span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"foo"},"attrs":{}}'><a 
href="#cite_note-1">[1]</a></span></p>
-
-
+<p>a<span about="#mwt2" class="reference" id="cite_ref-1" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span></p>
 <ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'>
-<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> foo</li></ol>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text">foo</span></li></ol>
 !! end
 
 !! test
@@ -20295,11 +20345,11 @@
 {{EmptyLITest}}
 {{EmptyTRTest}}
 !!html/parsoid
-<ul typeof="mw:Transclusion" 
data-mw='{"parts":[{"template":{"target":{"wt":"EmptyLITest","href":"./Template:EmptyLITest"},"params":{},"i":0}}]}'>
+<ul about="#mwt1" typeof="mw:Transclusion" 
data-mw='{"parts":[{"template":{"target":{"wt":"EmptyLITest","href":"./Template:EmptyLITest"},"params":{},"i":0}}]}'>
 <li>a</li>
 <li>b</li>
 </ul>
-<table typeof="mw:Transclusion" 
data-mw='{"parts":[{"template":{"target":{"wt":"EmptyTRTest","href":"./Template:EmptyTRTest"},"params":{},"i":0}}]}'>
+<table about="#mwt2" typeof="mw:Transclusion" 
data-mw='{"parts":[{"template":{"target":{"wt":"EmptyTRTest","href":"./Template:EmptyTRTest"},"params":{},"i":0}}]}'>
 <tbody>
 <tr>
 <td>foo</td>
@@ -20343,7 +20393,7 @@
 !!wikitext
 {{EmptyTRWithHTMLAttrTest}}
 !!html/parsoid
-<table typeof="mw:Transclusion" 
data-mw='{"parts":[{"template":{"target":{"wt":"EmptyTRWithHTMLAttrTest","href":"./Template:EmptyTRWithHTMLAttrTest"},"params":{},"i":0}}]}'>
+<table about="#mwt1" typeof="mw:Transclusion" 
data-mw='{"parts":[{"template":{"target":{"wt":"EmptyTRWithHTMLAttrTest","href":"./Template:EmptyTRWithHTMLAttrTest"},"params":{},"i":0}}]}'>
 <tr align="center"></tr>
 <tr><td>foo</td></tr>
 <tr align="center"></tr>
@@ -21543,11 +21593,11 @@
 <i>a'</i> foo <i><a rel="mw:WikiLink" href="Bar" title="Bar">bar</a></i>
 <i>a'</i> foo <b><a rel="mw:WikiLink" href="Bar" title="Bar" 
typeof="mw:Transclusion" 
data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"[[bar]]"}},"i":0}}]}'>bar</a></b>
 <a rel="mw:WikiLink" href="Foo" title="Foo">foo</a> x'<i><a href="Bar" 
rel="mw:WikiLink" title="Bar">bar</a></i>
-'<i>foo</i> <span class="reference" id="cite_ref-1-0" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"test"},"attrs":{}}'><a 
href="#cite_note-1">[1]</a></span>
+'<i>foo</i> <span class="reference" id="cite_ref-1-0" rel="dc:references" 
typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span>
 '<i>foo</i> <div title="name">test</div>
 '<i>foo</i> and <br data-parsoid='{"stx":"html","noClose":true}'/> bar
-<ol class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{}}'>
-<li id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> test</li>
+<ol class="references" typeof="mw:Extension/references" about="#mwt5" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text" data-parsoid="{}">test</span></li>
 </ol>
 !! end
 
@@ -21664,9 +21714,10 @@
  b</ref>
 <references />
 !! html
-<p>foo <span about="#mwt2" class="reference" id="cite_ref-1" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"html":"&lt;i 
data-parsoid=&#39;{\"dsr\":[9,14,2,2]}&#39;>a&lt;/i>\n b"},"attrs":{}}'><a 
href="#cite_note-1">[1]</a></span></p>
-<ol class="references" typeof="mw:Extension/references" 
data-mw='{"name":"references","attrs":{}}'>
-<li id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <i>a</i> b</li>
+<p>foo <span about="#mwt2" class="reference" id="cite_ref-1" 
rel="dc:references" typeof="mw:Extension/ref" 
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
 href="#cite_note-1">[1]</a></span></p>
+<ol class="references" typeof="mw:Extension/references" about="#mwt4" 
data-mw='{"name":"references","attrs":{}}'>
+<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a 
href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" 
class="mw-reference-text"><i data-parsoid='{"dsr":[9,14,2,2]}'>a</i>
+ b</span></li>
 </ol>
 !! end
 

-- 
To view, visit https://gerrit.wikimedia.org/r/193980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4cb8f04b9d7988e5138c8f040fadeb0b7a9348f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cscott <canan...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits