Switch from pretty-simple to pretty-show for native output.

Update tests.

Reason:  it turns out that the native output generated by
pretty-simple isn't always readable by the native reader.
According to https://github.com/cdepillabout/pretty-simple/issues/99
it is not a design goal of the library that the rendered values
be readable using 'read'.  This makes it unsuitable for our
purposes.

pretty-show is a bit slower and it uses 4-space indents
(non-configurable), but it doesn't have this serious drawback.

12 files changed, 757 insertions, 723 deletions

diff --git a/test/rtf/accent.native b/test/rtf/accent.native
index 67eb654fe..115620aff 100644
--- a/test/rtf/accent.native
+++ b/test/rtf/accent.native
@@ -1,18 +1,18 @@
 Pandoc
-  ( Meta { unMeta = fromList [] } )
+  Meta { unMeta = fromList [] }
   [ Para
-    [ Str "le"
-    , Space
-    , Str "caf\233"
-    , Space
-    , Str "o\249"
-    , Space
-    , Str "on"
-    , Space
-    , Str "ne"
-    , Space
-    , Str "fume"
-    , Space
-    , Str "pas"
-    ]
+      [ Str "le"
+      , Space
+      , Str "caf\233"
+      , Space
+      , Str "o\249"
+      , Space
+      , Str "on"
+      , Space
+      , Str "ne"
+      , Space
+      , Str "fume"
+      , Space
+      , Str "pas"
+      ]
   ]
diff --git a/test/rtf/bookmark.native b/test/rtf/bookmark.native
index 765bf29d0..8f6df567c 100644
--- a/test/rtf/bookmark.native
+++ b/test/rtf/bookmark.native
@@ -1,11 +1,11 @@
 Pandoc
-  ( Meta { unMeta = fromList [] } )
+  Meta { unMeta = fromList [] }
   [ Para
-    [ Span ( "bookmark_1", [], [] ) [ Str "Bookmark_1" ] ]
+      [ Span ( "bookmark_1" , [] , [] ) [ Str "Bookmark_1" ] ]
   , Para
-    [ Link
-      ( "", [], [] )
-      [ Str "click", Space, Str "me" ]
-      ( "#bookmark_1", "" )
-    ]
+      [ Link
+          ( "" , [] , [] )
+          [ Str "click" , Space , Str "me" ]
+          ( "#bookmark_1" , "" )
+      ]
   ]
diff --git a/test/rtf/footnote.native b/test/rtf/footnote.native
index cfea5f4a1..70f8453a9 100644
--- a/test/rtf/footnote.native
+++ b/test/rtf/footnote.native
@@ -1,130 +1,130 @@
 Pandoc
