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.
This commit is contained in:
despresc
2020-04-15 23:03:22 -04:00
parent f8ce38975b
commit 4e34d366df
113 changed files with 5082 additions and 3889 deletions
+34 -27
View File
@@ -6,34 +6,41 @@ Apple,25 cents,33
,,45
^D
[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 "Fruit"]]
,Cell ("",[],[]) Nothing 1 1
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Price"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Quantity"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Apple"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "25",Space,Str "cents"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "33"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "\"Navel\"",Space,Str "Orange"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "35",Space,Str "cents"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "22"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[]
,Cell ("",[],[]) Nothing 1 1
[]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "45"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Quantity"]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Apple"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "25",Space,Str "cents"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "33"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "\"Navel\"",Space,Str "Orange"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "35",Space,Str "cents"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "22"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "45"]]]])]
(TableFoot ("",[],[])
[])]
```