opensource/pandoc
3
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-09-24 15:44:59 +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/command/tabularx.md
+102 -81
View File
@@ -21,36 +21,43 @@
\end{tabularx}
^D
[Table ("",[],[]) (Caption Nothing
[]) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0
[])
[(AlignCenter,ColWidthDefault)
,(AlignCenter,ColWidthDefault)
,(AlignCenter,ColWidthDefault)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]
,Cell ("",[],[]) Nothing 1 1
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "1.1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "1.2"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "1.3"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "2.1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "2.2"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "2.3"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "3.1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "3.2"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "3.3"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "1.1"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "1.2"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "1.3"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "2.1"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "2.2"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "2.3"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "3.1"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "3.2"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "3.3"]]]])]
(TableFoot ("",[],[])
[])]
```
```
@@ -76,36 +83,43 @@
\end{tabularx}
^D
[Table ("",[],[]) (Caption Nothing
[]) [(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Just 0.25)] 0
[])
[(AlignLeft,ColWidthDefault)
,(AlignCenter,ColWidthDefault)
,(AlignLeft,ColWidth 0.25)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]
,Cell ("",[],[]) Nothing 1 1
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "1.1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "1.2"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "1.3"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "2.1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "2.2"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "2.3"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "3.1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "3.2"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "3.3"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "1.1"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "1.2"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "1.3"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "2.1"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "2.2"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "2.3"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "3.1"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "3.2"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "3.3"]]]])]
(TableFoot ("",[],[])
[])]
```
```
@@ -131,34 +145,41 @@
\end{tabularx}
^D
[Table ("",[],[]) (Caption Nothing
[]) [(AlignLeft,Just 0.25),(AlignCenter,Nothing),(AlignLeft,Just 0.25)] 0
[])
[(AlignLeft,ColWidth 0.25)
,(AlignCenter,ColWidthDefault)
,(AlignLeft,ColWidth 0.25)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]
,Cell ("",[],[]) Nothing 1 1
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "1.1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "1.2"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "1.3"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "2.1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "2.2"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "2.3"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "3.1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "3.2"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell",Space,Str "3.3"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "1.1"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "1.2"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "1.3"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "2.1"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "2.2"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "2.3"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "3.1"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "3.2"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell",Space,Str "3.3"]]]])]
(TableFoot ("",[],[])
[])]
```