16d6005 · typeable/pandoc

git.iko.soy/typeable/pandoc

Fixed merge bugs in Shared.

commit16d6005ed90ea1902b6caacf54676876037fda3b authorJohn MacFarlane <jgm@berkeley.edu> dateTue 25 Jun 2013, 18:15 (13 years ago) parentf34232c

1 file changed+10−10

compare with master

unifiedsplit

src/Text/Pandoc/Shared.hs+10−10

src/Text/Pandoc/Shared.hs+10−10

@@ -97,7 +97,7 @@ import Text.Pandoc.MIME (getMimeType)

9797import System.FilePath ( (</>), takeExtension, dropExtension )

9898import Data.Generics (Typeable, Data)

9999import qualified Control.Monad.State as S

100−import Control.Monad (msum, unless)

100+import Control.Monad (msum, unless, liftM)

101101import Text.Pandoc.Pretty (charWidth)

102102import System.Locale (defaultTimeLocale)

103103import Data.Time

@@ -527,24 +527,24 @@ makeMeta title authors date =

527527-- Variables overwrite metadata fields with the same names.

528528metaToJSON :: Monad m

529529 => ([Block] -> m String) -- ^ Writer for output format

530− => ([Inline] -> m String) -- ^ Writer for output format

530+ -> ([Inline] -> m String) -- ^ Writer for output format

531531 -> Meta -- ^ Metadata

532532 -> m Value

533−metaToJSON blockWriter inlineWriter (Meta metamap) = toJSON

534− `fmap` Traversable.mapM (metaValueToJSON blockWriter inlineWriter) metamap

533+metaToJSON blockWriter inlineWriter (Meta metamap) = liftM toJSON $

534+ Traversable.mapM (metaValueToJSON blockWriter inlineWriter) metamap

535535

536536metaValueToJSON :: Monad m

537537 => ([Block] -> m String)

538538 -> ([Inline] -> m String)

539539 -> MetaValue

540540 -> m Value

541−metaValueToJSON blockWriter inlineWriter (MetaMap metamap) = toJSON

542− `fmap` Traversable.mapM (metaValueToJSON blockWriter inlineWriter) metamap

543−metaValueToJSON blockWriter inlineWriter (MetaList xs) =

544− toJSON `fmap` Traversable.mapM (metaValueToJSON blockWriter inlineWriter) xs

541+metaValueToJSON blockWriter inlineWriter (MetaMap metamap) = liftM toJSON $

542+ Traversable.mapM (metaValueToJSON blockWriter inlineWriter) metamap

543+metaValueToJSON blockWriter inlineWriter (MetaList xs) = liftM toJSON $

544+ Traversable.mapM (metaValueToJSON blockWriter inlineWriter) xs

545545metaValueToJSON _ _ (MetaString s) = return $ toJSON s

546−metaValueToJSON blockWriter _ (MetaBlocks bs) = toJSON `fmap` blockWriter bs

547−metaValueToJSON _ inlineWriter (MetaInlines bs) = toJSON `fmap` inlineWriter bs

546+metaValueToJSON blockWriter _ (MetaBlocks bs) = liftM toJSON $ blockWriter bs

547+metaValueToJSON _ inlineWriter (MetaInlines bs) = liftM toJSON $ inlineWriter bs

548548

549549setField :: ToJSON a

550550 => String