From 7c2dd0359b8ece3df91af81338274008c0740a69 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 11 Oct 2019 09:46:58 -0700 Subject: Markdown writer: prefer pipe_tables to raw html... ...even when we must lose width information. All in all this seems to be people's preferred behavior, even though it is slightly lossier. Closes #2608. Closes #4497. --- src/Text/Pandoc/Writers/Markdown.hs | 6 +++--- test/command/3734.md | 24 +++--------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs index fc25cde44..8f8b7ec14 100644 --- a/src/Text/Pandoc/Writers/Markdown.hs +++ b/src/Text/Pandoc/Writers/Markdown.hs @@ -628,15 +628,15 @@ blockToMarkdown' opts t@(Table caption aligns widths headers rows) = do writerColumns opts >= 8 * numcols -> (id,) <$> gridTable opts blockListToMarkdown (all null headers) aligns' widths' headers rows - | isEnabled Ext_raw_html opts -> fmap (id,) $ - (text . T.unpack) <$> - (writeHtml5String opts{ writerTemplate = Nothing } $ Pandoc nullMeta [t]) | hasSimpleCells && isEnabled Ext_pipe_tables opts -> do rawHeaders <- padRow <$> mapM (blockListToMarkdown opts) headers rawRows <- mapM (fmap padRow . mapM (blockListToMarkdown opts)) rows (id,) <$> pipeTable (all null headers) aligns' rawHeaders rawRows + | isEnabled Ext_raw_html opts -> fmap (id,) $ + (text . T.unpack) <$> + (writeHtml5String opts{ writerTemplate = Nothing } $ Pandoc nullMeta [t]) | otherwise -> return $ (id, text "[TABLE]") return $ nst (tbl $$ caption'') $$ blankline blockToMarkdown' opts (BulletList items) = do diff --git a/test/command/3734.md b/test/command/3734.md index 16803256b..7549fb053 100644 --- a/test/command/3734.md +++ b/test/command/3734.md @@ -4,27 +4,9 @@ |--------------|-------|--------------------------------------------------------------------------| | aaaaaaaaaaaa | | cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc | ^D - ----- - - - - - - - - - - - - - - -
aaaaaaaaaaaabbbbbccccccccccc
aaaaaaaaaaaacccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+| aaaaaaaaaaaa | bbbbb | ccccccccccc | +|--------------|-------|--------------------------------------------------------------------------| +| aaaaaaaaaaaa | | cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc | ``` ``` -- cgit v1.2.3