Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ipynb writer: handle metadata better.

Browse source 
Previously we used the markdown writer to render metadata.
This had some undesirable consequences (e.g. en dash expanded
to `--` when `smart` enabled), so now we use the plain writer.

This addresses #7928, but I think a more elegant fix is possible.
This commit is contained in:
John MacFarlane 2022-02-18 17:46:36 -08:00
parent 2a70d9c3c5
commit fb465070eb
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Text/Pandoc/Writers/Ipynb.hs
View file

@ -31,7 +31,7 @@ import Data.Aeson as Aeson
import qualified Text.Pandoc.UTF8 as UTF8 import qualified Text.Pandoc.UTF8 as UTF8
import Text.Pandoc.Shared (safeRead, isURI) import Text.Pandoc.Shared (safeRead, isURI)
import Text.Pandoc.Writers.Shared (metaToContext') import Text.Pandoc.Writers.Shared (metaToContext')
import Text.Pandoc.Writers.Markdown (writeMarkdown) import Text.Pandoc.Writers.Markdown (writePlain, writeMarkdown)
import qualified Data.Text.Encoding as TE import qualified Data.Text.Encoding as TE
import qualified Data.ByteString.Lazy as BL import qualified Data.ByteString.Lazy as BL
import Data.Aeson.Encode.Pretty (Config(..), defConfig, import Data.Aeson.Encode.Pretty (Config(..), defConfig,
@ -57,10 +57,11 @@ writeIpynb opts d = do
pandocToNotebook :: PandocMonad m pandocToNotebook :: PandocMonad m
=> WriterOptions -> Pandoc -> m (Notebook NbV4) => WriterOptions -> Pandoc -> m (Notebook NbV4)
pandocToNotebook opts (Pandoc meta blocks) = do pandocToNotebook opts (Pandoc meta blocks) = do
let blockWriter bs = literal <$> writeMarkdown -- we use writePlain w/ default options because e.g. we don't want
opts{ writerTemplate = Nothing } (Pandoc nullMeta bs) -- to add backslash escapes or convert en dashes, see #7928
let inlineWriter ils = literal . T.stripEnd <$> writeMarkdown let blockWriter bs = literal <$> writePlain def (Pandoc nullMeta bs)
opts{ writerTemplate = Nothing } (Pandoc nullMeta [Plain ils]) let inlineWriter ils = literal . T.stripEnd <$>
writePlain def (Pandoc nullMeta [Plain ils])
let jupyterMeta = let jupyterMeta =
case lookupMeta "jupyter" meta of case lookupMeta "jupyter" meta of
Just (MetaMap m) -> Meta m Just (MetaMap m) -> Meta m