diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,11 @@ +pandoc-citeproc (0.14.8.1) + + * Avoid putting a space after nonbreaking space at end of prefix. + Previously this resulted in overly long spaces after abbreviations + like 'cf.' at the end of prefixes. + * Fix bug which caused names with apostrophes to be treated like + East Asian names in certain styles (#360). + pandoc-citeproc (0.14.8) * Add disambiguation to undated references (n.d.a, n.d.b) (#325). 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.8 +version: 0.14.8.1 cabal-version: 1.12 synopsis: Supports using pandoc with citeproc diff --git a/src/Text/CSL/Eval/Names.hs b/src/Text/CSL/Eval/Names.hs --- a/src/Text/CSL/Eval/Names.hs +++ b/src/Text/CSL/Eval/Names.hs @@ -319,7 +319,7 @@ (c >= '\x1f00' && c <= '\x1fff') || (c >= '\x0600' && c <= '\x06ff') || (c >= '\x200c' && c <= '\x200e') || - (c >= '\x2018' && c <= '\x0219') || + (c >= '\x2018' && c <= '\x2019') || (c >= '\x021a' && c <= '\x021b') || (c >= '\x202a' && c <= '\x202e') 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 @@ -206,7 +206,10 @@ case y of Formatted [] -> [] Formatted ils - | isprefix -> [OPan ils, OSpace] + | isprefix -> case reverse ils of + (Str zs@(_:_):_) | + last zs == '\160' -> [OPan ils] + _ -> [OPan ils, OSpace] | otherwise -> case ils of (Str (z:_):_) | isAlphaNum z || diff --git a/tests/issue360.expected.native b/tests/issue360.expected.native new file mode 100644 --- /dev/null +++ b/tests/issue360.expected.native @@ -0,0 +1,5 @@ +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "L\8217Estrange"]),("given",MetaInlines [Str "Michael"])]),MetaMap (fromList [("family",MetaInlines [Str "Merchant"]),("given",MetaInlines [Str "Stephen"])])]),("id",MetaInlines [Str "lestrange2017"]),("issued",MetaList [MetaMap (fromList [("day",MetaInlines [Str "18"]),("month",MetaInlines [Str "7"]),("year",MetaInlines [Str "2017"])])]),("language",MetaInlines [Str "en-US"]),("title",MetaInlines [Str "2017",Space,Str "Independent",Space,Str "Intelligence",Space,Str "Review"]),("title-short",MetaInlines [Str "Independent",Space,Str "Intelligence",Space,Str "Review"]),("type",MetaInlines [Str "report"])])])]}) +[Para [Cite [Citation {citationId = "lestrange2017", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Note [Para [Str "Michael",Space,Str "L\8217Estrange",Space,Str "and",Space,Str "Stephen",Space,Str "Merchant,",Space,Emph [Str "2017",Space,Str "Independent",Space,Str "Intelligence",Space,Str "Review"],Str ",",Space,Str "July",Space,Str "18,",Space,Str "2017."]]]] +,Div ("refs",["references"],[]) + [Div ("ref-lestrange2017",[],[]) + [Para [Str "L\8217Estrange,",Space,Str "Michael,",Space,Str "and",Space,Str "Stephen",Space,Str "Merchant.",Space,Emph [Str "2017",Space,Str "Independent",Space,Str "Intelligence",Space,Str "Review"],Str ",",Space,Str "July",Space,Str "18,",Space,Str "2017."]]]] diff --git a/tests/issue360.in.native b/tests/issue360.in.native new file mode 100644 --- /dev/null +++ b/tests/issue360.in.native @@ -0,0 +1,2 @@ +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "L\8217Estrange"]),("given",MetaInlines [Str "Michael"])]),MetaMap (fromList [("family",MetaInlines [Str "Merchant"]),("given",MetaInlines [Str "Stephen"])])]),("id",MetaInlines [Str "lestrange2017"]),("issued",MetaList [MetaMap (fromList [("day",MetaInlines [Str "18"]),("month",MetaInlines [Str "7"]),("year",MetaInlines [Str "2017"])])]),("language",MetaInlines [Str "en-US"]),("title",MetaInlines [Str "2017",Space,Str "Independent",Space,Str "Intelligence",Space,Str "Review"]),("title-short",MetaInlines [Str "Independent",Space,Str "Intelligence",Space,Str "Review"]),("type",MetaInlines [Str "report"])])])]}) +[Para [Cite [Citation {citationId = "lestrange2017", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@lestrange2017]"]]] diff --git a/tests/jats.csl b/tests/jats.csl deleted file mode 100644 --- a/tests/jats.csl +++ /dev/null @@ -1,208 +0,0 @@ - - -