Ipynb reader/writer: better handling of cell metadata.

We now handle even complex cell metadata in the Div's attributes.
Simple metadata fields are rendered as a plain string, and complex ones
as JSON.

1 files changed, 6 insertions, 7 deletions

diff --git a/src/Text/Pandoc/Writers/Ipynb.hs b/src/Text/Pandoc/Writers/Ipynb.hs
index 661f585f4..0babf7112 100644
--- a/src/Text/Pandoc/Writers/Ipynb.hs
+++ b/src/Text/Pandoc/Writers/Ipynb.hs
@@ -213,10 +213,9 @@ extractData bs = do
 
 pairsToJSONMeta :: [(String, String)] -> JSONMeta
 pairsToJSONMeta kvs =
-  M.fromList [(T.pack k, case v of
-                           "true"  -> Bool True
-                           "false" -> Bool False
-                           _       -> case safeRead v of
-                                        Just n -> Number n
-                                        _      -> String (T.pack v))
-             | (k,v) <- kvs , k /= "execution_count" ]
+  M.fromList [(T.pack k, case Aeson.decode (UTF8.fromStringLazy v) of
+                           Just val -> val
+                           Nothing  -> String (T.pack v))
+             | (k,v) <- kvs
+             , k /= "execution_count"
+             ]