git.iko.soy/typeable/pandoc
on master help sign in
FB2 writer: don't render RawBlock as code.
commitaee10a719b7a9565b879872cdb93319b7f3321c7 authorJohn MacFarlane <jgm@berkeley.edu> dateFri 17 Feb 2017, 21:41 (10 years ago) parent1e43e37
1 file changed+7−4
src/Text/Pandoc/Writers/FB2.hs+7−4
src/Text/Pandoc/Writers/FB2.hs+7−4
@@ -312,8 +312,9 @@ blockToXml (Para [Image atr alt (src,'f':'i':'g':':':tit)]) =
312312blockToXml (Para ss) = liftM (list . el "p") $ cMapM toXml ss
313313blockToXml (CodeBlock _ s) = return . spaceBeforeAfter .
314314 map (el "p" . el "code") . lines $ s
315−blockToXml (RawBlock _ s) = return . spaceBeforeAfter .
316− map (el "p" . el "code") . lines $ s
315+blockToXml b@(RawBlock _ _) = do
316+ report $ BlockNotRendered b
317+ return []
317318blockToXml (Div _ bs) = cMapM blockToXml bs
318319blockToXml (BlockQuote bs) = liftM (list . el "cite") $ cMapM blockToXml bs
319320blockToXml (LineBlock lns) = blockToXml $ linesToPara lns
@@ -436,7 +437,9 @@ toXml Space = return [txt " "]
436437toXml SoftBreak = return [txt " "]
437438toXml LineBreak = return [el "empty-line" ()]
438439toXml (Math _ formula) = insertMath InlineImage formula
439−toXml (RawInline _ _) = return [] -- raw TeX and raw HTML are suppressed
440+toXml il@(RawInline _ _) = do
441+ report $ InlineNotRendered il
442+ return [] -- raw TeX and raw HTML are suppressed
440443toXml (Link _ text (url,ttl)) = do
441444 fns <- footnotes `liftM` get
442445 let n = 1 + length fns
@@ -567,7 +570,7 @@ plain Space = " "
567570plain SoftBreak = " "
568571plain LineBreak = "\n"
569572plain (Math _ s) = s
570−plain (RawInline _ s) = s
573+plain (RawInline _ _) = ""
571574plain (Link _ text (url,_)) = concat (map plain text ++ [" <", url, ">"])
572575plain (Image _ alt _) = concat (map plain alt)
573576plain (Note _) = "" -- FIXME