-  ( Meta { unMeta = fromList [] } )
+  Meta { unMeta = fromList [] }
   [ Para
-    [ Str "Mead's"
-    , Space
-    , Str "landmark"
-    , Space
-    , Str "study"
-    , Space
-    , Str "has"
-    , Space
-    , Str "been"
-    , Space
-    , Str "amply"
-    , Space
-    , Str "annotated."
-    , Note
-      [ Para
-        [ Str "See"
-        , Space
-        , Str "Sahlins,"
-        , Space
-        , Str "Bateson,"
-        , Space
-        , Str "and"
-        , Space
-        , Str "Geertz"
-        , Space
-        , Str "for"
-        , Space
-        , Str "a"
-        , Space
-        , Str "complete"
-        , Space
-        , Str "bibliography."
-        ]
+      [ Str "Mead's"
+      , Space
+      , Str "landmark"
+      , Space
+      , Str "study"
+      , Space
+      , Str "has"
+      , Space
+      , Str "been"
+      , Space
+      , Str "amply"
+      , Space
+      , Str "annotated."
+      , Note
+          [ Para
+              [ Str "See"
+              , Space
+              , Str "Sahlins,"
+              , Space
+              , Str "Bateson,"
+              , Space
+              , Str "and"
+              , Space
+              , Str "Geertz"
+              , Space
+              , Str "for"
+              , Space
+              , Str "a"
+              , Space
+              , Str "complete"
+              , Space
+              , Str "bibliography."
+              ]
+          ]
+      , Space
+      , Str "It"
+      , Space
+      , Str "was"
+      , Space
+      , Str "her"
+      , Space
+      , Str "work"
+      , Space
+      , Str "in"
+      , Space
+      , Str "America"
+      , Space
+      , Str "during"
+      , Space
+      , Str "the"
+      , Space
+      , Str "Second"
+      , Space
+      , Str "World"
+      , Space
+      , Str "War,"
+      , Space
+      , Str "however,"
+      , Space
+      , Str "that"
+      , Space
+      , Str "forms"
+      , Space
+      , Str "the"
+      , Space
+      , Str "basis"
+      , Space
+      , Str "for"
+      , Space
+      , Str "the"
+      , Space
+      , Str "paper."
+      , Space
+      , Str "As"
+      , Space
+      , Str "others"
+      , Space
+      , Str "have"
+      , Space
+      , Str "noted,"
+      , Note
+          [ Para
+              [ Str "A"
+              , Space
+              , Str "complete"
+              , Space
+              , Str "bibliography"
+              , Space
+              , Str "will"
+              , Space
+              , Str "be"
+              , Space
+              , Str "found"
+              , Space
+              , Str "at"
+              , Space
+              , Str "the"
+              , Space
+              , Str "end"
+              , Space
+              , Str "of"
+              , Space
+              , Str "this"
+              , Space
+              , Str "chapter."
+              ]
+          ]
+      , Space
+      , Str "this"
+      , Space
+      , Str "period"
+      , Space
+      , Str "was"
+      , Space
+      , Str "a"
+      , Space
+      , Str "turning"
+      , Space
+      , Str "point"
+      , Space
+      , Str "for"
+      , Space
+      , Str "Margaret"
+      , Space
+      , Str "Mead."
       ]
-    , Space
-    , Str "It"
-    , Space
-    , Str "was"
-    , Space
-    , Str "her"
-    , Space
-    , Str "work"
-    , Space
-    , Str "in"
-    , Space
-    , Str "America"
-    , Space
-    , Str "during"
-    , Space
-    , Str "the"
-    , Space
-    , Str "Second"
-    , Space
-    , Str "World"
-    , Space
-    , Str "War,"
-    , Space
-    , Str "however,"
-    , Space
-    , Str "that"
-    , Space
-    , Str "forms"
-    , Space
-    , Str "the"
-    , Space
-    , Str "basis"
-    , Space
-    , Str "for"
-    , Space
-    , Str "the"
-    , Space
-    , Str "paper."
-    , Space
-    , Str "As"
-    , Space
-    , Str "others"
-    , Space
-    , Str "have"
-    , Space
-    , Str "noted,"
-    , Note
-      [ Para
-        [ Str "A"
-        , Space
-        , Str "complete"
-        , Space
-        , Str "bibliography"
-        , Space
-        , Str "will"
-        , Space
-        , Str "be"
-        , Space
-        , Str "found"
-        , Space
-        , Str "at"
-        , Space
-        , Str "the"
-        , Space
-        , Str "end"
-        , Space
-        , Str "of"
-        , Space
-        , Str "this"
-        , Space
-        , Str "chapter."
-        ]
-      ]
-    , Space
-    , Str "this"
-    , Space
-    , Str "period"
-    , Space
-    , Str "was"
-    , Space
-    , Str "a"
-    , Space
-    , Str "turning"
-    , Space
-    , Str "point"
-    , Space
-    , Str "for"
-    , Space
-    , Str "Margaret"
-    , Space
-    , Str "Mead."
-    ]
   ]
diff --git a/test/rtf/formatting.native b/test/rtf/formatting.native
index 6e5001de3..7035ccb91 100644
--- a/test/rtf/formatting.native
+++ b/test/rtf/formatting.native
@@ -1,51 +1,45 @@
 Pandoc
-  ( Meta
-    { unMeta = fromList
-      [
-        ( "operator"
-        , MetaInlines
-          [ Str "John", Space, Str "MacFarlane" ]
-        )
-      ]
+  Meta
+    { unMeta =
+        fromList
+          [ ( "operator"
+            , MetaInlines [ Str "John" , Space , Str "MacFarlane" ]
+            )
+          ]
     }
-  )
   [ Para
-    [ Str "This"
-    , Space
-    , Str "is"
-    , Space
-    , Str "a"
-    , Space
-    , Str "test"
-    , Space
-    , Str "of"
-    , Space
-    , Str "FORMATTING."
-    , Space
-    , Str "This"
-    , Space
-    , Str "is"
-    , Space
-    , Str "hidden:"
-    , Space
-    , Str "."
-    ]
-  , Para
-    [ SmallCaps [ Str "Small", Space, Str "Caps" ] ]
-  , Para
-    [ Strong [ Str "bold" ] ]
-  , Para
-    [ Emph [ Str "italics" ] ]
-  , Para
-    [ Strong
-      [ Str "bold", Space, Emph [ Str "and", Space, Str "italics" ] ]
-    ]
-  , Para
-    [ Underline [ Str "underlined" ] ]
-  , Para
-    [ Strikeout [ Str "strikeout" ] ]
-  , Para
-    [ Str "x", Superscript [ Str "superscript" ] ]
-  , Para
-    [ Str "x", Subscript [ Str "subscript" ] ]
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "test"
+      , Space
+      , Str "of"
+      , Space
+      , Str "FORMATTING."
+      , Space
+      , Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "hidden:"
+      , Space
+      , Str "."
+      ]
+  , Para [ SmallCaps [ Str "Small" , Space , Str "Caps" ] ]
+  , Para [ Strong [ Str "bold" ] ]
+  , Para [ Emph [ Str "italics" ] ]
+  , Para
+      [ Strong
+          [ Str "bold"
+          , Space
+          , Emph [ Str "and" , Space , Str "italics" ]
+          ]
+      ]
+  , Para [ Underline [ Str "underlined" ] ]
+  , Para [ Strikeout [ Str "strikeout" ] ]
+  , Para [ Str "x" , Superscript [ Str "superscript" ] ]
+  , Para [ Str "x" , Subscript [ Str "subscript" ] ]
   ]
diff --git a/test/rtf/heading.native b/test/rtf/heading.native
index 27d5d455e..5a076424b 100644
--- a/test/rtf/heading.native
+++ b/test/rtf/heading.native
@@ -1,14 +1,10 @@
 Pandoc
-  ( Meta { unMeta = fromList [] } )
-  [ Header 1
-    ( "", [], [] )
-    [ Str "Heading", Space, Str "1" ]
-  , Header 2
-    ( "", [], [] )
-    [ Str "Heading", Space, Str "2" ]
-  , Header 3
-    ( "", [], [] )
-    [ Str "Heading", Space, Str "3" ]
-  , Para
-    [ Str "Paragraph" ]
+  Meta { unMeta = fromList [] }
+  [ Header
+      1 ( "" , [] , [] ) [ Str "Heading" , Space , Str "1" ]
+  , Header
+      2 ( "" , [] , [] ) [ Str "Heading" , Space , Str "2" ]
+  , Header
+      3 ( "" , [] , [] ) [ Str "Heading" , Space , Str "3" ]
+  , Para [ Str "Paragraph" ]
   ]
diff --git a/test/rtf/image.native b/test/rtf/image.native
index 551a0f95c..1efe9d4aa 100644
--- a/test/rtf/image.native
+++ b/test/rtf/image.native
@@ -1,9 +1,12 @@
 Pandoc
-  ( Meta { unMeta = fromList [] } )
+  Meta { unMeta = fromList [] }
   [ Para
-    [ Image
-      ( "", [], [ ( "width", "2.0in" ), ( "height", "2.0in" ) ] )
-      [ Str "image" ]
-      ( "f9d88c3dbe18f6a7f5670e994a947d51216cdf0e.jpg", "" )
-    ]
+      [ Image
+          ( ""
+          , []
+          , [ ( "width" , "2.0in" ) , ( "height" , "2.0in" ) ]
+          )
+          [ Str "image" ]
+          ( "f9d88c3dbe18f6a7f5670e994a947d51216cdf0e.jpg" , "" )
+      ]
   ]
diff --git a/test/rtf/link.native b/test/rtf/link.native
index 9902760e1..63a0d19ff 100644
--- a/test/rtf/link.native
+++ b/test/rtf/link.native
@@ -1,5 +1,9 @@
 Pandoc
-  ( Meta { unMeta = fromList [] } )
+  Meta { unMeta = fromList [] }
   [ Para
-    [ Link ( "", [], [] ) [ Str "pandoc" ] ( "http://pandoc.org", "" ) ]
+      [ Link
+          ( "" , [] , [] )
+          [ Str "pandoc" ]
+          ( "http://pandoc.org" , "" )
+      ]
   ]
diff --git a/test/rtf/list_complex.native b/test/rtf/list_complex.native
index 73e2e14f8..9dfd17755 100644
--- a/test/rtf/list_complex.native
+++ b/test/rtf/list_complex.native
@@ -1,84 +1,64 @@
 Pandoc
-  ( Meta
-    { unMeta = fromList
-      [
-        ( "author"
-        , MetaInlines
-          [ Str "Cynthia", Space, Str "Johnson" ]
-        )
-      ,
-        ( "operator"
-        , MetaInlines
-          [ Str "John", Space, Str "MacFarlane" ]
-        )
-      ,
-        ( "title"
-        , MetaInlines
-          [ Str "Text", Space, Str "before", Space, Str "list" ]
-        )
-      ]
+  Meta
+    { unMeta =
+        fromList
+          [ ( "author"
+            , MetaInlines [ Str "Cynthia" , Space , Str "Johnson" ]
+            )
+          , ( "operator"
+            , MetaInlines [ Str "John" , Space , Str "MacFarlane" ]
+            )
+          , ( "title"
+            , MetaInlines
+                [ Str "Text"
+                , Space
+                , Str "before"
+                , Space
+                , Str "list"
+                ]
+            )
+          ]
     }
-  )
   [ OrderedList
-    ( 1, Decimal, Period )
-    [
-      [ Para [ Str "One" ] ]
-    ,
-      [ Para
-        [ Str "Two" ]
-      , OrderedList
-        ( 1, LowerAlpha, Period )
-        [
-          [ Para [ Str "Three" ] ]
-        ,
-          [ Para
-            [ Str "Four" ]
-          , OrderedList
-            ( 1, LowerRoman, Period )
-            [
-              [ Para [ Str "Five" ] ]
-            ,
-              [ Para
-                [ Str "Six" ]
+      ( 1 , Decimal , Period )
+      [ [ Para [ Str "One" ] ]
+      , [ Para [ Str "Two" ]
+        , OrderedList
+            ( 1 , LowerAlpha , Period )
+            [ [ Para [ Str "Three" ] ]
+            , [ Para [ Str "Four" ]
               , OrderedList
-                ( 1, UpperAlpha, Period )
-                [
-                  [ Para [ Str "Seven" ] ]
-                ,
-                  [ Para
-                    [ Str "Eight" ]
-                  , OrderedList
-                    ( 1, UpperRoman, Period )
-                    [
-                      [ Para [ Str "Nine" ] ]
-                    ,
-                      [ Para
-                        [ Str "Ten" ]
-                      , BulletList
-                        [
-                          [ Para [ Str "Eleven" ] ]
-                        ,
-                          [ Para [ Str "Twelve" ] ]
+                  ( 1 , LowerRoman , Period )
+                  [ [ Para [ Str "Five" ] ]
+                  , [ Para [ Str "Six" ]
+                    , OrderedList
+                        ( 1 , UpperAlpha , Period )
+                        [ [ Para [ Str "Seven" ] ]
+                        , [ Para [ Str "Eight" ]
+                          , OrderedList
+                              ( 1 , UpperRoman , Period )
+                              [ [ Para [ Str "Nine" ] ]
+                              , [ Para [ Str "Ten" ]
+                                , BulletList
+                                    [ [ Para [ Str "Eleven" ] ]
+                                    , [ Para [ Str "Twelve" ] ]
+                                    ]
+                                ]
+                              ]
+                          ]
                         ]
-                      ]
                     ]
                   ]
-                ]
               ]
             ]
-          ]
         ]
       ]
-    ]
-  , Para
-    [ Str "Out", Space, Str "of", Space, Str "list!" ]
   , Para
-    [ Str "Start", Space, Str "with" ]
+      [ Str "Out" , Space , Str "of" , Space , Str "list!" ]
+  , Para [ Str "Start" , Space , Str "with" ]
   , OrderedList
-    ( 7, Decimal, Period )
-    [
-      [ Para [ Str "Seven", Space, Str "Start" ] ]
-    ,
-      [ Para [ Str "Eight", Space, Str "Continue" ] ]
-    ]
+      ( 7 , Decimal , Period )
+      [ [ Para [ Str "Seven" , Space , Str "Start" ] ]
+      , [ Para [ Str "Eight" , Space , Str "Continue" ] ]
+      ]
   ]
diff --git a/test/rtf/list_simple.native b/test/rtf/list_simple.native
index dc5b65b97..10d9dede2 100644
--- a/test/rtf/list_simple.native
+++ b/test/rtf/list_simple.native
@@ -1,11 +1,10 @@
 Pandoc
-  ( Meta { unMeta = fromList [] } )
+  Meta { unMeta = fromList [] }
   [ BulletList
-    [
-      [ Para [ Str "one" ] ]
-    ,
-      [ Para [ Str "two" ], BulletList [ [ Para [ Str "sub" ] ] ] ]
-    ]
-  , BulletList
-    [ [ Para [ Str "new", Space, Str "list" ] ] ]
+      [ [ Para [ Str "one" ] ]
+      , [ Para [ Str "two" ]
+        , BulletList [ [ Para [ Str "sub" ] ] ]
+        ]
+      ]
+  , BulletList [ [ Para [ Str "new" , Space , Str "list" ] ] ]
   ]
diff --git a/test/rtf/table_error_codes.native b/test/rtf/table_error_codes.native
index 35d774065..33c143933 100644
--- a/test/rtf/table_error_codes.native
+++ b/test/rtf/table_error_codes.native
@@ -1,369 +1,422 @@
 Pandoc
-  ( Meta { unMeta = fromList [] } )
+  Meta { unMeta = fromList [] }
   [ Table
-    ( "", [], [] )
-    ( Caption Nothing [] )
-    [
-      ( AlignDefault, ColWidthDefault )
-    ,
-      ( AlignDefault, ColWidthDefault )
-    ]
-    ( TableHead ( "", [], [] ) [] )
-    [ TableBody
-      ( "", [], [] )
-      ( RowHeadColumns 0 ) []
-      [ Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "Code" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "Error" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "3" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocFailOnWarningError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "4" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocAppError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "5" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocTemplateError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "6" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocOptionError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "21" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocUnknownReaderError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "22" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocUnknownWriterError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "23" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocUnsupportedExtensionError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "24" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocCiteprocError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "31" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocEpubSubdirectoryError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "43" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocPDFError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "44" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocXMLError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "47" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocPDFProgramNotFoundError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "61" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocHttpError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "62" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocShouldNeverHappenError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "63" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocSomeError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "64" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocParseError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "65" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocParsecError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "66" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocMakePDFError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "67" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocSyntaxMapError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "83" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocFilterError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "91" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocMacroLoop" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "92" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocUTF8DecodingError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "93" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocIpynbDecodingError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "94" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocUnsupportedCharsetError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "97" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocCouldNotFindDataFileError" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "99" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "PandocResourceNotFound" ] ]
-        ]
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
       ]
-    ]
-    ( TableFoot ( "", [], [] ) [] )
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Code" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Error" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "3" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocFailOnWarningError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "4" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocAppError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "5" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocTemplateError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "6" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocOptionError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "21" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocUnknownReaderError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "22" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocUnknownWriterError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "23" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocUnsupportedExtensionError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "24" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocCiteprocError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "31" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocEpubSubdirectoryError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "43" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocPDFError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "44" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocXMLError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "47" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocPDFProgramNotFoundError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "61" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocHttpError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "62" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocShouldNeverHappenError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "63" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocSomeError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "64" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocParseError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "65" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocParsecError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "66" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocMakePDFError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "67" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocSyntaxMapError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "83" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocFilterError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "91" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocMacroLoop" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "92" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocUTF8DecodingError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "93" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocIpynbDecodingError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "94" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocUnsupportedCharsetError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "97" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocCouldNotFindDataFileError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "99" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocResourceNotFound" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
   ]
diff --git a/test/rtf/table_simple.native b/test/rtf/table_simple.native
index 05e736829..dce03cf25 100644
--- a/test/rtf/table_simple.native
+++ b/test/rtf/table_simple.native
@@ -1,68 +1,73 @@
 Pandoc
-  ( Meta { unMeta = fromList [] } )
+  Meta { unMeta = fromList [] }
   [ Table
-    ( "", [], [] )
-    ( Caption Nothing [] )
-    [
-      ( AlignDefault, ColWidthDefault )
-    ,
-      ( AlignDefault, ColWidthDefault )
-    ,
-      ( AlignDefault, ColWidthDefault )
-    ,
-      ( AlignDefault, ColWidthDefault )
-    ]
-    ( TableHead ( "", [], [] ) [] )
-    [ TableBody
-      ( "", [], [] )
-      ( RowHeadColumns 0 ) []
-      [ Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "A" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "B" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "C" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "D" ] ]
-        ]
-      , Row
-        ( "", [], [] )
-        [ Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "E" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "F" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "G" ] ]
-        , Cell
-          ( "", [], [] ) AlignDefault
-          ( RowSpan 1 )
-          ( ColSpan 1 )
-          [ Para [ Str "H" ] ]
-        ]
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
       ]
-    ]
-    ( TableFoot ( "", [], [] ) [] )
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "A" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "B" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "C" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "D" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "E" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "F" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "G" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "H" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
   ]
diff --git a/test/rtf/unicode.native b/test/rtf/unicode.native
index 4e2340b84..ed21b4f47 100644
--- a/test/rtf/unicode.native
+++ b/test/rtf/unicode.native
@@ -1,3 +1,3 @@
 Pandoc
-  ( Meta { unMeta = fromList [] } )
+  Meta { unMeta = fromList [] }
   [ Para [ Str "\8220hi\8221\8216hi\8217\61623\945\228" ] ]