diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,34 @@ +pandoc-citeproc (0.10) + + * Allow colons in bibtex field names (John MacFarlane, #220). + * Set LANG as well as LC_ALL before translating bibtex (John MacFarlane). + This ensures that bibtex will use the locale specified + in the document, even if the system locale is different. + * Data: Raise CSLLocaleException if locale not found (John MacFarlane). + Minor API change: Export CSLLocaleException. + * Added DeriveDataTypeable pragma to Data (John MacFarlane). + * Bibtex reader: case-insensitive parsing of month names (John MacFarlane). + * Bibtex: Export readBibtexInputString', a pure version of + readBibtexInputString (John MacFarlane). + * Rename readBibtexInput* -> readBibtex* (John MacFarlane, API change). + * unTitleCase now lowercases whole word (#234, John MacFarlane). + So, for example, unprotected TeV becomes tev, instead of teV. + This mimics bibtex's own behavior. + * Added caseTransform parameter on readBibtex* functions (#231, John + MacFarlane). When set to false, the bibtex reader doesn't do the + 'untitlecase' transformation. This is used in Text.CSL.Input.Bibutils, + when using bibtex as an intermediate format for conversion from mods, + ris, or other formats. Otherwise we get the 'untitlecase' transform + when it isn't wanted. + * Allow numbers with decimal points to count as "numeric." (#208, + John MacFarlane) Thus, we should have "Series 2.2", not "Series, 2.2" with + Chicago author-date style. + * Fixed capitalization for words following slash (#236, John MacFarlane). + * Updated locales. + * Fix build failure for --flags=-bibutils mode (Sergei Trofimovich). + Reported-by Thomas Beutin https://bugs.gentoo.org/516640. + * Add missing -DUSE_BIBUTILS to Cabal build (Vaclav Haisman). + pandoc-citeproc (0.9.1.1) * Only changed version number (work around for hackage upload error). diff --git a/locales/locales-ar.xml b/locales/locales-ar.xml --- a/locales/locales-ar.xml +++ b/locales/locales-ar.xml @@ -22,7 +22,7 @@ مجهول مجهول عند - available at + موجود في عن طريق حوالي حو. @@ -199,8 +199,8 @@ - director - directors + مدور + مدورين محرر @@ -257,7 +257,7 @@ illustrated by مقابلة بواسطة مرسل الى - by + بـ ترجمة اعداد وترجمة diff --git a/locales/locales-cs-CZ.xml b/locales/locales-cs-CZ.xml --- a/locales/locales-cs-CZ.xml +++ b/locales/locales-cs-CZ.xml @@ -54,7 +54,7 @@ ref. ref. - dostupné + získáno měřítko verze diff --git a/locales/locales-da-DK.xml b/locales/locales-da-DK.xml --- a/locales/locales-da-DK.xml +++ b/locales/locales-da-DK.xml @@ -16,7 +16,7 @@ - åbnet + set og med flere anonym @@ -26,23 +26,23 @@ af cirka ca. - citeret + henvist udgave udgaver udg. - et al. + m.fl. kommende fra ibid. i - i tryk + i trykken internet interview brev - ingen dato - udateret + uden år + u.å. online præsenteret ved @@ -54,16 +54,16 @@ refr. hentet - scale + skala version - e.Kr - f.Kr + e.v.t. + f.v.t. - « - » + “ + ” ‘ ’ – @@ -102,7 +102,7 @@ folio - folier + folio nummer @@ -118,7 +118,7 @@ opus - opuser + opus side @@ -137,12 +137,12 @@ dele - sektion - sektionerne + paragraf + paragraffer - sub verbo - sub verbis + sub voce + sub voce vers @@ -173,10 +173,10 @@ afs. d. - sekt. + par. s.v. - s.vv. + s.v. v. @@ -199,8 +199,8 @@ - director - directors + instruktør + instruktører redaktør @@ -225,8 +225,8 @@ - dir. - dirs. + instr. + instr. red. @@ -251,18 +251,18 @@ af - directed by + instrueret af redigeret af redigeret af illustreret af interviewet af modtaget af - by + af oversat af redigeret & oversat af - dir. + instr. red. red. illus. @@ -270,32 +270,32 @@ red. & overs. af - Januar - Februar - Marts - April - Maj - Juni - Juli - August - September - Oktober - November - December + januar + februar + marts + april + maj + juni + juli + august + september + oktober + november + december - Jan. - Feb. - Mar. - Apr. - Maj - Jun. - Jul. - Aug. - Sep. - Okt. - Nov. - Dec. + jan. + feb. + mar. + apr. + maj + jun. + jul. + aug. + sep. + okt. + nov. + dec. Forår diff --git a/locales/locales-fa-IR.xml b/locales/locales-fa-IR.xml --- a/locales/locales-fa-IR.xml +++ b/locales/locales-fa-IR.xml @@ -69,13 +69,7 @@ – - th - st - nd - rd - th - th - th + اول diff --git a/locales/locales-hr-HR.xml b/locales/locales-hr-HR.xml --- a/locales/locales-hr-HR.xml +++ b/locales/locales-hr-HR.xml @@ -19,13 +19,13 @@ pristupljeno i i ostali - anonim + anonimno anon. na - pristupačno na + dostupno na od - circa - c. + oko + oko citirano izdanje @@ -37,12 +37,12 @@ od ibid. u - u štampi + u tisku internet intervju pismo bez datuma - bez datuma + bez dat. na internetu predstavljeno na @@ -58,8 +58,8 @@ verzija - AD - BC + + pr. Kr. „ @@ -69,13 +69,7 @@ – - th - st - nd - rd - th - th - th + . prvi @@ -99,8 +93,8 @@ poglavlja - kolona - kolone + stupac + stupci crtež @@ -111,20 +105,20 @@ folije - broj - brojevi + izdanje + izdanja - linija - linije + red + redovi - beleška - beleške + bilješka + bilješke - opus - opera + djelo + djela stranica @@ -135,40 +129,40 @@ stranice - paragraf - paragrafi + pasus + pasusi - deo - delova + dio + dijelova - odeljak - odeljaka + odjeljak + odjeljci sub verbo sub verbis - strofa - strofe + stih + stihovi - tom - tomova + svezak + svesci - knj - pog - kol - црт - fol - izd - l - n - op + knj. + pogl. + stup. + crt. + fol. + izd. + red + bilj. + sv. str. str. @@ -177,20 +171,20 @@ str. str. - par - deo - od + par. + dio + od. s.v. s.vv. - s - s + st. + st. - tom - tomova + sv. + sv. @@ -205,42 +199,42 @@ - director - directors + voditelj + voditelji - priređivač - priređivači + urednik + urednici - priređivač - priređivači + urednik + urednici ilustrator ilustratori - prevodilac - prevodioci + prevoditelj + prevoditelji - priređivač & prevodilac - priređivači & prevodioci + urednik & prevoditelj + urednici & prevoditelji - prir. - prir. + vod. + vod. - prir. - prir. + ur. + ur. - prir. - prir. + ur.-vod. + ur.-vod. il. @@ -251,61 +245,61 @@ prev. - prir. & prev. - prir. & prev. + ur. & prev. + ur. & prev. - by - directed by - priredio - priredio - ilustrovao - intervjuisao - prima - od + od + vodio + uredio + uredio + ilustrirao + intervjuirao + primatelj + pregledao preveo - priredio & preveo by + uredio & preveo - dir. - prir. - prir. + vod. + ur. + ur. vod. ilus. prev. - prir. & prev. by + ur. & prev. - januar - februar - mart - april - maj - jun - jul - avgust - septembar - oktobar - novembar - decembar + siječanj + veljača + ožujak + travanj + svibanj + lipanj + srpanj + kolovoz + rujan + listopad + studeni + prosinac - jan. - feb. - mart - apr. - maj - jun - jul - avg. - sep. - okt. - nov. - dec. + sij. + velj. + ožu. + tra. + svi. + lip. + srp. + kol. + ruj. + lis. + stu. + pros. - proleće - leto + proljeće + ljeto jesen zima diff --git a/locales/locales-pt-BR.xml b/locales/locales-pt-BR.xml --- a/locales/locales-pt-BR.xml +++ b/locales/locales-pt-BR.xml @@ -1,12 +1,12 @@ + 2016-05-16T00:00:00+03:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License - 2012-07-04T23:31:02+00:00 - + - + @@ -22,7 +22,7 @@ anônimo anon em - available at + disponível em por circa c. @@ -54,34 +54,46 @@ refs. recuperado - scale - version + escala + versão - AD - BC + DC + AC “ ” ‘ ’ - – + – º + ª + º - primeiro - segundo - terceiro - quarto - quinto - sexto - sétimo - oitavo - nono - décimo + primeiro + segundo + terceiro + quarto + quinto + sexto + sétimo + oitavo + nono + décimo + primeira + segunda + terceira + quarta + quinta + sexta + sétima + oitava + nona + décima @@ -199,8 +211,8 @@ - director - directors + diretor + diretores organizador @@ -208,11 +220,11 @@ editor - editors + editores - illustrator - illustrators + ilustrador + ilustradores tradutor @@ -237,8 +249,8 @@ eds. - ill. - ills. + il. + ils. trad. @@ -251,21 +263,21 @@ por - directed by + dirigido por organizado por editado por - illustrated by + ilustrado por entrevista de para - by + por traduzido por - editado & traduzido por + editado e traduzido por dir. org. ed. - illus. + ilus. trad. ed. e trad. por diff --git a/locales/locales-zh-CN.xml b/locales/locales-zh-CN.xml --- a/locales/locales-zh-CN.xml +++ b/locales/locales-zh-CN.xml @@ -17,7 +17,7 @@ 见於 - 及 + 和 及其他 作者不详 无名氏 diff --git a/man/man1/pandoc-citeproc.1 b/man/man1/pandoc-citeproc.1 --- a/man/man1/pandoc-citeproc.1 +++ b/man/man1/pandoc-citeproc.1 @@ -1,8 +1,8 @@ .\"t -.\" Automatically generated by Pandoc 1.15.1.1 +.\" Automatically generated by Pandoc 1.17.1 .\" +.TH "pandoc\-citeproc" "1" "2016-06-04" "pandoc-citeproc 0.10" "" .hy -.TH "pandoc\-citeproc" "1" "2015-11-14" "pandoc-citeproc 0.8.1.3" "" .SH NAME .PP pandoc\-citeproc \- filter to resolve citations in a pandoc document. 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.9.1.1 +version: 0.10 cabal-version: >= 1.12 synopsis: Supports using pandoc with citeproc @@ -24,6 +24,7 @@ homepage: https://github.com/jgm/pandoc-citeproc category: Text +tested-with: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1 license: BSD3 license-file: LICENSE author: John MacFarlane, Andrea Rossato @@ -152,6 +153,9 @@ other-modules: Paths_pandoc_citeproc Prelude default-language: Haskell98 + if flag(bibutils) + default-extensions: CPP + cpp-options: -DUSE_BIBUTILS executable test-citeproc Main-Is: test-citeproc.hs diff --git a/pandoc-citeproc.hs b/pandoc-citeproc.hs --- a/pandoc-citeproc.hs +++ b/pandoc-citeproc.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} module Main where import Text.CSL.Input.Bibutils (readBiblioString, BibFormat(..)) import Text.CSL.Reference (Reference(refId), Literal(..)) @@ -73,6 +74,7 @@ where go "biblatex" = Just BibLatex go "bib" = Just BibLatex go "bibtex" = Just Bibtex +#ifdef USE_BIBUTILS go "ris" = Just Ris go "endnote" = Just Endnote go "enl" = Just Endnote @@ -85,6 +87,7 @@ go "json" = Just Json go "mods" = Just Mods go "yaml" = Just Yaml +#endif go _ = Nothing 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 @@ -1,4 +1,5 @@ {-# LANGUAGE CPP #-} +{-# LANGUAGE DeriveDataTypeable #-} ----------------------------------------------------------------------------- -- | -- Module : Text.CSL.Data @@ -13,12 +14,15 @@ module Text.CSL.Data ( getLocale + , CSLLocaleException(..) , getDefaultCSL , langBase ) where import System.FilePath () +import Data.Typeable import qualified Data.ByteString.Lazy as L +import qualified Control.Exception as E #ifdef EMBED_DATA_FILES import Data.Maybe (fromMaybe) import Text.CSL.Data.Embedded (localeFiles, defaultCSL) @@ -28,26 +32,36 @@ import System.Directory (doesFileExist) #endif +data CSLLocaleException = + CSLLocaleNotFound String + | CSLLocaleReadError E.IOException + deriving Typeable +instance Show CSLLocaleException where + show (CSLLocaleNotFound s) = "Could not find locale data for " ++ s + show (CSLLocaleReadError e) = show e +instance E.Exception CSLLocaleException + +-- | Raises 'CSLLocaleException' on error. getLocale :: String -> IO L.ByteString getLocale s = do #ifdef EMBED_DATA_FILES - f <- case length s of - 0 -> maybe (return S.empty) return - $ 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 x' - _ -> error $ "could not find locale data for " ++ s - _ -> case lookup ("locales-" ++ take 5 s ++ ".xml") localeFiles of - Just x' -> return 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 x'' - _ -> error $ - "could not find locale data for " ++ s - return $ L.fromChunks [f] + let toLazy x = L.fromChunks [x] + case length s of + 0 -> 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 + 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 #else f <- case length s of 0 -> return "locales/locales-en-US.xml" @@ -57,7 +71,7 @@ exists <- doesFileExist f if not exists && length s > 2 then getLocale $ take 2 s -- try again with base locale - else L.readFile f + else E.handle (\e -> E.throwIO (CSLLocaleReadError e)) $ L.readFile f #endif getDefaultCSL :: IO L.ByteString 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 @@ -377,10 +377,10 @@ isTransNumber, isSpecialChar,isNumber :: String -> Bool isTransNumber = all isDigit -isSpecialChar = all (`elem` "&-,\x2013") +isSpecialChar = all (`elem` "&-,.\x2013") isNumber cs = case [c | c <- cs , not (isLetter c) - , not (c `elem` "&-,\x2013")] of + , not (c `elem` "&-.,\x2013")] of [] -> False xs -> all isDigit xs 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 @@ -12,8 +12,9 @@ ----------------------------------------------------------------------------- module Text.CSL.Input.Bibtex - ( readBibtexInput - , readBibtexInputString + ( readBibtex + , readBibtexString + , readBibtexString' ) where @@ -80,23 +81,33 @@ , fields :: [(String, String)] } -readBibtexInput :: Bool -> FilePath -> IO [Reference] -readBibtexInput isBibtex f = UTF8.readFile f >>= readBibtexInputString isBibtex - -readBibtexInputString :: Bool -> String -> IO [Reference] -readBibtexInputString isBibtex bibstring = do +getLangFromEnv :: IO Lang +getLangFromEnv = do env <- getEnvironment - let lang = case lookup "LANG" env of + return $ case lookup "LANG" env of Just x -> case splitWhen (\c -> c == '.' || c == '_' || c == '-') x of (w:z:_) -> Lang w z [w] | not (null w) -> Lang w mempty _ -> Lang "en" "US" Nothing -> Lang "en" "US" + +readBibtex :: Bool -> Bool -> FilePath -> IO [Reference] +readBibtex isBibtex caseTransform f = + UTF8.readFile f >>= readBibtexString isBibtex caseTransform + +readBibtexString :: Bool -> Bool -> String -> IO [Reference] +readBibtexString isBibtex caseTransform contents = do + lang <- getLangFromEnv + locale <- parseLocale (langToLocale lang) + return $ readBibtexString' isBibtex caseTransform lang locale contents + +-- pure version of readBibtexString +readBibtexString' :: Bool -> Bool -> Lang -> Locale -> String -> [Reference] +readBibtexString' isBibtex caseTransform lang locale bibstring = let items = case runParser (bibEntries <* eof) [] "stdin" bibstring of Left err -> error (show err) Right xs -> resolveCrossRefs isBibtex xs - locale <- parseLocale (langToLocale lang) - return $ mapMaybe (itemToReference lang locale isBibtex) items + in mapMaybe (itemToReference lang locale isBibtex caseTransform) items type BibParser = Parsec [Char] [(String, String)] @@ -158,7 +169,7 @@ ) (char '"') fieldName :: BibParser String -fieldName = (map toLower) <$> many1 (letter <|> digit <|> oneOf "-_") +fieldName = (map toLower) <$> many1 (letter <|> digit <|> oneOf "-_:") isBibtexKeyChar :: Char -> Bool isBibtexKeyChar c = isAlphaNum c || c `elem` ".:;?!`'()/*@_+=-[]*" @@ -919,7 +930,8 @@ getOldDates :: String -> Bib [RefDate] getOldDates prefix = do year' <- fixLeadingDash <$> getRawField (prefix ++ "year") - month' <- (parseMonth <$> getRawField (prefix ++ "month")) <|> return "" + month' <- ((parseMonth . map toLower) + <$> getRawField (prefix ++ "month")) <|> return "" day' <- getRawField (prefix ++ "day") <|> return mempty endyear' <- fixLeadingDash <$> getRawField (prefix ++ "endyear") <|> return "" endmonth' <- getRawField (prefix ++ "endmonth") <|> return "" @@ -1195,11 +1207,11 @@ pad0 s = s terms = localeTerms locale -itemToReference :: Lang -> Locale -> Bool -> Item -> Maybe Reference -itemToReference lang locale bibtex = bib $ do +itemToReference :: Lang -> Locale -> Bool -> Bool -> Item -> Maybe Reference +itemToReference lang locale bibtex caseTransform = bib $ do modify $ \st -> st{ localeLanguage = lang, untitlecase = case lang of - Lang "en" _ -> True + Lang "en" _ -> caseTransform _ -> False } id' <- asks identifier et <- asks entryType @@ -1323,7 +1335,7 @@ let la = case splitWhen (== '-') hyphenation' of (x:_) -> x [] -> mempty - modify $ \s -> s{ untitlecase = la == "en" } + modify $ \s -> s{ untitlecase = caseTransform && la == "en" } title' <- (guard isPeriodical >> getTitle "issuetitle") <|> (guard hasMaintitle >> guard (not isChapterlike) >> getTitle "maintitle") diff --git a/src/Text/CSL/Input/Bibutils.hs b/src/Text/CSL/Input/Bibutils.hs --- a/src/Text/CSL/Input/Bibutils.hs +++ b/src/Text/CSL/Input/Bibutils.hs @@ -48,9 +48,9 @@ = case getExt f of ".json" -> BL.readFile f >>= either error return . eitherDecode ".yaml" -> UTF8.readFile f >>= either error return . readYamlBib - ".bib" -> readBibtexInput False f - ".bibtex" -> readBibtexInput True f - ".biblatex" -> readBibtexInput False f + ".bib" -> readBibtex False True f + ".bibtex" -> readBibtex True True f + ".biblatex" -> readBibtex False True f #ifdef USE_BIBUTILS ".mods" -> readBiblioFile' f mods_in ".ris" -> readBiblioFile' f ris_in @@ -62,7 +62,7 @@ _ -> error $ "citeproc: the format of the bibliographic database could not be recognized\n" ++ "using the file extension." #else - _ -> error $ "citeproc: Bibliography format not supported.\n" ++ + _ -> error $ "citeproc: Bibliography format not supported.\n" #endif data BibFormat @@ -84,8 +84,8 @@ readBiblioString b s | Json <- b = either error return $ eitherDecode $ UTF8.fromStringLazy s | Yaml <- b = either error return $ readYamlBib s - | Bibtex <- b = readBibtexInputString True s - | BibLatex <- b = readBibtexInputString False s + | Bibtex <- b = readBibtexString True True s + | BibLatex <- b = readBibtexString False True s #ifdef USE_BIBUTILS | Ris <- b = go ris_in | Endnote <- b = go endnote_in @@ -107,7 +107,7 @@ #ifdef USE_BIBUTILS readBiblioFile' :: FilePath -> BiblioIn -> IO [Reference] readBiblioFile' fin bin - | bin == biblatex_in = readBibtexInput False fin + | bin == biblatex_in = readBibtex False True fin | otherwise = E.handle handleBibfileError $ withTempDir "citeproc" $ \tdir -> do @@ -121,7 +121,7 @@ _ <- bibl_write param bibl tfile bibl_free bibl bibl_freeparams param - refs <- readBibtexInput True tfile + refs <- readBibtex True False tfile return $! refs where handleBibfileError :: E.SomeException -> IO [Reference] handleBibfileError e = error $ "Error reading " ++ fin ++ "\n" ++ show e 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 @@ -9,6 +9,7 @@ import Text.HTML.TagSoup.Entity (lookupEntity) import qualified Data.ByteString.Lazy as L import System.SetEnv (setEnv) +import System.Environment (getEnv) import Control.Applicative ((<|>)) import Data.Aeson import Data.Char ( isDigit, isPunctuation, toLower, isSpace ) @@ -177,9 +178,19 @@ localizeCSL mbLocale $ parseCSL' raw -- set LANG environment from locale; this affects unicode collation -- if pandoc-citeproc compiled with unicode_collation flag - setEnv "LC_ALL" $ case styleLocale csl of - (l:_) -> localeLang l - _ -> "en-US" + case styleLocale csl of + (l:_) -> do + setEnv "LC_ALL" (localeLang l) + setEnv "LANG" (localeLang l) + [] -> do + envlang <- getEnv "LANG" + 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" + else do + setEnv "LC_ALL" envlang bibRefs <- getBibRefs $ maybe (MetaList []) id $ lookupMeta "bibliography" meta let refs = inlineRefs ++ bibRefs diff --git a/src/Text/CSL/Parser.hs b/src/Text/CSL/Parser.hs --- a/src/Text/CSL/Parser.hs +++ b/src/Text/CSL/Parser.hs @@ -38,7 +38,7 @@ parseCSL :: String -> Style parseCSL = parseCSL' . fromStringLazy --- | Parse locale. +-- | Parse locale. Raises 'CSLLocaleException' on error. parseLocale :: String -> IO Locale parseLocale locale = parseLocaleElement . fromDocument . X.parseLBS_ def <$> getLocale locale diff --git a/src/Text/CSL/Util.hs b/src/Text/CSL/Util.hs --- a/src/Text/CSL/Util.hs +++ b/src/Text/CSL/Util.hs @@ -193,7 +193,7 @@ case (w, st) of (y, NoBoundary) -> return y (Str (x:xs), WordBoundary) | isUpper x -> - return $ Str (toLower x : xs) + return $ Str (map toLower (x:xs)) (Str (x:xs), SentenceBoundary) | isLower x -> return $ Str (toUpper x : xs) (Span ("",[],[]) xs, _) | hasLowercaseWord xs -> @@ -248,7 +248,7 @@ put WordBoundary return $ Space : acc go acc (Str [c]) - | c `elem` "-\2013\2014\160" = do + | c `elem` "-/\2013\2014\160" = do put WordBoundary return $ Str [c] : acc | isPunctuation c = do diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -8,4 +8,4 @@ packages: - '.' extra-deps: [] -resolver: lts-5.8 +resolver: lts-6.1 diff --git a/tests/issue65.expected.native b/tests/issue65.expected.native --- a/tests/issue65.expected.native +++ b/tests/issue65.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("ISBN",MetaInlines [Str "3406493556"]),("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Stotz"]),("given",MetaInlines [Str "Peter"])])]),("call-number",MetaInlines [Str "PA25",Space,Str "PA2616",Space,Str ".H24",Space,Str "Abt.",Space,Str "2,",Space,Str "T.",Space,Str "5,",Space,Str "Bd.",Space,Str "2,",Space,Str "etc"]),("collection-number",MetaInlines [Str "2.5"]),("collection-title",MetaInlines [Str "Handbuch",Space,Str "der",Space,Str "Altertumswissenschaft"]),("event-place",MetaInlines [Str "Munich"]),("first-reference-note-number",MetaString "1"),("id",MetaInlines [Str "stotz:1996handbuch"]),("issued",MetaMap (fromList [("literal",MetaInlines [Str "1996_2004"])])),("language",MetaInlines [Str "German"]),("number-of-volumes",MetaInlines [Str "5"]),("publisher",MetaInlines [Str "Beck"]),("publisher-place",MetaInlines [Str "Munich"]),("source",MetaInlines [Str "Library",Space,Str "of",Space,Str "Congress",Space,Str "ISBN"]),("title",MetaInlines [Str "Handbuch",Space,Str "zur",Space,Str "lateinischen",Space,Str "Sprache",Space,Str "des",Space,Str "Mittelalters"]),("title-short",MetaInlines [Str "Handbuch"]),("type",MetaInlines [Str "book"])])])]}) [Para [Cite [Citation {citationId = "stotz:1996handbuch", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Stotz",Space,Str "1996\8211\&2004)"]] -,Div ("refs",["references"],[]) [Div ("ref-stotz:1996handbuch",[],[]) [Para [Str "Stotz,",Space,Str "Peter.",Space,Str "1996\8211\&2004.",Space,Emph [Str "Handbuch",Space,Str "zur",Space,Str "lateinischen",Space,Str "Sprache",Space,Str "des",Space,Str "Mittelalters"],Str ".",Space,Str "5",Space,Str "vols.",Space,Str "Handbuch",Space,Str "der",Space,Str "Altertumswissenschaft,",Space,Str "2.5.",Space,Str "Munich:",Space,Str "Beck."]]]] +,Div ("refs",["references"],[]) [Div ("ref-stotz:1996handbuch",[],[]) [Para [Str "Stotz,",Space,Str "Peter.",Space,Str "1996\8211\&2004.",Space,Emph [Str "Handbuch",Space,Str "zur",Space,Str "lateinischen",Space,Str "Sprache",Space,Str "des",Space,Str "Mittelalters"],Str ".",Space,Str "5",Space,Str "vols.",Space,Str "Handbuch",Space,Str "der",Space,Str "Altertumswissenschaft",Space,Str "2.5.",Space,Str "Munich:",Space,Str "Beck."]]]]