d0bfcbb · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

EPUB writer: use stringify instead of plain writer for metadata.

d0bfcbbJohn MacFarlane10 years ago

src/Text/Pandoc/Writers/EPUB.hs+4−6

@@ -57,8 +57,6 @@ import Text.Pandoc.Options ( WriterOptions(..)

57 , ObfuscationMethod(NoObfuscation) )

58import Text.Pandoc.Definition

59import Text.Pandoc.Walk (walk, walkM, query)

60−import Data.Default

61−import Text.Pandoc.Writers.Markdown (writePlain)

62import Control.Monad.State (modify, get, State, put, evalState)

60import Control.Monad.State (modify, get, State, put, evalState)

63import Control.Monad (mplus, liftM, when)

61import Control.Monad (mplus, liftM, when)

64import Text.XML.Light ( unode, Element(..), unqual, Attr(..), add_attrs

62import Text.XML.Light ( unode, Element(..), unqual, Attr(..), add_attrs

@@ -228,10 +226,10 @@ addMetadataFromXML _ md = md

228

226

229metaValueToString :: MetaValue -> String

227metaValueToString :: MetaValue -> String

230metaValueToString (MetaString s) = s

228metaValueToString (MetaString s) = s

231−metaValueToString (MetaInlines ils) = writePlain def

229+metaValueToString (MetaInlines ils) = stringify ils

232− (Pandoc nullMeta [Plain ils])

233−metaValueToString (MetaBlocks bs) = writePlain def (Pandoc nullMeta bs)

230+metaValueToString (MetaBlocks bs) = stringify bs

231+metaValueToString (MetaBool True) = "true"

234−metaValueToString (MetaBool b) = show b

232+metaValueToString (MetaBool False) = "false"

235metaValueToString _ = ""

233metaValueToString _ = ""

236

234

237getList :: String -> Meta -> (MetaValue -> a) -> [a]

235getList :: String -> Meta -> (MetaValue -> a) -> [a]