From a26d25a80b1c7f2a375c7715e0a903f3f10f7b3d Mon Sep 17 00:00:00 2001
From: Florian Eitel <florian.eitel@wooga.net>
Date: Mon, 30 Sep 2013 15:55:59 +0200
Subject: [PATCH 1/2] Don't add pandoc-citeproc filter if natbib or biblatex is
used
See https://github.com/jgm/pandoc-templates/issues/42
---
pandoc.hs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pandoc.hs b/pandoc.hs
index f3c2af38f..e546f988e 100644
--- a/pandoc.hs
+++ b/pandoc.hs
@@ -960,7 +960,10 @@ 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 &&
+ isNothing (M.lookup "biblatex" metadata) &&
+ all (\f -> takeBaseName f /= "pandoc-citeproc")
filters -> "pandoc-citeproc" : filters
_ -> filters
let plugins = map externalFilter filters'
From e24963ade66515c9c70c3fbf3293d112078b72e7 Mon Sep 17 00:00:00 2001
From: Florian Eitel <florian.eitel@wooga.net>
Date: Mon, 30 Sep 2013 16:56:31 +0200
Subject: [PATCH 2/2] Fixed stupid copy&paste error
How could this happend? sry
---
pandoc.hs | 1 -
1 file changed, 1 deletion(-)
diff --git a/pandoc.hs b/pandoc.hs
index e546f988e..c7aa13119 100644
--- a/pandoc.hs
+++ b/pandoc.hs
@@ -962,7 +962,6 @@ main = do
let filters' = case M.lookup "bibliography" metadata of
Just _ | optCiteMethod opts /= Natbib &&
optCiteMethod opts /= Biblatex &&
- isNothing (M.lookup "biblatex" metadata) &&
all (\f -> takeBaseName f /= "pandoc-citeproc")
filters -> "pandoc-citeproc" : filters
_ -> filters