7167330 · typeable/pandoc

git.iko.soy/typeable/pandoc

Revert "Prepend `jupyter_` to jupyter metadata keys."

This reverts commit 5eaff399d5d6dc30b0d453eff42c4101674d75ab.

commit7167330a2a858fcfed313443a021aee90b13b8cc authorJohn MacFarlane <jgm@berkeley.edu> dateThu 24 Jan 2019, 16:33 (8 years ago) parentb08c862

2 files changed−12

unifiedsplit

src/Text/Pandoc/Readers/Ipynb.hs−6

@@ -72,14 +72,8 @@ notebookToPandoc :: (PandocMonad m, FromJSON (Notebook a))

7272notebookToPandoc opts notebook = do

7373 let cells = notebookCells notebook

7474 let (fmt,fmtminor) = notebookFormat notebook

75− let jupyterMetaFields :: [String]

76− jupyterMetaFields = ["kernelspec", "language_info", "toc"]

7775 let m = M.insert "nbformat" (MetaString $ show fmt) $

7876 M.insert "nbformat_minor" (MetaString $ show fmtminor) $

79− -- mark jupyter fields specially so it doesn't trigger toc

80− M.mapKeys (\k -> if k `elem` jupyterMetaFields

81− then "jupyter_" <> k

82− else k) $

8377 jsonMetaToMeta (notebookMetadata notebook)

8478 let lang = case M.lookup "kernelspec" m of

8579 Just (MetaMap ks) ->

src/Text/Pandoc/Writers/Ipynb.hs−6

@@ -38,7 +38,6 @@ import Prelude

3838import Control.Monad.State

3939import qualified Data.Map as M

4040import Data.Maybe (catMaybes, fromMaybe)

41−import Data.List (isPrefixOf)

4241import Text.Pandoc.Options

4342import Text.Pandoc.Definition

4443import Data.Ipynb as Ipynb

@@ -79,11 +78,6 @@ pandocToNotebook opts (Pandoc meta blocks) = do

7978 let inlineWriter ils = T.stripEnd <$> writeMarkdown

8079 opts{ writerTemplate = Nothing } (Pandoc nullMeta [Plain ils])

8180 metadata' <- metaToJSON' blockWriter inlineWriter $

82− (Meta .

83− M.mapKeys (\k -> if "jupyter_" `isPrefixOf` k

84− then drop 8 k

85− else k) .

86− unMeta) $

8781 B.deleteMeta "nbformat" $

8882 B.deleteMeta "nbformat_minor" $ meta

8983 let metadata = case fromJSON metadata' of