@@ -101,7 +101,7 @@ cellToBlocks opts lang c = do
101 return $ B.divWith ("",["cell","raw"],kvs) $ B.rawBlock format'
101 return $ B.divWith ("",["cell","raw"],kvs) $ B.rawBlock format'
102 $ T.unpack source
102 $ T.unpack source
103 Ipynb.Code{ codeOutputs = outputs, codeExecutionCount = ec } -> do
103 Ipynb.Code{ codeOutputs = outputs, codeExecutionCount = ec } -> do
104− outputBlocks <- mconcat <$> mapM (outputToBlock opts) outputs
104+ outputBlocks <- mconcat <$> mapM outputToBlock outputs
105 let kvs' = maybe kvs (\x -> ("execution_count", show x):kvs) ec
105 let kvs' = maybe kvs (\x -> ("execution_count", show x):kvs) ec
106 return $ B.divWith ("",["cell","code"],kvs') $
106 return $ B.divWith ("",["cell","code"],kvs') $
107 B.codeBlockWith ("",[lang],[]) (T.unpack source)
107 B.codeBlockWith ("",[lang],[]) (T.unpack source)
@@ -126,23 +126,23 @@ addAttachment (fname, mimeBundle) = do
126 insertMedia fp (Just $ T.unpack mimeType) (encode v)
126 insertMedia fp (Just $ T.unpack mimeType) (encode v)
127 [] -> report $ CouldNotFetchResource fp "no attachment"
127 [] -> report $ CouldNotFetchResource fp "no attachment"
129−outputToBlock :: PandocMonad m => ReaderOptions -> Output a -> m B.Blocks
129+outputToBlock :: PandocMonad m => Output a -> m B.Blocks
130−outputToBlock _ Stream{ streamName = sName,
130+outputToBlock Stream{ streamName = sName,
131− streamText = Source text } = do
131+ streamText = Source text } = do
132 return $ B.divWith ("",["output","stream",T.unpack sName],[])
132 return $ B.divWith ("",["output","stream",T.unpack sName],[])
133 $ B.codeBlock $ T.unpack . mconcat $ text
133 $ B.codeBlock $ T.unpack . mconcat $ text
134−outputToBlock opts DisplayData{ displayData = data',
134+outputToBlock DisplayData{ displayData = data',
135− displayMetadata = metadata' } =
135+ displayMetadata = metadata' } =
136 B.divWith ("",["output", "display_data"],[]) <$>
136 B.divWith ("",["output", "display_data"],[]) <$>
137− handleData opts metadata' data'
137+ handleData metadata' data'
138−outputToBlock opts ExecuteResult{ executeCount = ec,
138+outputToBlock ExecuteResult{ executeCount = ec,
139− executeData = data',
139+ executeData = data',
140− executeMetadata = metadata' } =
140+ executeMetadata = metadata' } =
141 B.divWith ("",["output", "execute_result"],[("execution_count",show ec)])
141 B.divWith ("",["output", "execute_result"],[("execution_count",show ec)])
142− <$> handleData opts metadata' data'
142+ <$> handleData metadata' data'
143−outputToBlock _ Err{ errName = ename,
143+outputToBlock Err{ errName = ename,
144− errValue = evalue,
144+ errValue = evalue,
145− errTraceback = traceback } = do
145+ errTraceback = traceback } = do
146 return $ B.divWith ("",["output","error"],
146 return $ B.divWith ("",["output","error"],
147 [("ename",T.unpack ename),
147 [("ename",T.unpack ename),
148 ("evalue",T.unpack evalue)])
148 ("evalue",T.unpack evalue)])
@@ -151,14 +151,12 @@ outputToBlock _ Err{ errName = ename,
151-- We want to display the richest output possible given
151-- We want to display the richest output possible given
152-- the output format.
152-- the output format.
153handleData :: PandocMonad m
153handleData :: PandocMonad m
154− => ReaderOptions -> JSONMeta -> MimeBundle -> m B.Blocks
154+ => JSONMeta -> MimeBundle -> m B.Blocks
155−handleData opts metadata (MimeBundle mb) =
155+handleData metadata (MimeBundle mb) =
156 mconcat <$> mapM dataBlock (M.toList mb)
156 mconcat <$> mapM dataBlock (M.toList mb)
160− exts = readerExtensions opts
162 dataBlock :: PandocMonad m => (MimeType, MimeData) -> m B.Blocks
160 dataBlock :: PandocMonad m => (MimeType, MimeData) -> m B.Blocks
163 dataBlock (mt, BinaryData bs)
161 dataBlock (mt, BinaryData bs)
164 | "image/" `T.isPrefixOf` mt
162 | "image/" `T.isPrefixOf` mt