git.iko.soy/typeable/pandoc
on master help sign in
ConTeXt writer: Properly handle tables without captions.

The old output only worked in MkII. This should work in MkIV as well. Closes #837.

commit5cb0f0bbf1da61b7ce276a39055a51b6166500cc authorJohn MacFarlane <fiddlosopher@gmail.com> dateFri 28 Jun 2013, 21:30 (13 years ago) parent644e323
2 files changed+8−6
compare with master
unifiedsplit
src/Text/Pandoc/Writers/ConTeXt.hs+4−2 tests/tables.context+4−4
src/Text/Pandoc/Writers/ConTeXt.hs+4−2
@@ -203,9 +203,11 @@ blockToConTeXt (Table caption aligns widths heads rows) = do
203203 then return empty
204204 else liftM ($$ "\\HL") $ tableRowToConTeXt heads
205205 captionText <- inlineListToConTeXt caption
206− let captionText' = if null caption then text "none" else captionText
207206 rows' <- mapM tableRowToConTeXt rows
208− return $ "\\placetable[here]" <> braces captionText' $$
207+ return $ "\\placetable" <> brackets ("here" <> if null caption
208+ then ",none"
209+ else "")
210+ <> braces captionText $$
209211 "\\starttable" <> brackets (text colDescriptors) $$
210212 "\\HL" $$ headers $$
211213 vcat rows' $$ "\\HL" $$ "\\stoptable" <> blankline
tests/tables.context+4−4
@@ -29,7 +29,7 @@ Simple table with caption:
2929
3030Simple table without caption:
3131
32−\placetable[here]{none}
32+\placetable[here,none]{}
3333\starttable[|r|l|c|l|]
3434\HL
3535\NC Right
@@ -111,7 +111,7 @@ Multiline table with caption:
111111
112112Multiline table without caption:
113113
114−\placetable[here]{none}
114+\placetable[here,none]{}
115115\starttable[|cp(0.15\textwidth)|lp(0.14\textwidth)|rp(0.16\textwidth)|lp(0.34\textwidth)|]
116116\HL
117117\NC Centered Header
@@ -135,7 +135,7 @@ Multiline table without caption:
135135
136136Table without column headers:
137137
138−\placetable[here]{none}
138+\placetable[here,none]{}
139139\starttable[|r|l|c|r|]
140140\HL
141141\NC 12
@@ -158,7 +158,7 @@ Table without column headers:
158158
159159Multiline table without column headers:
160160
161−\placetable[here]{none}
161+\placetable[here,none]{}
162162\starttable[|cp(0.15\textwidth)|lp(0.14\textwidth)|rp(0.16\textwidth)|lp(0.34\textwidth)|]
163163\HL
164164\NC First