Org reader: allow attrs for Org tables. (#8049)

Tables with attributes are no longer wrapped in Div elements;
attributes are added directly to the table element.

1 files changed, 15 insertions, 8 deletions

diff --git a/test/Tests/Readers/Org/Block/Table.hs b/test/Tests/Readers/Org/Block/Table.hs
index 5a9320b4a..f6b99a5c1 100644
--- a/test/Tests/Readers/Org/Block/Table.hs
+++ b/test/Tests/Readers/Org/Block/Table.hs
@@ -25,12 +25,16 @@ simpleTable' :: Int
 simpleTable' n = simpleTable'' emptyCaption $ replicate n (AlignDefault, ColWidthDefault)
 
 simpleTable'' :: Caption -> [ColSpec] -> [Blocks] -> [[Blocks]] -> Blocks
-simpleTable'' capt spec headers rows
-  = table capt
-          spec
-          (TableHead nullAttr $ toHeaderRow headers)
-          [TableBody nullAttr 0 [] $ map toRow rows]
-          (TableFoot nullAttr [])
+simpleTable'' = simpleTableWith'' (mempty, [], [])
+
+simpleTableWith'' :: Attr -> Caption -> [ColSpec] -> [Blocks] -> [[Blocks]] -> Blocks
+simpleTableWith'' attr capt spec headers rows
+  = tableWith attr
+              capt
+              spec
+              (TableHead nullAttr $ toHeaderRow headers)
+              [TableBody nullAttr 0 [] $ map toRow rows]
+              (TableFoot nullAttr [])
   where
     toRow = Row nullAttr . map simpleCell
     toHeaderRow l = [toRow l | not (null l)]
@@ -181,6 +185,9 @@ tests =
       T.unlines [ "#+name: x-marks-the-spot"
                 , "| x |"
                 ] =?>
-      divWith ("x-marks-the-spot", mempty, mempty)
-              (simpleTable' 1 mempty [ [ plain "x" ] ])
+      simpleTableWith'' ("x-marks-the-spot", mempty, mempty)
+                        emptyCaption
+                        (replicate 1 (AlignDefault, ColWidthDefault))
+                        mempty
+                        [ [ plain "x" ] ]
   ]