diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2013-06-28 21:30:27 -0700 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2013-06-28 21:30:27 -0700 |
| commit | 5cb0f0bbf1da61b7ce276a39055a51b6166500cc (patch) | |
| tree | 0ad247f45a92655aee4363d0e5906444b0e0b938 | |
| parent | 644e3239a9d1fc92f7409db8612ced39e38fde2f (diff) | |
| download | pandoc-5cb0f0bbf1da61b7ce276a39055a51b6166500cc.tar.gz | |
ConTeXt writer: Properly handle tables without captions.
The old output only worked in MkII. This should work in MkIV
as well.
Closes #837.
| -rw-r--r-- | src/Text/Pandoc/Writers/ConTeXt.hs | 6 | ||||
| -rw-r--r-- | tests/tables.context | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/Text/Pandoc/Writers/ConTeXt.hs b/src/Text/Pandoc/Writers/ConTeXt.hs index 85cb8e3d1..ac158b471 100644 --- a/src/Text/Pandoc/Writers/ConTeXt.hs +++ b/src/Text/Pandoc/Writers/ConTeXt.hs @@ -203,9 +203,11 @@ blockToConTeXt (Table caption aligns widths heads rows) = do then return empty else liftM ($$ "\\HL") $ tableRowToConTeXt heads captionText <- inlineListToConTeXt caption - let captionText' = if null caption then text "none" else captionText rows' <- mapM tableRowToConTeXt rows - return $ "\\placetable[here]" <> braces captionText' $$ + return $ "\\placetable" <> brackets ("here" <> if null caption + then ",none" + else "") + <> braces captionText $$ "\\starttable" <> brackets (text colDescriptors) $$ "\\HL" $$ headers $$ vcat rows' $$ "\\HL" $$ "\\stoptable" <> blankline diff --git a/tests/tables.context b/tests/tables.context index 20f7ceedb..e113a8e6a 100644 --- a/tests/tables.context +++ b/tests/tables.context @@ -29,7 +29,7 @@ Simple table with caption: Simple table without caption: -\placetable[here]{none} +\placetable[here,none]{} \starttable[|r|l|c|l|] \HL \NC Right @@ -111,7 +111,7 @@ Multiline table with caption: Multiline table without caption: -\placetable[here]{none} +\placetable[here,none]{} \starttable[|cp(0.15\textwidth)|lp(0.14\textwidth)|rp(0.16\textwidth)|lp(0.34\textwidth)|] \HL \NC Centered Header @@ -135,7 +135,7 @@ Multiline table without caption: Table without column headers: -\placetable[here]{none} +\placetable[here,none]{} \starttable[|r|l|c|r|] \HL \NC 12 @@ -158,7 +158,7 @@ Table without column headers: Multiline table without column headers: -\placetable[here]{none} +\placetable[here,none]{} \starttable[|cp(0.15\textwidth)|lp(0.14\textwidth)|rp(0.16\textwidth)|lp(0.34\textwidth)|] \HL \NC First |