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

Markdown writer: preserve implicit_figures with attributes...

Browse source 
...even if `implicit_attributes` is not set, by rendering in
raw HTML.

Fixes #4677.
This commit is contained in:
John MacFarlane 2018-05-30 09:24:52 -07:00
parent 1100bfc0e6
commit 252ab9b773
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -452,8 +452,14 @@ blockToMarkdown' opts (Plain inlines) = do
| otherwise -> contents | otherwise -> contents
return $ contents' <> cr return $ contents' <> cr
-- title beginning with fig: indicates figure -- title beginning with fig: indicates figure
blockToMarkdown' opts (Para [Image attr alt (src,'f':'i':'g':':':tit)]) = blockToMarkdown' opts (Para [Image attr alt (src,'f':'i':'g':':':tit)])
blockToMarkdown opts (Para [Image attr alt (src,tit)]) | isEnabled Ext_raw_html opts &&
not (isEnabled Ext_link_attributes opts) &&
attr /= nullAttr = -- use raw HTML
(text . T.unpack . T.strip) <$>
writeHtml5String opts{ writerTemplate = Nothing }
(Pandoc nullMeta [Para [Image attr alt (src,"fig:" ++ tit)]])
| otherwise = blockToMarkdown opts (Para [Image attr alt (src,tit)])
blockToMarkdown' opts (Para inlines) = blockToMarkdown' opts (Para inlines) =
(<> blankline) `fmap` blockToMarkdown opts (Plain inlines) (<> blankline) `fmap` blockToMarkdown opts (Plain inlines)
blockToMarkdown' opts (LineBlock lns) = blockToMarkdown' opts (LineBlock lns) =
@ -619,7 +625,7 @@ blockToMarkdown' opts t@(Table caption aligns widths headers rows) = do
(all null headers) aligns' widths' headers rows (all null headers) aligns' widths' headers rows
| isEnabled Ext_raw_html opts -> fmap (id,) $ | isEnabled Ext_raw_html opts -> fmap (id,) $
(text . T.unpack) <$> (text . T.unpack) <$>
(writeHtml5String def $ Pandoc nullMeta [t]) (writeHtml5String opts{ writerTemplate = Nothing } $ Pandoc nullMeta [t])
| hasSimpleCells && | hasSimpleCells &&
isEnabled Ext_pipe_tables opts -> do isEnabled Ext_pipe_tables opts -> do
rawHeaders <- padRow <$> mapM (blockListToMarkdown opts) headers rawHeaders <- padRow <$> mapM (blockListToMarkdown opts) headers
@ -1172,7 +1178,7 @@ inlineToMarkdown opts lnk@(Link attr txt (src, tit))
not (isEnabled Ext_link_attributes opts) && not (isEnabled Ext_link_attributes opts) &&
attr /= nullAttr = -- use raw HTML attr /= nullAttr = -- use raw HTML
(text . T.unpack . T.strip) <$> (text . T.unpack . T.strip) <$>
writeHtml5String def (Pandoc nullMeta [Plain [lnk]]) writeHtml5String opts{ writerTemplate = Nothing } (Pandoc nullMeta [Plain [lnk]])
| otherwise = do | otherwise = do
plain <- asks envPlain plain <- asks envPlain
linktext <- inlineListToMarkdown opts txt linktext <- inlineListToMarkdown opts txt
@ -1212,7 +1218,7 @@ inlineToMarkdown opts img@(Image attr alternate (source, tit))
not (isEnabled Ext_link_attributes opts) && not (isEnabled Ext_link_attributes opts) &&
attr /= nullAttr = -- use raw HTML attr /= nullAttr = -- use raw HTML
(text . T.unpack . T.strip) <$> (text . T.unpack . T.strip) <$>
writeHtml5String def (Pandoc nullMeta [Plain [img]]) writeHtml5String opts{ writerTemplate = Nothing } (Pandoc nullMeta [Plain [img]])
| otherwise = do | otherwise = do
plain <- asks envPlain plain <- asks envPlain
let txt = if null alternate || alternate == [Str source] let txt = if null alternate || alternate == [Str source]

7
test/command/4677.md Normal file
View file

@ -0,0 +1,7 @@
```
% echo '![Caption](img.png){#img:1}' | pandoc --to "markdown-bracketed_spans-fenced_divs-link_attributes-simple_tables-multiline_tables-grid_tables-pipe_tables-fenced_code_attributes-markdown_in_html_blocks-table_captions-smart"
^D
<figure>
<img src="img.png" alt="Caption" id="img:1" /><figcaption>Caption</figcaption>
</figure>
```