From 80c3c93273fee0eceee2ebd996c79e2151aee4d1 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Fri, 31 Mar 2017 15:15:49 +0200
Subject: JATS writer:  don't include jats.csl in metadata if csl already
 specified.

---
 src/Text/Pandoc/App.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/Text/Pandoc')

diff --git a/src/Text/Pandoc/App.hs b/src/Text/Pandoc/App.hs
index 5391f0fa6..d484a77e6 100644
--- a/src/Text/Pandoc/App.hs
+++ b/src/Text/Pandoc/App.hs
@@ -404,7 +404,9 @@ convertWithOpts opts = do
                                  withMediaBag . r readerOpts) sources
                 return (mconcat (map fst pairs), mconcat (map snd pairs))
 
-  metadata <- if format == "jats"
+  metadata <- if format == "jats" &&
+                 lookup "csl" (optMetadata opts) == Nothing &&
+                 lookup "citation-style" (optMetadata opts) == Nothing
                  then do
                    jatsCSL <- readDataFile datadir "jats.csl"
                    let jatsEncoded = makeDataURI ("application/xml", jatsCSL)
-- 
cgit v1.2.3