diff options
author | John MacFarlane <jgm@berkeley.edu> | 2018-05-09 10:37:04 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2018-05-09 10:37:04 -0700 |
commit | d3be567a73478298485f66b2d2af5ca066eae052 (patch) | |
tree | 1fca360cc57c07b5e54c97bf8223fee4918b24e4 /src/Text/Pandoc/Writers | |
parent | 81881ce4708f06ca53088d95ff249b48f2b2e88d (diff) | |
download | pandoc-d3be567a73478298485f66b2d2af5ca066eae052.tar.gz |
Fix regression with tex math environments in HTML + MathJax.
Closes #4639.
Diffstat (limited to 'src/Text/Pandoc/Writers')
-rw-r--r-- | src/Text/Pandoc/Writers/HTML.hs | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index 646168c72..535071ae2 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -665,16 +665,11 @@ blockToHtml opts (Para [Image attr@(_,classes,_) txt (src,tit)]) -- title beginning with fig: indicates that the image is a figure blockToHtml opts (Para [Image attr txt (s,'f':'i':'g':':':tit)]) = figure opts attr txt (s,tit) -blockToHtml opts (Para lst) - | isEmptyRaw lst = return mempty - | null lst && not (isEnabled Ext_empty_paragraphs opts) = return mempty - | otherwise = do - contents <- inlineListToHtml opts lst - return $ H.p contents - where - isEmptyRaw [RawInline f _] = f `notElem` [Format "html", - Format "html4", Format "html5"] - isEmptyRaw _ = False +blockToHtml opts (Para lst) = do + contents <- inlineListToHtml opts lst + case contents of + Empty _ | not (isEnabled Ext_empty_paragraphs opts) -> return mempty + _ -> return $ H.p contents blockToHtml opts (LineBlock lns) = if writerWrapText opts == WrapNone then blockToHtml opts $ linesToPara lns @@ -1063,7 +1058,6 @@ inlineToHtml opts inline = do if ishtml then return $ preEscapedString str else if (f == Format "latex" || f == Format "tex") && - "\\begin" `isPrefixOf` str && allowsMathEnvironments (writerHTMLMathMethod opts) && isMathEnvironment str then inlineToHtml opts $ Math DisplayMath str |