git.iko.soy/typeable/pandoc
on master help sign in
Only make implicit `-F pandoc-citeproc` when `--bibliography` option used.

Not when `bibliography` field in metadata is specified. Closes #1849.

commita131441da471fa80523c957cd8193af37de6769c authorJohn MacFarlane <jgm@berkeley.edu> dateMon 11 May 2015, 21:31 (11 years ago) parentc6debff
1 file changed+2−2
compare with master
unifiedsplit
pandoc.hs+2−2
pandoc.hs+2−2
@@ -58,7 +58,7 @@ import qualified Control.Exception as E
5858import Control.Exception.Extensible ( throwIO )
5959import qualified Text.Pandoc.UTF8 as UTF8
6060import Control.Monad (when, unless, (>=>))
61−import Data.Maybe (isJust, fromMaybe)
61+import Data.Maybe (fromMaybe)
6262import Data.Foldable (foldrM)
6363import Network.URI (parseURI, isURI, URI(..))
6464import qualified Data.ByteString.Lazy as B
@@ -1117,7 +1117,7 @@ main = do
11171117
11181118
11191119 -- --bibliography implies -F pandoc-citeproc for backwards compatibility:
1120− let needsCiteproc = isJust (M.lookup "bibliography" metadata) &&
1120+ let needsCiteproc = any ("--bibliography" `isPrefixOf`) rawArgs &&
11211121 optCiteMethod opts `notElem` [Natbib, Biblatex] &&
11221122 "pandoc-citeproc" `notElem` map takeBaseName filters
11231123 let filters' = if needsCiteproc then "pandoc-citeproc" : filters