diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,12 @@ +pandoc-citeproc (0.14.5) + + * Add flag to silence all warnings (#350, Albert Krewinkel). + Introduce new command line flag `--quiet`/`-q` which can be used to + suppress all warnings. + * Use HTTPS for PMID and PMCID hyperlinks (#349, Daniel Himmelstein.) + * Fix pattern match in do block that could fail, so pandoc-citeproc + compiles with ghc 8.6. + pandoc-citeproc (0.14.4) * Allow latest aeson (Adam Bergmark, #336). diff --git a/pandoc-citeproc.cabal b/pandoc-citeproc.cabal --- a/pandoc-citeproc.cabal +++ b/pandoc-citeproc.cabal @@ -1,5 +1,5 @@ name: pandoc-citeproc -version: 0.14.4 +version: 0.14.5 cabal-version: 1.12 synopsis: Supports using pandoc with citeproc diff --git a/pandoc-citeproc.hs b/pandoc-citeproc.hs --- a/pandoc-citeproc.hs +++ b/pandoc-citeproc.hs @@ -77,7 +77,7 @@ [] -> UTF8.getContents xs -> mconcat <$> mapM UTF8.readFile xs readBiblioString (const True) bibformat bibstring >>= - warnDuplicateKeys >>= + (if Quiet `elem` flags then return else warnDuplicateKeys) >>= if Bib2YAML `elem` flags then outputYamlBlock . B8.intercalate (B.singleton 10) . @@ -86,7 +86,7 @@ encodePretty' defConfig{ confIndent = Spaces 2 , confCompare = compare , confNumFormat = Generic } - else toJSONFilter doCites + else toJSONFilter (doCites (Quiet `elem` flags)) formatFromExtension :: FilePath -> Maybe BibFormat formatFromExtension = readFormat . dropWhile (=='.') . takeExtension @@ -114,11 +114,11 @@ go _ = Nothing -doCites :: Pandoc -> IO Pandoc -doCites doc = do +doCites :: Bool -> Pandoc -> IO Pandoc +doCites beQuiet doc = do doc' <- processCites' doc let warnings = query findWarnings doc' - mapM_ (UTF8.hPutStrLn stderr) warnings + unless beQuiet $ mapM_ (UTF8.hPutStrLn stderr) warnings return doc' findWarnings :: Inline -> [String] @@ -137,6 +137,7 @@ | Format String | Bib2YAML | Bib2JSON + | Quiet deriving (Ord, Eq, Show) options :: [OptDescr Option] @@ -147,6 +148,7 @@ , Option ['V'] ["version"] (NoArg Version) "show program version" , Option ['y'] ["bib2yaml"] (NoArg Bib2YAML) "convert bibliography to YAML" , Option ['j'] ["bib2json"] (NoArg Bib2JSON) "convert bibliography to JSON" + , Option ['q'] ["quiet"] (NoArg Quiet) "silence all warnings" , Option ['f'] ["format"] (ReqArg Format "FORMAT") "bibliography format" ] diff --git a/src/Text/CSL/Eval.hs b/src/Text/CSL/Eval.hs --- a/src/Text/CSL/Eval.hs +++ b/src/Text/CSL/Eval.hs @@ -241,11 +241,11 @@ "pmid" -> getStringVar "pmid" >>= \d -> if null d then return [] - else return [Output [OPan [Link nullAttr [Str d] ("http://www.ncbi.nlm.nih.gov/pubmed/" ++ d, "")]] fm] + else return [Output [OPan [Link nullAttr [Str d] ("https://www.ncbi.nlm.nih.gov/pubmed/" ++ d, "")]] fm] "pmcid" -> getStringVar "pmcid" >>= \d -> if null d then return [] - else return [Output [OPan [Link nullAttr [Str d] ("http://www.ncbi.nlm.nih.gov/pmc/articles/" ++ d, "")]] fm] + else return [Output [OPan [Link nullAttr [Str d] ("https://www.ncbi.nlm.nih.gov/pmc/articles/" ++ d, "")]] fm] _ -> do (opts, as) <- gets (env >>> options &&& abbrevs) r <- getVar [] (getFormattedValue opts as f fm s) s diff --git a/src/Text/CSL/Eval/Date.hs b/src/Text/CSL/Eval/Date.hs --- a/src/Text/CSL/Eval/Date.hs +++ b/src/Text/CSL/Eval/Date.hs @@ -54,22 +54,24 @@ case f of NoFormDate -> outputList fm dl . concatMap (formatDate em k tm dp) <$> mapM getDateVar s - _ -> do Date _ _ lfm ldl ldp _ <- getDate f - let go dps = return . outputList (updateFM fm lfm) (if ldl /= [] then ldl else dl) . - concatMap (formatDate em k tm dps) - update l x@(DatePart a b c d) = - case filter ((==) a . dpName) l of - (DatePart _ b' c' d':_) -> DatePart a (updateS b b') - (updateS c c') - (updateFM d d') - _ -> x - updateDP = map (update dp) ldp - date = mapM getDateVar s - case dp' of - "year-month" -> go (filter ((/=) "day" . dpName) updateDP) =<< date - "year" -> go (filter ((==) "year" . dpName) updateDP) =<< date - _ -> go updateDP =<< date - + _ -> do res <- getDate f + case res of + Date _ _ lfm ldl ldp _ -> do + let go dps = return . outputList (updateFM fm lfm) (if ldl /= [] then ldl else dl) . + concatMap (formatDate em k tm dps) + update l x@(DatePart a b c d) = + case filter ((==) a . dpName) l of + (DatePart _ b' c' d':_) -> DatePart a (updateS b b') + (updateS c c') + (updateFM d d') + _ -> x + updateDP = map (update dp) ldp + date = mapM getDateVar s + case dp' of + "year-month" -> go (filter ((/=) "day" . dpName) updateDP) =<< date + "year" -> go (filter ((==) "year" . dpName) updateDP) =<< date + _ -> go updateDP =<< date + _ -> return [] evalDate _ = return [] getDate :: DateForm -> State EvalState Element diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -15,8 +15,10 @@ - rfc5051-0.1.0.3 - hs-bibutils-6.5.0.0 - yaml-0.9.0 +- hslua-1.0.0 +- hslua-module-text-0.2.0 - github: jgm/pandoc - commit: 889254e1d5c7b683b93f623207347a773e25776b + commit: c292a0bae3167570511543d3d96a0385b9b5f2d8 ghc-options: "$locals": -fhide-source-paths resolver: lts-12.0 diff --git a/tests/jats.csl b/tests/jats.csl deleted file mode 100644 --- a/tests/jats.csl +++ /dev/null @@ -1,208 +0,0 @@ - - -