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

Markdown writer: Fixed grid tables embedded in grid tables.

Browse source 
Closes #2834.
This commit is contained in:
John MacFarlane 2017-03-01 17:41:14 +01:00
parent 8b641f38ca
commit ea619bfcb4
2 changed files with 81 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
src/Text/Pandoc/Writers/Markdown.hs
View file

@ -44,6 +44,7 @@ import Data.List ( group, stripPrefix, find, intersperse, transpose, sortBy )
import Data.Char ( isSpace, isPunctuation, ord, chr )
import Data.Ord ( comparing )
import Text.Pandoc.Pretty
import Control.Monad (zipWithM)
import Control.Monad.Reader
import Control.Monad.State
import Control.Monad.Except (throwError)
@ -514,10 +515,8 @@ blockToMarkdown' opts (BlockQuote blocks) = do
blockToMarkdown' opts t@(Table caption aligns widths headers rows) = do
caption' <- inlineListToMarkdown opts caption
let caption'' = if null caption || not (isEnabled Ext_table_captions opts)
then empty
else blankline <> ": " <> caption' <> blankline
rawHeaders <- mapM (blockListToMarkdown opts) headers
rawRows <- mapM (mapM (blockListToMarkdown opts)) rows
then blankline
else blankline $$ (": " <> caption') $$ blankline
let isLineBreak LineBreak = Any True
isLineBreak _ = Any False
let isSimple = all (==0) widths &&
@ -525,34 +524,52 @@ blockToMarkdown' opts t@(Table caption aligns widths headers rows) = do
let isPlainBlock (Plain _) = True
isPlainBlock _ = False
let hasBlocks = not (all isPlainBlock $ concat . concat $ headers:rows)
(nst,tbl) <- case True of
_ | isSimple &&
isEnabled Ext_simple_tables opts -> fmap (nest 2,) $
pandocTable opts (all null headers) aligns widths
rawHeaders rawRows
| isSimple &&
isEnabled Ext_pipe_tables opts -> fmap (id,) $
pipeTable (all null headers) aligns rawHeaders rawRows
| not hasBlocks &&
isEnabled Ext_multiline_tables opts -> fmap (nest 2,) $
pandocTable opts (all null headers) aligns widths
rawHeaders rawRows
| isEnabled Ext_grid_tables opts -> do
let numcols = length headers
let widths' = if all (==0) widths
then replicate numcols
(1.0 / fromIntegral numcols)
else widths
let widthsInChars = map ((\x -> x - 3) . floor .
(fromIntegral (writerColumns opts) *)) widths'
fmap (id,) $
gridTable (all null headers) aligns widthsInChars
rawHeaders rawRows
| isEnabled Ext_raw_html opts -> fmap (id,) $
text <$>
(writeHtml5String def $ Pandoc nullMeta [t])
| otherwise -> return $ (id, text "[TABLE]")
return $ nst $ tbl $$ blankline $$ caption'' $$ blankline
rawHeaders <- mapM (blockListToMarkdown opts) headers
rawRows <- mapM (mapM (blockListToMarkdown opts)) rows
(nst,tbl) <-
case True of
_ | isSimple &&
isEnabled Ext_simple_tables opts -> fmap (nest 2,) $
pandocTable opts (all null headers) aligns widths
rawHeaders rawRows
| isSimple &&
isEnabled Ext_pipe_tables opts -> fmap (id,) $
pipeTable (all null headers) aligns rawHeaders rawRows
| not hasBlocks &&
isEnabled Ext_multiline_tables opts -> fmap (nest 2,) $
pandocTable opts (all null headers) aligns widths
rawHeaders rawRows
| isEnabled Ext_grid_tables opts &&
writerColumns opts >= 8 * length headers -> do
let numcols = length headers
let widths' = if all (==0) widths
then replicate numcols
(1.0 / fromIntegral numcols)
else widths
let widthsInChars = map ((\x -> x - 3) . floor .
(fromIntegral (writerColumns opts) *)) widths'
rawHeaders' <- zipWithM
blockListToMarkdown
(map (\w -> opts{writerColumns =
min (w - 2) (writerColumns opts)})
widthsInChars)
headers
rawRows' <- mapM
(\cs -> zipWithM
blockListToMarkdown
(map (\w -> opts{writerColumns =
min (w - 2) (writerColumns opts)})
widthsInChars)
cs)
rows
fmap (id,) $
gridTable (all null headers) aligns widthsInChars
rawHeaders' rawRows'
| isEnabled Ext_raw_html opts -> fmap (id,) $
text <$>
(writeHtml5String def $ Pandoc nullMeta [t])
| otherwise -> return $ (id, text "[TABLE]")
return $ nst $ tbl $$ caption'' $$ blankline
blockToMarkdown' opts (BulletList items) = do
contents <- inList $ mapM (bulletListItemToMarkdown opts) items
return $ cat contents <> blankline

32
test/command/2834.md Normal file
View file

@ -0,0 +1,32 @@
Nested grid tables.
```
% pandoc -f html -t markdown --columns=72
<table>
<tr>
<td>
<table>
<tr>
<td>
<table>
<tr>
<td>some text</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
^D
+-----------------------------------------------------------------------+
| +------------------------------------------------------------------+ |
| | ----------- | |
| | some text | |
| | ----------- | |
| +------------------------------------------------------------------+ |
+-----------------------------------------------------------------------+
```