Mediawiki reader: Parse table cell with attribs, to support rowspan, colspan (#8231)

2 files changed, 16 insertions, 85 deletions

diff --git a/test/command/2649.md b/test/command/2649.md
index 4ab059ea0..7225ae0f4 100644
--- a/test/command/2649.md
+++ b/test/command/2649.md
@@ -17,7 +17,7 @@
 % pandoc -f mediawiki -t html5
 {| border="4" cellspacing="2" cellpadding="0" WIDTH="100%"
 |-----
-| peildatum Simbase || november 2005 || '''uitslagen Flohrgambiet''' ||
+| peildatum Simbase || november 2005 || colspan=2 | '''uitslagen Flohrgambiet''' ||
 |-----
 | totaal aantal partijen Simbase || 7.316.773
 | wit wint || 53%
@@ -34,8 +34,7 @@
 <tr class="odd">
 <td><p>peildatum Simbase</p></td>
 <td><p>november 2005</p></td>
-<td><p><strong>uitslagen Flohrgambiet</strong></p></td>
-<td></td>
+<td colspan="2"><p><strong>uitslagen Flohrgambiet</strong></p></td>
 </tr>
 <tr class="even">
 <td><p>totaal aantal partijen Simbase</p></td>
@@ -90,20 +89,20 @@
 <tbody>
 <tr class="odd">
 <td><p>1</p></td>
-<td><p><a href="Sébastien_Loeb" title="wikilink">Sébastien
-Loeb</a></p></td>
+<td style="text-align: left;"><p><a href="Sébastien_Loeb"
+title="wikilink">Sébastien Loeb</a></p></td>
 <td><p>78</p></td>
 </tr>
 <tr class="even">
 <td><p>2</p></td>
-<td><p><strong><a href="Sébastien_Ogier" title="wikilink">Sébastien
-Ogier</a></strong></p></td>
+<td style="text-align: left;"><p><strong><a href="Sébastien_Ogier"
+title="wikilink">Sébastien Ogier</a></strong></p></td>
 <td><p>38</p></td>
 </tr>
 <tr class="odd">
 <td><p>10</p></td>
-<td><p><a href="Hannu_Mikkola" title="wikilink">Hannu
-Mikkola</a></p></td>
+<td style="text-align: left;"><p><a href="Hannu_Mikkola"
+title="wikilink">Hannu Mikkola</a></p></td>
 <td><p>18</p></td>
 </tr>
 </tbody>
diff --git a/test/mediawiki-reader.native b/test/mediawiki-reader.native
index 184809ea6..9b0a61b4d 100644
--- a/test/mediawiki-reader.native
+++ b/test/mediawiki-reader.native
@@ -820,24 +820,7 @@ Pandoc
       [ ( AlignDefault , ColWidthDefault )
       , ( AlignDefault , ColWidthDefault )
       ]
-      (TableHead
-         ( "" , [] , [] )
-         [ Row
-             ( "" , [] , [] )
-             [ Cell
-                 ( "" , [] , [] )
-                 AlignDefault
-                 (RowSpan 1)
-                 (ColSpan 1)
-                 []
-             , Cell
-                 ( "" , [] , [] )
-                 AlignDefault
-                 (RowSpan 1)
-                 (ColSpan 1)
-                 []
-             ]
-         ])
+      (TableHead ( "" , [] , [] ) [])
       [ TableBody
           ( "" , [] , [] )
           (RowHeadColumns 0)
@@ -1016,30 +999,7 @@ Pandoc
       , ( AlignDefault , ColWidthDefault )
       , ( AlignDefault , ColWidthDefault )
       ]
-      (TableHead
-         ( "" , [] , [] )
-         [ Row
-             ( "" , [] , [] )
-             [ Cell
-                 ( "" , [] , [] )
-                 AlignDefault
-                 (RowSpan 1)
-                 (ColSpan 1)
-                 []
-             , Cell
-                 ( "" , [] , [] )
-                 AlignDefault
-                 (RowSpan 1)
-                 (ColSpan 1)
-                 []
-             , Cell
-                 ( "" , [] , [] )
-                 AlignDefault
-                 (RowSpan 1)
-                 (ColSpan 1)
-                 []
-             ]
-         ])
+      (TableHead ( "" , [] , [] ) [])
       [ TableBody
           ( "" , [] , [] )
           (RowHeadColumns 0)
@@ -1122,20 +1082,20 @@ Pandoc
          [ Row
              ( "" , [] , [] )
              [ Cell
-                 ( "" , [] , [] )
-                 AlignDefault
+                 ( "" , [] , [ ( "width" , "50%" ) ] )
+                 AlignLeft
                  (RowSpan 1)
                  (ColSpan 1)
                  [ Para [ Str "Left" ] ]
              , Cell
                  ( "" , [] , [] )
-                 AlignDefault
+                 AlignRight
                  (RowSpan 1)
                  (ColSpan 1)
                  [ Para [ Str "Right" ] ]
              , Cell
                  ( "" , [] , [] )
-                 AlignDefault
+                 AlignCenter
                  (RowSpan 1)
                  (ColSpan 1)
                  [ Para [ Str "Center" ] ]
@@ -1196,24 +1156,7 @@ Pandoc
       [ ( AlignDefault , ColWidthDefault )
       , ( AlignDefault , ColWidthDefault )
       ]
-      (TableHead
-         ( "" , [] , [] )
-         [ Row
-             ( "" , [] , [] )
-             [ Cell
-                 ( "" , [] , [] )
-                 AlignDefault
-                 (RowSpan 1)
-                 (ColSpan 1)
-                 []
-             , Cell
-                 ( "" , [] , [] )
-                 AlignDefault
-                 (RowSpan 1)
-                 (ColSpan 1)
-                 []
-             ]
-         ])
+      (TableHead ( "" , [] , [] ) [])
       [ TableBody
           ( "" , [] , [] )
           (RowHeadColumns 0)
@@ -1321,18 +1264,7 @@ Pandoc
       ( "" , [] , [] )
       (Caption Nothing [])
       [ ( AlignDefault , ColWidthDefault ) ]
-      (TableHead
-         ( "" , [] , [] )
-         [ Row
-             ( "" , [] , [] )
-             [ Cell
-                 ( "" , [] , [] )
-                 AlignDefault
-                 (RowSpan 1)
-                 (ColSpan 1)
-                 []
-             ]
-         ])
+      (TableHead ( "" , [] , [] ) [])
       [ TableBody
           ( "" , [] , [] )
           (RowHeadColumns 0)