diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,10 @@ +pandoc-citeproc (0.14.1.1) + + * Fix regression in movement of punctuation inside quotes before note. + Example: `Here is a "test citation" [@item1].` + should become `Here is a a "test citation."[^1]` (at least in + locales where punctuation moves inside quotes, like en-US). + pandoc-citeproc (0.14.1) * More robust handling of boolean metadata values. 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.1 +version: 0.14.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 @@ -280,14 +280,14 @@ mvPunct :: Bool -> Style -> [Inline] -> [Inline] mvPunct moveNotes sty (x : Space : xs) | isSpacy x = x : mvPunct moveNotes sty xs -mvPunct moveNotes sty (s : x : ys) +mvPunct moveNotes sty (q : s : x : ys) | isSpacy s , isNote x , startWithPunct ys = if moveNotes - then Str (headInline ys) : x : - mvPunct moveNotes sty (tailInline ys) - else x : mvPunct moveNotes sty ys + then mvPunct moveNotes sty $ + q : Str (headInline ys) : x : tailInline ys + else q : x : mvPunct moveNotes sty ys mvPunct moveNotes sty (Cite cs ils : ys) | length ils > 1 , isNote (last ils) diff --git a/tests/modern-language-association-7th-edition.csl b/tests/modern-language-association-7th-edition.csl deleted file mode 100644 --- a/tests/modern-language-association-7th-edition.csl +++ /dev/null @@ -1,460 +0,0 @@ - - diff --git a/tests/move-period-inside-quote.expected.native b/tests/move-period-inside-quote.expected.native new file mode 100644 --- /dev/null +++ b/tests/move-period-inside-quote.expected.native @@ -0,0 +1,3 @@ +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("DOI",MetaInlines [Str "10.1038/171737a0"]),("URL",MetaInlines [Str "http://www.nature.com/nature/journal/v171/n4356/abs/171737a0.html"]),("accessed",MetaMap (fromList [("day",MetaString "17"),("month",MetaString "6"),("year",MetaString "2008")])),("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Watson"]),("given",MetaInlines [Str "J.",Space,Str "D."])]),MetaMap (fromList [("family",MetaInlines [Str "Crick"]),("given",MetaInlines [Str "F.",Space,Str "H.",Space,Str "C."])])]),("container-title",MetaInlines [Str "Nature"]),("custom4",MetaInlines [Str "custom4"]),("id",MetaInlines [Str "WatsonCrick1953"]),("issue",MetaString "4356"),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1953",MetaString "4",MetaString "25"]])])),("language",MetaInlines [Str "en-US"]),("note",MetaInlines [Str "this",Space,Str "is",Space,Str "a",Space,Str "note"]),("original-date",MetaMap (fromList [("year",MetaString "1951")])),("page",MetaInlines [Str "737-738"]),("title",MetaInlines [Str "Molecular",Space,Str "structure",Space,Str "of",Space,Str "nucleic",Space,Str "acids:",Space,Str "a",Space,Str "structure",Space,Str "for",Space,Str "deoxyribose",Space,Str "nucleic",Space,Str "acid"]),("title-short",MetaInlines [Str "Molecular",Space,Str "structure",Space,Str "of",Space,Str "nucleic",Space,Str "acids"]),("type",MetaInlines [Str "article-journal"]),("volume",MetaString "171")])]),("suppress-bibliography",MetaBool True)]}) +[Para [Str "Here",Space,Str "is",Space,Str "a",Space,Quoted DoubleQuote [Str "test",Space,Str "citation",Str "."],Cite [Citation {citationId = "WatsonCrick1953", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Note [Para [Str "J.",Space,Str "D.",Space,Str "Watson",Space,Str "and",Space,Str "F.",Space,Str "H.",Space,Str "C.",Space,Str "Crick,",Space,Str "\8220Molecular",Space,Str "Structure",Space,Str "of",Space,Str "Nucleic",Space,Str "Acids:",Space,Str "A",Space,Str "Structure",Space,Str "for",Space,Str "Deoxyribose",Space,Str "Nucleic",Space,Str "Acid,\8221",Space,Emph [Str "Nature"],Space,Str "171,",Space,Str "no.",Space,Str "4356",Space,Str "(April",Space,Str "25,",Space,Str "1953):",Space,Str "737\8211\&38,",Space,Str "doi:",Link ("",[],[]) [Str "10.1038/171737a0"] ("https://doi.org/10.1038/171737a0",""),Str "."]]]] +,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "test",Space,Str "citation",Str ".",Cite [Citation {citationId = "WatsonCrick1953", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2}] [Note [Para [Str "Ibid."]]]]] diff --git a/tests/move-period-inside-quote.in.native b/tests/move-period-inside-quote.in.native new file mode 100644 --- /dev/null +++ b/tests/move-period-inside-quote.in.native @@ -0,0 +1,3 @@ +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("DOI",MetaInlines [Str "10.1038/171737a0"]),("URL",MetaInlines [Str "http://www.nature.com/nature/journal/v171/n4356/abs/171737a0.html"]),("accessed",MetaMap (fromList [("day",MetaString "17"),("month",MetaString "6"),("year",MetaString "2008")])),("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Watson"]),("given",MetaInlines [Str "J.",Space,Str "D."])]),MetaMap (fromList [("family",MetaInlines [Str "Crick"]),("given",MetaInlines [Str "F.",Space,Str "H.",Space,Str "C."])])]),("container-title",MetaInlines [Str "Nature"]),("custom4",MetaInlines [Str "custom4"]),("id",MetaInlines [Str "WatsonCrick1953"]),("issue",MetaString "4356"),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1953",MetaString "4",MetaString "25"]])])),("language",MetaInlines [Str "en-US"]),("note",MetaInlines [Str "this",Space,Str "is",Space,Str "a",Space,Str "note"]),("original-date",MetaMap (fromList [("year",MetaString "1951")])),("page",MetaInlines [Str "737-738"]),("title",MetaInlines [Str "Molecular",Space,Str "structure",Space,Str "of",Space,Str "nucleic",Space,Str "acids:",Space,Str "a",Space,Str "structure",Space,Str "for",Space,Str "deoxyribose",Space,Str "nucleic",Space,Str "acid"]),("title-short",MetaInlines [Str "Molecular",Space,Str "structure",Space,Str "of",Space,Str "nucleic",Space,Str "acids"]),("type",MetaInlines [Str "article-journal"]),("volume",MetaString "171")])]),("suppress-bibliography",MetaBool True)]}) +[Para [Str "Here",Space,Str "is",Space,Str "a",Space,Quoted DoubleQuote [Str "test",Space,Str "citation"],Space,Cite [Citation {citationId = "WatsonCrick1953", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@WatsonCrick1953]"],Str "."] +,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "test",Space,Str "citation",Space,Cite [Citation {citationId = "WatsonCrick1953", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@WatsonCrick1953]"],Str "."]]