lee/pandoc
1
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-08-24 17:26:32 +00: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/1881.md
+48 -32
View File
@@ -21,26 +21,34 @@
</table>
^D
[Table ("",[],[]) (Caption Nothing
[Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0
[Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]])
[(AlignRight,ColWidthDefault)
,(AlignLeft,ColWidthDefault)
,(AlignCenter,ColWidthDefault)
,(AlignDefault,ColWidthDefault)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Right"]]
,Cell ("",[],[]) Nothing 1 1
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Left"]]
,Cell ("",[],[]) Nothing 1 1
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Center"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Default"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "12"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "12"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "12"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "12"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Default"]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "12"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "12"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "12"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "12"]]]])]
(TableFoot ("",[],[])
[])]
```
```
@@ -55,25 +63,33 @@
</table>
^D
[Table ("",[],[]) (Caption Nothing
[]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0
[])
[(AlignRight,ColWidthDefault)
,(AlignLeft,ColWidthDefault)
,(AlignCenter,ColWidthDefault)
,(AlignRight,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
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]
,Cell ("",[],[]) Nothing 1 1
[]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "12"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "12"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "12"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "12"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "12"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "12"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "12"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "12"]]]])]
(TableFoot ("",[],[])
[])]
```
test/command/3348.md
+21 -15
View File
@@ -8,21 +8,27 @@
----- ------------------------------------------------
^D
[Table ("",[],[]) (Caption Nothing
[]) [(AlignRight,Just 8.333333333333333e-2),(AlignLeft,Just 0.6805555555555556)] 0
[])
[(AlignRight,ColWidth 8.333333333333333e-2)
,(AlignLeft,ColWidth 0.6805555555555556)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]
,Cell ("",[],[]) Nothing 1 1
[]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "foo"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "bar"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "foo"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "long",SoftBreak,Str "line",Space,Str "of",Space,Str "text"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "foo"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "bar"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "foo"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "long",SoftBreak,Str "line",Space,Str "of",Space,Str "text"]]]])]
(TableFoot ("",[],[])
[])]
```
test/command/3516.md
+42 -30
View File
@@ -25,45 +25,57 @@ on Windows builds.
+---+---+
^D
[Table ("",[],[]) (Caption Nothing
[]) [(AlignDefault,Just 5.555555555555555e-2),(AlignDefault,Just 5.555555555555555e-2)] 0
[])
[(AlignDefault,ColWidth 5.555555555555555e-2)
,(AlignDefault,ColWidth 5.555555555555555e-2)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]
,Cell ("",[],[]) Nothing 1 1
[]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "2"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[]
,Cell ("",[],[]) Nothing 1 1
[]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "1"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "2"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]]])]
(TableFoot ("",[],[])
[])]
```
```
% pandoc -f native -t rst
[Table ("",[],[]) (Caption Nothing
[]) [(AlignDefault,Just 5.555555555555555e-2),(AlignDefault,Just 5.555555555555555e-2)] 0
[])
[(AlignDefault,ColWidth 5.555555555555555e-2)
,(AlignDefault,ColWidth 5.555555555555555e-2)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]
,Cell ("",[],[]) Nothing 1 1
[]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Para [Str "1"]]
,Cell ("",[],[]) Nothing 1 1
[Para [Str "2"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[]
,Cell ("",[],[]) Nothing 1 1
[]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Para [Str "1"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Para [Str "2"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]]])]
(TableFoot ("",[],[])
[])]
^D
+---+---+
| 1 | 2 |
test/command/3533-rst-csv-tables.md
+70 -50
View File
@@ -6,29 +6,36 @@
:file: command/3533-rst-csv-tables.csv
^D
[Table ("",[],[]) (Caption Nothing
[Para [Str "Test"]]) [(AlignDefault,Just 0.4),(AlignDefault,Just 0.2),(AlignDefault,Just 0.4)] 0
[Plain [Str "Test"]])
[(AlignDefault,ColWidth 0.4)
,(AlignDefault,ColWidth 0.2)
,(AlignDefault,ColWidth 0.4)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Flavor"]]
,Cell ("",[],[]) Nothing 1 1
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Price"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Slogan"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Albatross"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "2.99"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "On",Space,Str "a",Space,Str "stick!"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Crunchy",Space,Str "Frog"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "1.49"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "If",Space,Str "we",Space,Str "took",Space,Str "the",Space,Str "bones",Space,Str "out,",Space,Str "it",Space,Str "wouldn't",Space,Str "be",SoftBreak,Str "crunchy,",Space,Str "now",Space,Str "would",Space,Str "it?"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Slogan"]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Albatross"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "2.99"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "On",Space,Str "a",Space,Str "stick!"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Crunchy",Space,Str "Frog"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "1.49"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "If",Space,Str "we",Space,Str "took",Space,Str "the",Space,Str "bones",Space,Str "out,",Space,Str "it",Space,Str "wouldn't",Space,Str "be",SoftBreak,Str "crunchy,",Space,Str "now",Space,Str "would",Space,Str "it?"]]]])]
(TableFoot ("",[],[])
[])]
```
```
@@ -43,29 +50,36 @@
'dog''s' 2 3
^D
[Table ("",[],[]) (Caption Nothing
[Para [Str "Test"]]) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
[Plain [Str "Test"]])
[(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})
[Plain [Str "a"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "b"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "cat's"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "3"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "4"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "dog's"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "2"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "3"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "b"]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "cat's"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "3"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "4"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "dog's"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "2"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "3"]]]])]
(TableFoot ("",[],[])
[])]
```
```
@@ -76,17 +90,23 @@
"1","\""
^D
[Table ("",[],[]) (Caption Nothing
[Para [Str "Test"]]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
[Plain [Str "Test"]])
[(AlignDefault,ColWidthDefault)
,(AlignDefault,ColWidthDefault)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]
,Cell ("",[],[]) Nothing 1 1
[]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "\""]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "1"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "\""]]]])]
(TableFoot ("",[],[])
[])]
```
test/command/3706.md
+26 -20
View File
@@ -17,28 +17,34 @@ pandoc -f org -t native
^D
[Div ("tab",[],[])
[Table ("",[],[]) (Caption Nothing
[Para [Str "Lalelu."]]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0
[Plain [Str "Lalelu."]])
[(AlignDefault,ColWidthDefault)
,(AlignDefault,ColWidthDefault)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Id"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Desc"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "La"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "2"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "La"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "3"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "La"]]]]
[]]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Desc"]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "1"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "La"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "2"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "La"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "3"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "La"]]]])]
(TableFoot ("",[],[])
[])]]
```
```
test/command/3708.md
+21 -15
View File
@@ -6,21 +6,27 @@
\end{tabular}
^D
[Table ("",[],[]) (Caption Nothing
[]) [(AlignCenter,Nothing),(AlignCenter,Nothing)] 0
[])
[(AlignCenter,ColWidthDefault)
,(AlignCenter,ColWidthDefault)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]
,Cell ("",[],[]) Nothing 1 1
[]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "A"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "B&1"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "C"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "D"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "A"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "B&1"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "C"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "D"]]]])]
(TableFoot ("",[],[])
[])]
```
test/command/4056.md
+20 -13
View File
@@ -15,20 +15,27 @@ Blah & Foo & Bar \\
\end{tabular}
^D
[Table ("",[],[]) (Caption Nothing
[]) [(AlignLeft,Nothing),(AlignRight,Nothing),(AlignRight,Nothing)] 0
[])
[(AlignLeft,ColWidthDefault)
,(AlignRight,ColWidthDefault)
,(AlignRight,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 "Blah"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Foo"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Bar"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Blah"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Foo"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Bar"]]]])]
(TableFoot ("",[],[])
[])]
```
test/command/4119.md
+16 -10
View File
@@ -9,18 +9,24 @@ not a caption!
::::::::::::::::
^D
[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 "col1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "col2"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "2"]]]]
[]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "col2"]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "1"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "2"]]]])]
(TableFoot ("",[],[])
[])
,Div ("",["notes"],[])
[Para [Str "not",Space,Str "a",Space,Str "caption!"]]]
```
test/command/4320.md
+17 -11
View File
@@ -1,19 +1,25 @@
```
% pandoc -f native -t rst --wrap=none
[Table ("",[],[]) (Caption Nothing
[]) [(AlignDefault,Just 0.3),(AlignDefault,Just 0.3)] 0
[])
[(AlignDefault,ColWidth 0.3)
,(AlignDefault,ColWidth 0.3)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "one"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "two"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "ports"]]
,Cell ("",[],[]) Nothing 1 1
[BlockQuote
[Para [Strong [Str "thisIsGoingToBeTooLongAnyway"]]]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "two"]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "ports"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[BlockQuote
[Para [Strong [Str "thisIsGoingToBeTooLongAnyway"]]]]]])]
(TableFoot ("",[],[])
[])]
^D
+--------------------+-------------------------------------+
| one | two |
test/command/4513.md
+12 -6
View File
@@ -3,12 +3,18 @@
|_. heading 1 |_. heading 2|
^D
[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 "heading",Space,Str "1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "heading",Space,Str "2"]]]]
[]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "heading",Space,Str "2"]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[])]
(TableFoot ("",[],[])
[])]
```
test/command/4579.md
+16 -10
View File
@@ -9,16 +9,22 @@
- ham
^D
[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 "Foo"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Bar"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "spam"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "ham"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Bar"]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "spam"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "ham"]]]])]
(TableFoot ("",[],[])
[])]
```
test/command/5014.md
+12 -7
View File
@@ -14,12 +14,17 @@
</table>
^D
[Table ("",[],[]) (Caption Nothing
[]) [(AlignDefault,Nothing)] 0
[])
[(AlignDefault,ColWidthDefault)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Name"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Accounts"]]]]
[]]
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Name"]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Accounts"]]]])]
(TableFoot ("",[],[])
[])]
```
test/command/5079.md
+12 -7
View File
@@ -11,12 +11,17 @@
</table>
^D
[Table ("",[],[]) (Caption Nothing
[]) [(AlignDefault,Nothing)] 0
[])
[(AlignDefault,ColWidthDefault)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "Cell"]]]]
[]]
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Cell"]]]])]
(TableFoot ("",[],[])
[])]
```
test/command/5708.md
+16 -10
View File
@@ -5,16 +5,22 @@
+--------+----------------+
^D
[Table ("",[],[]) (Caption Nothing
[]) [(AlignDefault,Just 0.125),(AlignDefault,Just 0.2361111111111111)] 0
[])
[(AlignDefault,ColWidth 0.125)
,(AlignDefault,ColWidth 0.2361111111111111)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]
,Cell ("",[],[]) Nothing 1 1
[]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "123456"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Math InlineMath "a + b"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "123456"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Math InlineMath "a + b"]]]])]
(TableFoot ("",[],[])
[])]
```
test/command/5711.md
+12 -7
View File
@@ -8,12 +8,17 @@
\end{document}
^D
[Table ("",[],[]) (Caption Nothing
[]) [(AlignCenter,Nothing)] 0
[])
[(AlignCenter,ColWidthDefault)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "d",LineBreak,Str "e"]]]]
[]]
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "d",LineBreak,Str "e"]]]])]
(TableFoot ("",[],[])
[])]
```
test/command/6137.md
+27 -20
View File
@@ -18,29 +18,36 @@ This reference to Figure \ref{fig:label} works fine.
[Para [Str "This",Space,Str "reference",Space,Str "to",Space,Str "Table",Space,Link ("",[],[("reference-type","ref"),("reference","tbl:label")]) [Str "1"] ("#tbl:label",""),Space,Str "doesn\8217t",Space,Str "work."]
,Div ("tbl:label",[],[])
[Table ("",[],[]) (Caption Nothing
[Para [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number."]]) [(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0
[Plain [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number."]])
[(AlignLeft,ColWidthDefault)
,(AlignCenter,ColWidthDefault)
,(AlignRight,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 "\8212\8212\8211"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "\8212\8212\8211"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "\8212\8212\8211"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "\8212\8212\8211"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "\8212\8212\8211"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "\8212\8212\8211"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "\8212\8212\8211"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "\8212\8212\8211"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "\8212\8212\8211"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "\8212\8212\8211"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "\8212\8212\8211"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "\8212\8212\8211"]]]])]
(TableFoot ("",[],[])
[])]
,Para [Str "This",Space,Str "reference",Space,Str "to",Space,Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:label")]) [Str "1"] ("#fig:label",""),Space,Str "works",Space,Str "fine."]
,Para [Image ("fig:label",[],[("width","\\textwidth")]) [Str "A",Space,Str "numbered",Space,Str "caption,",Space,Str "if",Space,Str "I",Space,Str "use",Space,Str "pandoc-crossref."] ("example.png","fig:")]]
```
test/command/csv.md
+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 ("",[],[])
[])]
```
test/command/gfm.md
+42 -30
View File
@@ -8,23 +8,29 @@ gfm tests:
| orange|1.12|
^D
[Table ("",[],[]) (Caption Nothing
[]) [(AlignDefault,Nothing),(AlignRight,Nothing)] 0
[])
[(AlignDefault,ColWidthDefault)
,(AlignRight,ColWidthDefault)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Fruit"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Price"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "apple"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "0.13"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "orange"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "1.12"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Price"]]]])
[(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 "0.13"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "orange"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "1.12"]]]])]
(TableFoot ("",[],[])
[])]
```
```
@@ -69,23 +75,29 @@ My:thumbsup:emoji:heart:
```
% pandoc -t gfm -f native
[Table ("",[],[]) (Caption Nothing
[Para [Str "The",Space,Str "caption."]]) [(AlignDefault,Nothing),(AlignRight,Nothing)] 0
[Plain [Str "The",Space,Str "caption."]])
[(AlignDefault,ColWidthDefault)
,(AlignRight,ColWidthDefault)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Fruit"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "Price"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "apple"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "0.13"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Str "orange"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Str "1.12"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "Price"]]]])
[(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 "0.13"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "orange"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Str "1.12"]]]])]
(TableFoot ("",[],[])
[])]
^D
| Fruit | Price |
| ------ | ----: |
test/command/latex-tabular-column-specs.md
+27 -20
View File
@@ -12,27 +12,34 @@ f & 0.5 & 5,5 \\
\end{tabular}
^D
[Table ("",[],[]) (Caption Nothing
[]) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0
[])
[(AlignLeft,ColWidthDefault)
,(AlignLeft,ColWidthDefault)
,(AlignLeft,ColWidthDefault)]
(TableHead ("",[],[])
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Math InlineMath ""]]
,Cell ("",[],[]) Nothing 1 1
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Math InlineMath "f1"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Math InlineMath "f2"]]]]
[Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Math InlineMath "e"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Math InlineMath "0.5"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Math InlineMath "4"]]]
,Row ("",[],[])
[Cell ("",[],[]) Nothing 1 1
[Plain [Math InlineMath "f"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Math InlineMath "0.5"]]
,Cell ("",[],[]) Nothing 1 1
[Plain [Math InlineMath "5,5"]]]]
[]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Math InlineMath "f2"]]]])
[(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0})
[]
[Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Math InlineMath "e"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Math InlineMath "0.5"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Math InlineMath "4"]]]
,Row ("",[],[])
[Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Math InlineMath "f"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Math InlineMath "0.5"]]
,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1})
[Plain [Math InlineMath "5,5"]]]])]
(TableFoot ("",[],[])
[])]
```
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 ("",[],[])
[])]
```