git.iko.soy/typeable/pandoc
on master help sign in
JATS writer: don't include jats.csl in metadata if csl already specified.
80c3c93John MacFarlane
src/Text/Pandoc/App.hs+3−1
compare with master
unifiedsplit
@@ -404,7 +404,9 @@ convertWithOpts opts = do
404 withMediaBag . r readerOpts) sources
404 withMediaBag . r readerOpts) sources
405 return (mconcat (map fst pairs), mconcat (map snd pairs))
405 return (mconcat (map fst pairs), mconcat (map snd pairs))
406
406
407− metadata <- if format == "jats"
407+ metadata <- if format == "jats" &&
408+ lookup "csl" (optMetadata opts) == Nothing &&
409+ lookup "citation-style" (optMetadata opts) == Nothing
408 then do
410 then do
409 jatsCSL <- readDataFile datadir "jats.csl"
411 jatsCSL <- readDataFile datadir "jats.csl"
410 let jatsEncoded = makeDataURI ("application/xml", jatsCSL)
412 let jatsEncoded = makeDataURI ("application/xml", jatsCSL)