Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Small fix to haddock "tables".

Browse source
This commit is contained in:
John MacFarlane 2014-06-18 18:08:41 -07:00
parent bc037b69a4
commit c4182b39ca
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Text/Pandoc/Writers/Haddock.hs
View file

@ -129,7 +129,7 @@ blockToHaddock opts (BlockQuote blocks) =
-- Haddock doesn't have tables. Use haddock tables in code.
blockToHaddock opts (Table caption aligns widths headers rows) = do
caption' <- inlineListToHaddock opts caption
let caption'' = if null caption || not (isEnabled Ext_table_captions opts)
let caption'' = if null caption
then empty
else blankline <> caption' <> blankline
rawHeaders <- mapM (blockListToHaddock opts) headers
@ -148,7 +148,7 @@ blockToHaddock opts (Table caption aligns widths headers rows) = do
| otherwise -> fmap (id,) $
gridTable opts (all null headers) aligns widths
rawHeaders rawRows
return $ prefixed "> " $ nst $ tbl $$ blankline $$ caption'' $$ blankline
return $ (prefixed "> " $ nst $ tbl $$ blankline $$ caption'') $$ blankline
blockToHaddock opts (BulletList items) = do
contents <- mapM (bulletListItemToHaddock opts) items
return $ cat contents <> blankline

13
tests/tables.haddock
View file

@ -6,6 +6,8 @@ Simple table with caption:
> 123 123 123 123
> 1 1 1 1
>
> Demonstration of simple table syntax.
Simple table without caption:
> Right Left Center Default
@ -13,7 +15,7 @@ Simple table without caption:
> 12 12 12 12
> 123 123 123 123
> 1 1 1 1
>
Simple table indented two spaces:
> Right Left Center Default
@ -22,6 +24,8 @@ Simple table indented two spaces:
> 123 123 123 123
> 1 1 1 1
>
> Demonstration of simple table syntax.
Multiline table with caption:
> --------------------------------------------------------------
@ -36,6 +40,8 @@ Multiline table with caption:
> rows.
> --------------------------------------------------------------
>
> Here\'s the caption. It may span multiple lines.
Multiline table without caption:
> --------------------------------------------------------------
@ -49,7 +55,7 @@ Multiline table without caption:
> the blank line between
> rows.
> --------------------------------------------------------------
>
Table without column headers:
> ----- ----- ----- -----
@ -57,7 +63,7 @@ Table without column headers:
> 123 123 123 123
> 1 1 1 1
> ----- ----- ----- -----
>
Multiline table without column headers:
> ----------- ---------- ------------ --------------------------
@ -68,5 +74,4 @@ Multiline table without column headers:
> the blank line between
> rows.
> ----------- ---------- ------------ --------------------------
>