4dac62e · typeable/pandoc

git.iko.soy/typeable/pandoc

Use yamlToMeta for yaml bibliography

This speeds up parsing of external yaml bibliographies considerably (in one test 36s -> 17s).

commit4dac62ef3a0377f2c748b348d3c7fa11a1d689f6 authorJohn MacFarlane <jgm@berkeley.edu> dateMon 5 Oct 2020, 16:58 (6 years ago) parent128991d

1 file changed+4−5

unifiedsplit

src/Text/Pandoc/Citeproc.hs+4−5

@@ -18,12 +18,13 @@ import Text.Pandoc.Citeproc.Locator (parseLocator)

1818import Text.Pandoc.Citeproc.CslJson (cslJsonToReferences)

1919import Text.Pandoc.Citeproc.BibTeX (readBibtexString, Variant(..))

2020import Text.Pandoc.Citeproc.MetaValue (metaValueToReference, metaValueToText)

21+import Text.Pandoc.Readers.Markdown (yamlToMeta)

2122import Data.ByteString (ByteString)

2223import qualified Data.ByteString.Lazy as L

2324import Text.Pandoc.Definition as Pandoc

2425import Text.Pandoc.Walk

2526import Text.Pandoc.Builder as B

26−import Text.Pandoc (PandocMonad(..), PandocError(..), readMarkdown,

27+import Text.Pandoc (PandocMonad(..), PandocError(..),

2728 readDataFile, ReaderOptions(..), pandocExtensions,

2829 report, LogMessage(..), fetchItem)

2930import Text.Pandoc.Shared (stringify, ordNub, blocksToInlines)

@@ -203,10 +204,8 @@ getRefs locale format idpred raw =

203204 (return . filter (idpred . unItemId . referenceId)) .

204205 cslJsonToReferences $ raw

205206 Format_yaml -> do

206− Pandoc meta _ <-

207− readMarkdown

208− def{ readerExtensions = pandocExtensions }

209− (UTF8.toText raw)

207+ meta <- yamlToMeta def{ readerExtensions = pandocExtensions }

208+ (L.fromStrict raw)

210209 case lookupMeta "references" meta of

211210 Just (MetaList rs) ->

212211 return $ mapMaybe (metaValueToReference idpred) rs