summaryrefslogtreecommitdiff
path: root/pandoc.hs
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-01-02 21:15:41 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2014-01-02 21:15:41 -0800
commit36cda45d700332d8748a090ff97fbd53e781c8fe (patch)
treeaa1ffab10d625f910735a52c2590c44d213f20a2 /pandoc.hs
parente7e76dbdd8b07b1fd80bda1599d58b7fbc7cf4bd (diff)
parente24963ade66515c9c70c3fbf3293d112078b72e7 (diff)
Merge pull request #1005 from nougad/consistent_bibliography
Don't add pandoc-citeproc filter if natbib or biblatex is used
Diffstat (limited to 'pandoc.hs')
-rw-r--r--pandoc.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/pandoc.hs b/pandoc.hs
index 574c89771..2c81db9f2 100644
--- a/pandoc.hs
+++ b/pandoc.hs
@@ -958,7 +958,9 @@ main = do
-- --bibliography implies -F pandoc-citeproc for backwards compatibility:
let filters' = case M.lookup "bibliography" metadata of
- Just _ | all (\f -> takeBaseName f /= "pandoc-citeproc")
+ Just _ | optCiteMethod opts /= Natbib &&
+ optCiteMethod opts /= Biblatex &&
+ all (\f -> takeBaseName f /= "pandoc-citeproc")
filters -> "pandoc-citeproc" : filters
_ -> filters
let plugins = map externalFilter filters'