From 873f342f1144111f79f9415abd3dc00d44a7a3c6 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 9 Mar 2019 14:17:21 -0800 Subject: 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. --- src/Text/Pandoc/Readers/Ipynb.hs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/Text/Pandoc/Readers') diff --git a/src/Text/Pandoc/Readers/Ipynb.hs b/src/Text/Pandoc/Readers/Ipynb.hs index 13550d9a1..156e6bb8d 100644 --- a/src/Text/Pandoc/Readers/Ipynb.hs +++ b/src/Text/Pandoc/Readers/Ipynb.hs @@ -18,6 +18,7 @@ Ipynb (Jupyter notebook JSON format) reader for pandoc. module Text.Pandoc.Readers.Ipynb ( readIpynb ) where import Prelude +import Data.Char (isDigit) import Data.List (isPrefixOf) import Data.Maybe (fromMaybe) import Data.Digest.Pure.SHA (sha1, showDigest) @@ -39,6 +40,7 @@ import qualified Data.ByteString.Lazy as BL import Data.Aeson as Aeson import Control.Monad.Except (throwError) import Text.Pandoc.Readers.Markdown (readMarkdown) +import qualified Text.Pandoc.UTF8 as UTF8 readIpynb :: PandocMonad m => ReaderOptions -> Text -> m Pandoc readIpynb opts t = do @@ -217,10 +219,11 @@ jsonMetaToMeta = M.mapKeys T.unpack . M.map valueToMetaValue valueToMetaValue Aeson.Null = MetaString "" jsonMetaToPairs :: JSONMeta -> [(String, String)] -jsonMetaToPairs = M.toList . M.mapMaybe - (\case - MetaString s -> Just s - MetaBool True -> Just "true" - MetaBool False -> Just "false" - -- for now we skip complex cell metadata: - _ -> Nothing) . jsonMetaToMeta +jsonMetaToPairs = M.toList . M.mapKeys T.unpack . M.map + (\case + String t + | not (T.all isDigit t) + , t /= "true" + , t /= "false" + -> T.unpack t + x -> UTF8.toStringLazy $ Aeson.encode x) -- cgit v1.2.3