diff options
| author | despresc <christian.j.j.despres@gmail.com> | 2020-04-04 16:35:42 -0400 |
|---|---|---|
| committer | despresc <christian.j.j.despres@gmail.com> | 2020-04-15 23:03:22 -0400 |
| commit | 4e34d366df31937cdc69b6b366355f10a84c16b2 (patch) | |
| tree | 844503b0f59439acaec5d2f8e2f016e2eb1d214c /test/rst-reader.native | |
| parent | f8ce38975b547fe7fc8c12ccee3a940b35d8b9cf (diff) | |
| download | pandoc-4e34d366df31937cdc69b6b366355f10a84c16b2.tar.gz | |
Adapt to the newest Table type, fix some previous adaptation issues
- Writers.Native is now adapted to the new Table type.
- Inline captions should now be conditionally wrapped in a Plain, not
a Para block.
- The toLegacyTable function now lives in Writers.Shared.
Diffstat (limited to 'test/rst-reader.native')
| -rw-r--r-- | test/rst-reader.native | 276 |
1 files changed, 159 insertions, 117 deletions
diff --git a/test/rst-reader.native b/test/rst-reader.native index 485d566ca..558e334ea 100644 --- a/test/rst-reader.native +++ b/test/rst-reader.native @@ -245,151 +245,193 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa ,[Str "\160\160and",Space,Str "another"]] ,Header 1 ("simple-tables",[],[]) [Str "Simple",Space,Str "Tables"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "col",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "col",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "col",Space,Str "3"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "col",Space,Str "3"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Headless"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Header 1 ("grid-tables",[],[]) [Str "Grid",Space,Str "Tables"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.2375),(AlignDefault,Just 0.15),(AlignDefault,Just 0.1625)] 0 + []) + [(AlignDefault,ColWidth 0.2375) + ,(AlignDefault,ColWidth 0.15) + ,(AlignDefault,ColWidth 0.1625)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "col",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "col",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "col",Space,Str "3"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "col",Space,Str "3"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Headless"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.2375),(AlignDefault,Just 0.15),(AlignDefault,Just 0.1625)] 0 + []) + [(AlignDefault,ColWidth 0.2375) + ,(AlignDefault,ColWidth 0.15) + ,(AlignDefault,ColWidth 0.1625)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Spaces",Space,Str "at",Space,Str "ends",Space,Str "of",Space,Str "lines"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.2375),(AlignDefault,Just 0.15),(AlignDefault,Just 0.1625)] 0 + []) + [(AlignDefault,ColWidth 0.2375) + ,(AlignDefault,ColWidth 0.15) + ,(AlignDefault,ColWidth 0.1625)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Multiple",Space,Str "blocks",Space,Str "in",Space,Str "a",Space,Str "cell"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.2375),(AlignDefault,Just 0.15),(AlignDefault,Just 0.1625)] 0 + []) + [(AlignDefault,ColWidth 0.2375) + ,(AlignDefault,ColWidth 0.15) + ,(AlignDefault,ColWidth 0.1625)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "r1",Space,Str "a"] - ,Para [Str "r1",Space,Str "bis"]] - ,Cell ("",[],[]) Nothing 1 1 - [BulletList - [[Plain [Str "b"]] - ,[Plain [Str "b",Space,Str "2"]] - ,[Plain [Str "b",Space,Str "2"]]]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "r1",Space,Str "a"] + ,Para [Str "r1",Space,Str "bis"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [BulletList + [[Plain [Str "b"]] + ,[Plain [Str "b",Space,Str "2"]] + ,[Plain [Str "b",Space,Str "2"]]]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]])] + (TableFoot ("",[],[]) + []) ,Header 1 ("footnotes",[],[]) [Str "Footnotes"] ,Para [Note [Para [Str "Note",Space,Str "with",Space,Str "one",Space,Str "line."]]] ,Para [Note [Para [Str "Note",Space,Str "with",SoftBreak,Str "continuation",Space,Str "line."]]] |