opensource/pandoc
3
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-09-17 17:39:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to the newest Table type, fix some previous adaptation issues

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files
test/tikiwiki-reader.native
+107 -82
View File
@@ -91,97 +91,122 @@ Pandoc (Meta {unMeta = fromList []})
,[Plain [Str "five",Space,Str "sub",Space,Str "2"]]]]]
,Header 1 ("tables",[],[]) [Str "tables"]
,Table ("",[],[]) (Caption Nothing
[]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
[])
[(AlignDefault,ColWidthDefault)
,(AlignDefault,ColWidthDefault)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str ""]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str ""]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Orange"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Apple"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Bread"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Pie"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Butter"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Ice",Space,Str "cream"]]]]
[]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str ""]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Orange"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Apple"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Bread"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Pie"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Butter"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Ice",Space,Str "cream"]]]])]
(TableFoot ("",[],[])
[])
,Table ("",[],[]) (Caption Nothing
[]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
[])
[(AlignDefault,ColWidthDefault)
,(AlignDefault,ColWidthDefault)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str ""]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str ""]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Orange"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Apple"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Bread"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Pie"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Strong [Str "Butter"]]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Ice",Space,Str "cream"]]]]
[]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str ""]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Orange"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Apple"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Bread"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Pie"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Strong [Str "Butter"]]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Ice",Space,Str "cream"]]]])]
(TableFoot ("",[],[])
[])
,Table ("",[],[]) (Caption Nothing
[]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
[])
[(AlignDefault,ColWidthDefault)
,(AlignDefault,ColWidthDefault)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str ""]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str ""]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Orange"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Apple"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"],Space]]]]
[]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str ""]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Orange"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Apple"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"],Space]]]])]
(TableFoot ("",[],[])
[])
,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 ""]]
,Cell ("",[],[]) Nothing 1 1
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str ""]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str ""]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Space,Str "Orange",Space]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Space,Str "Apple",Space]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Space,Str "more"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Space,Str "Bread",Space]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Space,Str "Pie",Space]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Space,Str "more"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Space,Str "Butter",Space]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Space,Str "Ice",Space,Str "cream",Space]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Space,Str "and",Space,Str "more",Space]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str ""]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Space,Str "Orange",Space]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Space,Str "Apple",Space]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Space,Str "more"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Space,Str "Bread",Space]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Space,Str "Pie",Space]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Space,Str "more"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Space,Str "Butter",Space]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Space,Str "Ice",Space,Str "cream",Space]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Space,Str "and",Space,Str "more",Space]]]])]
(TableFoot ("",[],[])
[])]