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

Markdown writer: use raw HTML for simple, pipe tables with linebreaks.

Browse source 
Markdown line breaks involve a newline, and simple and pipe
tables can't contain one.

Closes #2993.
This commit is contained in:
John MacFarlane 2016-06-23 10:00:33 -07:00
parent 5fac8266d8
commit 139d418d4b
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,7 @@ import Text.Pandoc.Writers.Shared
import Text.Pandoc.Options import Text.Pandoc.Options
import Text.Pandoc.Parsing hiding (blankline, blanklines, char, space) import Text.Pandoc.Parsing hiding (blankline, blanklines, char, space)
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
import Data.Monoid (Any(..))
import Data.List ( group, stripPrefix, find, intersperse, transpose, sortBy ) import Data.List ( group, stripPrefix, find, intersperse, transpose, sortBy )
import Data.Char ( isSpace, isPunctuation, ord, chr ) import Data.Char ( isSpace, isPunctuation, ord, chr )
import Data.Ord ( comparing ) import Data.Ord ( comparing )
@ -436,7 +437,10 @@ blockToMarkdown opts t@(Table caption aligns widths headers rows) = do
else blankline <> ": " <> caption' <> blankline else blankline <> ": " <> caption' <> blankline
rawHeaders <- mapM (blockListToMarkdown opts) headers rawHeaders <- mapM (blockListToMarkdown opts) headers
rawRows <- mapM (mapM (blockListToMarkdown opts)) rows rawRows <- mapM (mapM (blockListToMarkdown opts)) rows
let isSimple = all (==0) widths let isLineBreak LineBreak = Any True
isLineBreak _ = Any False
let isSimple = all (==0) widths &&
not ( getAny (query isLineBreak (headers:rows)) )
let isPlainBlock (Plain _) = True let isPlainBlock (Plain _) = True
isPlainBlock _ = False isPlainBlock _ = False
let hasBlocks = not (all isPlainBlock $ concat . concat $ headers:rows) let hasBlocks = not (all isPlainBlock $ concat . concat $ headers:rows)