Merge pull request #1005 from nougad/consistent_bibliography

Don't add pandoc-citeproc filter if natbib or biblatex is used
2014-01-02 21:15:41 -08:00 · 2014-01-02 21:15:41 -08:00 · 36cda45d70
commit 36cda45d70
parent e7e76dbdd8 e24963ade6
1 changed files with 3 additions and 1 deletions
--- 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'