diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,8 @@ +pandoc-citeproc (0.12.1.1) + + * Avoid double punctuation when citation ends with 'et al.' (#262). + * Fix collapsing for items that lack an author (#152). + pandoc-citeproc (0.12.1) * Fixed cases where we got plural instead of singular "issue" 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.12.1 +version: 0.12.1.1 cabal-version: >= 1.12 synopsis: Supports using pandoc with citeproc 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 @@ -31,7 +31,8 @@ import Control.Monad.State import System.FilePath import System.Directory (getAppUserDataDirectory) -import Text.CSL.Util (findFile, splitStrWhen, tr', parseRomanNumeral, trim) +import Text.CSL.Util (findFile, splitStrWhen, tr', parseRomanNumeral, trim, + lastInline) import Text.CSL.Exception import System.IO.Error (isDoesNotExistError) import Data.Maybe (fromMaybe) @@ -262,23 +263,33 @@ isSpacy _ = False mvPunct :: Bool -> Style -> [Inline] -> [Inline] -mvPunct _ _ (x : Space : xs) | isSpacy x = x : xs -mvPunct moveNotes _ (s : x : ys) | isSpacy s, isNote x, startWithPunct ys = - if moveNotes - then Str (headInline ys) : x : tailInline ys - else x : ys -mvPunct moveNotes _ (Cite cs ils : ys) | - length ils > 1 +mvPunct _ _ (x : Space : xs) + | isSpacy x = x : xs +mvPunct moveNotes _ (s : x : ys) + | isSpacy s + , isNote x + , startWithPunct ys + = if moveNotes + then Str (headInline ys) : x : tailInline ys + else x : ys +mvPunct moveNotes _ (Cite cs ils : ys) + | length ils > 1 , isNote (last ils) , startWithPunct ys , moveNotes - = Cite cs (init ils ++ [Str (headInline ys) | not (endWithPunct False (init ils))] + = Cite cs (init ils + ++ [Str (headInline ys) | not (endWithPunct False (init ils))] ++ [last ils]) : tailInline ys mvPunct moveNotes sty (q@(Quoted _ _) : w@(Str _) : x : ys) - | isNote x, isPunctuationInQuote sty, moveNotes = - mvPunctInsideQuote q w ++ (x : ys) + | isNote x + , isPunctuationInQuote sty + , moveNotes + = mvPunctInsideQuote q w ++ (x : ys) mvPunct _ _ (s : x : ys) | isSpacy s, isNote x = x : ys mvPunct _ _ (s : x@(Cite _ (Superscript _ : _)) : ys) | isSpacy s = x : ys +mvPunct _ _ (Cite cs ils : Str "." : ys) + | lastInline ils == "." + = Cite cs ils : ys mvPunct _ _ xs = xs endWithPunct :: Bool -> [Inline] -> Bool @@ -287,10 +298,11 @@ case reverse (stringify xs) of [] -> True -- covers .), .", etc.: - (d:c:_) | isPunctuation d && not onlyFinal - && isEndPunct c -> True - (c:_) | isEndPunct c -> True - | otherwise -> False + (d:c:_) | isPunctuation d + && not onlyFinal + && isEndPunct c -> True + (c:_) | isEndPunct c -> True + | otherwise -> False where isEndPunct c = c `elem` (".,;:!?" :: String) startWithPunct :: [Inline] -> Bool diff --git a/src/Text/CSL/Proc/Collapse.hs b/src/Text/CSL/Proc/Collapse.hs --- a/src/Text/CSL/Proc/Collapse.hs +++ b/src/Text/CSL/Proc/Collapse.hs @@ -72,10 +72,11 @@ groupCites :: [(Cite, Output)] -> [(Cite, Output)] groupCites [] = [] -groupCites (x:xs) = let equal = filter ((==) (namesOf $ snd x) . namesOf . snd) xs - notequal = filter ((/=) (namesOf $ snd x) . namesOf . snd) xs +groupCites (x:xs) = let equal = filter (hasSameNamesAs x) xs + notequal = filter (not . hasSameNamesAs x) xs in x : equal ++ groupCites notequal where + hasSameNamesAs w y = namesOf (snd w) == namesOf (snd y) contribsQ o | OContrib _ _ c _ _ <- o = [c] | otherwise = [] @@ -138,7 +139,9 @@ | OContrib _ _ c _ _ <- o = [proc' rmHashAndGivenNames c] | otherwise = [] namesOf = query contribsQ - process = doCollapse . groupBy (\a b -> namesOf (snd a) == namesOf (snd b)) . groupCites + hasSameNames a b = not (null (namesOf (snd a))) && + namesOf (snd a) == namesOf (snd b) + process = doCollapse . groupBy hasSameNames . groupCites collapseYearSuf :: Bool -> String -> [(Cite,Output)] -> [Output] collapseYearSuf ranged ysd = process diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -9,17 +9,19 @@ packages: - '.' extra-deps: -- pandoc-2.0.1 -- texmath-0.9.4.2 -- hslua-0.9.2 -- skylighting-0.4.2 +- pandoc-2.0.5 +- texmath-0.10 +- hslua-0.9.3 +- hslua-module-text-0.1.2.1 +- skylighting-0.5 - cmark-gfm-0.1.1 - QuickCheck-2.10.0.1 - tasty-quickcheck-0.9.1 +- tagsoup-0.14.2 - doctemplates-0.2.1 - haddock-library-1.4.3 -- pandoc-types-1.17.2 +- pandoc-types-1.17.3 # needed for now: - hs-bibutils-6.2.0.1 - rfc5051-0.1.0.3 -resolver: lts-9.9 +resolver: lts-9.14 diff --git a/tests/issue152.expected.native b/tests/issue152.expected.native new file mode 100644 --- /dev/null +++ b/tests/issue152.expected.native @@ -0,0 +1,9 @@ +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/apa.csl"]),("references",MetaList [MetaMap (fromList [("URL",MetaInlines [Str "http://geekfeminism.wikia.com/wiki/Geek_Feminism"]),("accessed",MetaMap (fromList [("day",MetaString "10"),("month",MetaString "4"),("year",MetaString "2013")])),("container-title",MetaInlines [Str "Geek",Space,Str "Feminism"]),("custom2",MetaInlines [Str "ok.mm"]),("id",MetaInlines [Str "Feminism2013gf"]),("issued",MetaMap (fromList [("day",MetaString "10"),("month",MetaString "4"),("year",MetaString "2013")])),("keyword",MetaInlines [Str "gender"]),("title",MetaInlines [Str "Geek",Space,Str "Feminism"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("URL",MetaInlines [Str "http://geekfeminism.wikia.com/wiki/Category:Communities"]),("accessed",MetaMap (fromList [("day",MetaString "19"),("month",MetaString "10"),("year",MetaString "2011")])),("container-title",MetaInlines [Str "Geek",Space,Str "Feminism"]),("custom2",MetaInlines [Str "gender.mm"]),("id",MetaInlines [Str "Feminism2011ces"]),("issued",MetaMap (fromList [("day",MetaString "14"),("month",MetaString "8"),("year",MetaString "2011")])),("keyword",MetaInlines [Str "gender"]),("title",MetaInlines [Str "Communities"]),("type",MetaInlines [Str "entry-encyclopedia"])])])]}) +[Header 1 ("test",[],[]) [Str "Test"] +,Para [Str "I",Space,Str "have",Space,Str "two",Space,Str "citations",Space,Cite [Citation {citationId = "Feminism2013gf", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1},Citation {citationId = "Feminism2011ces", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2}] [Str "(",Str "\8220Communities,\8221",Space,Str "2011;",Space,Str "\8220Geek",Space,Str "Feminism,\8221",Space,Str "2013)"],Str "."] +,Header 1 ("references",["unnumbered"],[]) [Str "References"] +,Div ("refs",["references"],[]) + [Div ("ref-Feminism2011ces",[],[]) + [Para [Str "Communities.",Space,Str "(2011,",Space,Str "August",Space,Str "14).",Space,Str "In",Space,Emph [Str "Geek",Space,Str "Feminism"],Str ".",Space,Str "Retrieved",Space,Str "from",Space,Link ("",[],[]) [Str "http://geekfeminism.wikia.com/wiki/Category:Communities"] ("http://geekfeminism.wikia.com/wiki/Category:Communities","")]] + ,Div ("ref-Feminism2013gf",[],[]) + [Para [Str "Geek",Space,Str "Feminism.",Space,Str "(2013,",Space,Str "April",Space,Str "10).",Space,Emph [Str "Geek",Space,Str "Feminism"],Str ".",Space,Str "Retrieved",Space,Str "April",Space,Str "10,",Space,Str "2013,",Space,Str "from",Space,Link ("",[],[]) [Str "http://geekfeminism.wikia.com/wiki/Geek_Feminism"] ("http://geekfeminism.wikia.com/wiki/Geek_Feminism","")]]]] diff --git a/tests/issue152.in.native b/tests/issue152.in.native new file mode 100644 --- /dev/null +++ b/tests/issue152.in.native @@ -0,0 +1,4 @@ +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/apa.csl"]),("references",MetaList [MetaMap (fromList [("URL",MetaInlines [Str "http://geekfeminism.wikia.com/wiki/Geek_Feminism"]),("accessed",MetaMap (fromList [("day",MetaString "10"),("month",MetaString "4"),("year",MetaString "2013")])),("container-title",MetaInlines [Str "Geek",Space,Str "Feminism"]),("custom2",MetaInlines [Str "ok.mm"]),("id",MetaInlines [Str "Feminism2013gf"]),("issued",MetaMap (fromList [("day",MetaString "10"),("month",MetaString "4"),("year",MetaString "2013")])),("keyword",MetaInlines [Str "gender"]),("title",MetaInlines [Str "Geek",Space,Str "Feminism"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("URL",MetaInlines [Str "http://geekfeminism.wikia.com/wiki/Category:Communities"]),("accessed",MetaMap (fromList [("day",MetaString "19"),("month",MetaString "10"),("year",MetaString "2011")])),("container-title",MetaInlines [Str "Geek",Space,Str "Feminism"]),("custom2",MetaInlines [Str "gender.mm"]),("id",MetaInlines [Str "Feminism2011ces"]),("issued",MetaMap (fromList [("day",MetaString "14"),("month",MetaString "8"),("year",MetaString "2011")])),("keyword",MetaInlines [Str "gender"]),("title",MetaInlines [Str "Communities"]),("type",MetaInlines [Str "entry-encyclopedia"])])])]}) +[Header 1 ("test",[],[]) [Str "Test"] +,Para [Str "I",Space,Str "have",Space,Str "two",Space,Str "citations",Space,Cite [Citation {citationId = "Feminism2013gf", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "Feminism2011ces", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@Feminism2013gf;",Space,Str "@Feminism2011ces]"],Str "."] +,Header 1 ("references",[],[]) [Str "References"]] diff --git a/tests/modern-language-association-7th-edition.csl b/tests/modern-language-association-7th-edition.csl new file mode 100644 --- /dev/null +++ b/tests/modern-language-association-7th-edition.csl @@ -0,0 +1,460 @@ + +