diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,11 @@ +pandoc-citeproc (0.16.3.1) + + * Fix how LANG is set for bibtex conversion. + We were using a `-` where `_` is standard. + * Make locale retrieval more robust (#420). + Previously an error was raised if the locale was 'C'. + Now 'C' is treated as default (en-US locale is used). + pandoc-citeproc (0.16.3) * Set `hanging-indent` class on `refs` Div if specified by the style (#410). 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.16.3 +version: 0.16.3.1 cabal-version: 1.12 synopsis: Supports using pandoc with citeproc diff --git a/src/Text/CSL/Data.hs b/src/Text/CSL/Data.hs --- a/src/Text/CSL/Data.hs +++ b/src/Text/CSL/Data.hs @@ -48,33 +48,37 @@ -- | Raises 'CSLLocaleException' on error. getLocale :: String -> IO L.ByteString getLocale s = do + let baseLocale = takeWhile (/='.') s #ifdef EMBED_DATA_FILES let toLazy x = L.fromChunks [x] - case length s of - 0 -> maybe (E.throwIO $ CSLLocaleNotFound "en-US") - (return . toLazy) + let returnDefaultLocale = + maybe (E.throwIO $ CSLLocaleNotFound "en-US") (return . toLazy) $ lookup "locales-en-US.xml" localeFiles - 2 -> let fn = ("locales-" ++ fromMaybe s (lookup s langBase) ++ ".xml") - in case lookup fn localeFiles of - Just x' -> return $ toLazy x' - _ -> E.throwIO $ CSLLocaleNotFound s - _ -> case lookup ("locales-" ++ take 5 s ++ ".xml") localeFiles of + case length baseLocale of + 0 -> returnDefaultLocale + 1 | baseLocale == "C" -> returnDefaultLocale + _ -> case lookup ("locales-" ++ baseLocale ++ ".xml") localeFiles of Just x' -> return $ toLazy x' - _ -> -- try again with 2-letter locale - let s' = take 2 s in - case lookup ("locales-" ++ fromMaybe s' - (lookup s' langBase) ++ ".xml") localeFiles of - Just x'' -> return $ toLazy x'' - _ -> E.throwIO $ CSLLocaleNotFound s + Nothing -> + -- try again with 2-letter locale (lang only) + let shortLocale = takeWhile (/='-') baseLocale in + case lookup ("locales-" ++ fromMaybe shortLocale + (lookup shortLocale langBase) ++ ".xml") + localeFiles of + Just x'' -> return $ toLazy x'' + _ -> E.throwIO $ CSLLocaleNotFound s #else - f <- case length s of - 0 -> return "locales/locales-en-US.xml" - 2 -> getDataFileName ("locales/locales-" ++ - fromMaybe s (lookup s langBase) ++ ".xml") - _ -> getDataFileName ("locales/locales-" ++ take 5 s ++ ".xml") + f <- getDataFileName $ + case length baseLocale of + 0 -> "locales/locales-en-US.xml" + 1 | baseLocale == "C" -> "locales/locales-en-US.xml" + 2 -> "locales/locales-" ++ + fromMaybe s (lookup s langBase) ++ ".xml" + _ -> "locales/locales-" ++ take 5 s ++ ".xml" exists <- doesFileExist f - if not exists && length s > 2 - then getLocale $ take 2 s -- try again with base locale + if not exists && length baseLocale > 2 + then getLocale $ dropWhile (/='-') baseLocale + -- try again with lang only else E.handle (E.throwIO . CSLLocaleReadError) $ L.readFile f #endif diff --git a/src/Text/CSL/Input/Bibtex.hs b/src/Text/CSL/Input/Bibtex.hs --- a/src/Text/CSL/Input/Bibtex.hs +++ b/src/Text/CSL/Input/Bibtex.hs @@ -100,7 +100,8 @@ getLangFromEnv = do env <- getEnvironment return $ case lookup "LANG" env of - Just x -> case splitWhen (\c -> c == '.' || c == '_' || c == '-') x of + Just x -> case splitWhen (\c -> c == '_' || c == '-') + (takeWhile (/='.') x) of (w:z:_) -> Lang w z [w] | not (null w) -> Lang w mempty _ -> Lang "en" "US" @@ -368,7 +369,7 @@ -- | Prints a 'Lang' in BCP 47 format. langToLocale :: Lang -> String -langToLocale (Lang x y) = x ++ ('-':y) +langToLocale (Lang x y) = x ++ (if null y then [] else '-':y) -- Biblatex Localization Keys (see Biblatex manual) -- Currently we only map a subset likely to be used in Biblatex *databases* diff --git a/src/Text/CSL/Pandoc.hs b/src/Text/CSL/Pandoc.hs --- a/src/Text/CSL/Pandoc.hs +++ b/src/Text/CSL/Pandoc.hs @@ -222,8 +222,8 @@ if null envlang then do -- Note that LANG needs to be set for bibtex conversion: - setEnv "LANG" "en-US.UTF-8" - setEnv "LC_ALL" "en-US.UTF-8" + setEnv "LANG" "en_US.UTF-8" + setEnv "LC_ALL" "en_US.UTF-8" else setEnv "LC_ALL" envlang let citids = query getCitationIds (Pandoc meta blocks) diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -12,10 +12,15 @@ - pandoc-types-1.17.6.1 - HsYAML-0.2.0.0 - HsYAML-aeson-0.2.0.0 -- doctemplates-0.6.1 -- doclayout-0.1 +- texmath-0.11.3 +- haddock-library-1.8.0 +- skylighting-0.8.2.3 +- skylighting-core-0.8.2.3 +- regex-pcre-builtin-0.95.0.8.8.35 +- doctemplates-0.7 +- doclayout-0.2.0.1 - git: https://github.com/jgm/pandoc.git - commit: b64410ff9ce64d6a2c7e09b43694b6f4245f9129 + commit: 8f3b3afc70d163afe5e103abec77a4ffafb995bd ghc-options: "$locals": -fhide-source-paths diff --git a/tests/jats.csl b/tests/jats.csl new file mode 100644 --- /dev/null +++ b/tests/jats.csl @@ -0,0 +1,208 @@ + + +