pandoc-citeproc 0.17.0.1 → 0.17.0.2
raw patch · 9 files changed
+47/−34 lines, 9 filesdep ~rfc5051PVP ok
version bump matches the API change (PVP)
Dependency ranges changed: rfc5051
API changes (from Hackage documentation)
Files
- changelog +5/−0
- chicago-author-date.csl +12/−2
- locales/locales-nb-NO.xml +1/−1
- locales/locales-nl-NL.xml +4/−4
- locales/locales-nn-NO.xml +1/−1
- locales/locales-sl-SI.xml +2/−2
- pandoc-citeproc.cabal +2/−2
- src/Text/CSL/Style.hs +15/−20
- stack.yaml +5/−2
changelog view
@@ -1,3 +1,8 @@+pandoc-citeproc (0.17.0.2)++ * Update to use latest rfc5051.+ * Update chicago-author-date.csl and locales.+ pandoc-citeproc (0.17.0.1) * Allow aeson 1.5 (#452, Felix Yan).
chicago-author-date.csl view
@@ -27,6 +27,9 @@ <email>matthew.g.roth@yale.edu</email> <uri> https://orcid.org/0000-0001-7902-6331</uri> </contributor>+ <contributor>+ <name>Brenton M. Wiernik</name>+ </contributor> <category citation-format="author-date"/> <category field="generic-base"/> <summary>The author-date variant of the Chicago style</summary>@@ -509,8 +512,15 @@ </choose> </macro> <macro name="event">- <group>- <text term="presented at" suffix=" "/>+ <group delimiter=" ">+ <choose>+ <if variable="genre">+ <text term="presented at"/>+ </if>+ <else>+ <text term="presented at" text-case="capitalize-first"/>+ </else>+ </choose> <text variable="event"/> </group> </macro>
locales/locales-nb-NO.xml view
@@ -45,7 +45,7 @@ <term name="interview">intervju</term> <term name="letter">brev</term> <term name="no date">ingen dato</term>- <term name="no date" form="short">udatert</term>+ <term name="no date" form="short">u.å.</term> <term name="online">online</term> <term name="presented at">presentert på</term> <term name="reference">
locales/locales-nl-NL.xml view
@@ -66,10 +66,10 @@ <term name="bc">BC</term> <!-- PUNCTUATION -->- <term name="open-quote">“</term>- <term name="close-quote">”</term>- <term name="open-inner-quote">‘</term>- <term name="close-inner-quote">’</term>+ <term name="open-quote">‘</term>+ <term name="close-quote">’</term>+ <term name="open-inner-quote">“</term>+ <term name="close-inner-quote">”</term> <term name="page-range-delimiter">–</term> <!-- ORDINALS -->
locales/locales-nn-NO.xml view
@@ -45,7 +45,7 @@ <term name="interview">intervju</term> <term name="letter">brev</term> <term name="no date">ingen dato</term>- <term name="no date" form="short">udatert</term>+ <term name="no date" form="short">u.å.</term> <term name="online">online</term> <term name="presented at">presentert på</term> <term name="reference">
locales/locales-sl-SI.xml view
@@ -14,7 +14,7 @@ <date form="text"> <date-part name="day" form="numeric" suffix=". "/> <date-part name="month" suffix=" "/>- <date-part name="year" suffix="."/>+ <date-part name="year"/> </date> <date form="numeric"> <date-part name="day" form="numeric" suffix=". "/>@@ -40,7 +40,7 @@ <term name="edition" form="short">izd.</term> <term name="et-al">idr.</term> <term name="forthcoming">pred izidom</term>- <term name="from">od</term>+ <term name="from">s</term> <term name="ibid">isto</term> <term name="in">v</term> <term name="in press">v tisku</term>
pandoc-citeproc.cabal view
@@ -1,6 +1,6 @@ cabal-version: 1.12 name: pandoc-citeproc-version: 0.17.0.1+version: 0.17.0.2 synopsis: Supports using pandoc with citeproc description: The pandoc-citeproc library supports automatic@@ -151,7 +151,7 @@ build-depends: text, text-icu cpp-options: -DUNICODE_COLLATION else- build-depends: rfc5051+ build-depends: rfc5051 >= 0.2 && < 0.3 executable pandoc-citeproc main-is: pandoc-citeproc.hs
src/Text/CSL/Style.hs view
@@ -101,7 +101,7 @@ import Data.Aeson hiding (Number) import qualified Data.Aeson as Aeson import Data.Aeson.Types (Pair)-import Data.Char (isLetter, isPunctuation, isUpper, toLower, isDigit)+import Data.Char (isLetter, isPunctuation, isUpper, isDigit) import qualified Data.Char as Char import Data.Generics (Data, Typeable) import Data.List (intercalate, intersperse, nubBy)@@ -110,7 +110,6 @@ import Data.Maybe (listToMaybe, isNothing) import Data.String import Data.Text (Text)-import qualified Data.Text as T import Data.Yaml.Builder (ToYaml (..)) import qualified Data.Yaml.Builder as Y import GHC.Generics (Generic)@@ -126,8 +125,8 @@ import qualified Text.Pandoc.Walk as Walk import Text.Pandoc.XML (fromEntities) -#ifdef UNICODE_COLLATION import qualified Data.Text as T+#ifdef UNICODE_COLLATION import qualified Data.Text.ICU as T #else import Data.RFC5051 (compareUnicode)@@ -486,32 +485,28 @@ compare _ _ = EQ compare' :: Text -> Text -> Ordering-compare' x' y'- = case (x, y) of- ('-':_,'-':_) -> comp (normalize y) (normalize x)- ('-':_, _ ) -> LT- (_ ,'-':_) -> GT- _ -> comp (normalize x) (normalize y)+compare' x y+ = case (T.uncons x, T.uncons y) of+ (Just ('-',_), Just ('-',_)) -> comp (normalize y) (normalize x)+ (Just ('-',_), _) -> LT+ (_ ,Just ('-',_)) -> GT+ _ -> comp (normalize x) (normalize y) where- -- FIXME: to Text- x = T.unpack x'- y = T.unpack y' -- we zero pad numbers so they're sorted numerically, see #399- zeropad [] = []- zeropad xs = if all isDigit xs- then replicate (10 - length xs) '0' ++ xs- else xs+ zeropad t = if T.all isDigit t+ then T.replicate (10 - T.length t) "0" <> t+ else t normalize = zeropad .- map (\c -> if c == ',' || c == '.' then ' ' else c) .- filter (\c -> c == ',' ||+ T.map (\c -> if c == ',' || c == '.' then ' ' else c) .+ T.filter (\c -> c == ',' || not (isPunctuation c || Char.isSpace c -- ayn/hamza in transliterated arabic: || c == 'ʾ' || c == 'ʿ' )) #ifdef UNICODE_COLLATION- comp a b = T.collate (T.collator T.Current) (T.pack a) (T.pack b)+ comp a b = T.collate (T.collator T.Current) a b #else- comp a b = compareUnicode (map toLower a) (map toLower b)+ comp a b = compareUnicode a b #endif data Form
stack.yaml view
@@ -22,9 +22,12 @@ - HsYAML-0.2.1.0 - HsYAML-aeson-0.2.0.0 - doctemplates-0.8.2+- commonmark-0.1.0.1+- commonmark-extensions-0.2.0.1+- commonmark-pandoc-0.2.0.0 - pandoc-types-1.21-- git: 'https://github.com/jgm/pandoc'- commit: 9672ff827194ddf5565351b2fdde942c03942b2d+- rfc5051-0.2+- pandoc-2.10.1 ghc-options: "$locals": -fhide-source-paths