From 0c2a509dfb3bd9f7ba8a0fdec02a165ed7cf49da Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 10 Jun 2017 23:09:53 +0200
Subject: Writers.Shared: metaToJSON, generalized type so it can take a Text.

Previously a String was needed as argument; now any ToJSON
instance will do.

API change.
---
 src/Text/Pandoc/Writers/Shared.hs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/Text/Pandoc/Writers')

diff --git a/src/Text/Pandoc/Writers/Shared.hs b/src/Text/Pandoc/Writers/Shared.hs
index c33655522..2047285eb 100644
--- a/src/Text/Pandoc/Writers/Shared.hs
+++ b/src/Text/Pandoc/Writers/Shared.hs
@@ -62,10 +62,10 @@ import Text.Pandoc.XML (escapeStringForXML)
 -- Variables overwrite metadata fields with the same names.
 -- If multiple variables are set with the same name, a list is
 -- assigned.  Does nothing if 'writerTemplate' is Nothing.
-metaToJSON :: (Functor m, Monad m)
+metaToJSON :: (Functor m, Monad m, ToJSON a)
            => WriterOptions
-           -> ([Block] -> m String)
-           -> ([Inline] -> m String)
+           -> ([Block] -> m a)
+           -> ([Inline] -> m a)
            -> Meta
            -> m Value
 metaToJSON opts blockWriter inlineWriter meta
@@ -75,9 +75,9 @@ metaToJSON opts blockWriter inlineWriter meta
 
 -- | Like 'metaToJSON', but does not include variables and is
 -- not sensitive to 'writerTemplate'.
-metaToJSON' :: Monad m
-           => ([Block] -> m String)
-           -> ([Inline] -> m String)
+metaToJSON' :: (Monad m, ToJSON a)
+           => ([Block] -> m a)
+           -> ([Inline] -> m a)
            -> Meta
            -> m Value
 metaToJSON' blockWriter inlineWriter (Meta metamap) = do
@@ -98,9 +98,9 @@ addVariablesToJSON opts metadata =
   where combineMetadata (Object o1) (Object o2) = Object $ H.union o1 o2
         combineMetadata x _                     = x
 
-metaValueToJSON :: Monad m
-                => ([Block] -> m String)
-                -> ([Inline] -> m String)
+metaValueToJSON :: (Monad m, ToJSON a)
+                => ([Block] -> m a)
+                -> ([Inline] -> m a)
                 -> MetaValue
                 -> m Value
 metaValueToJSON blockWriter inlineWriter (MetaMap metamap) = liftM toJSON $
-- 
cgit v1.2.3