diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,7 @@ +pandoc-citeproc (0.10.2.2) + + * Fix overlapping instances with aeson-1.0.2.1 (#263). + pandoc-citeproc (0.10.2.1) * Allow pandoc 1.18.x. 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.10.2.1 +version: 0.10.2.2 cabal-version: >= 1.12 synopsis: Supports using pandoc with citeproc diff --git a/src/Text/CSL/Reference.hs b/src/Text/CSL/Reference.hs --- a/src/Text/CSL/Reference.hs +++ b/src/Text/CSL/Reference.hs @@ -1,7 +1,13 @@ {-# LANGUAGE GeneralizedNewtypeDeriving, PatternGuards, OverloadedStrings, DeriveDataTypeable, ExistentialQuantification, FlexibleInstances, ScopedTypeVariables, GeneralizedNewtypeDeriving, IncoherentInstances, - DeriveGeneric #-} + DeriveGeneric, CPP #-} +#if MIN_VERSION_base(4,8,0) +#define OVERLAPS {-# OVERLAPPING #-} +#else +{-# LANGUAGE OverlappingInstances #-} +#define OVERLAPS +#endif ----------------------------------------------------------------------------- -- | -- Module : Text.CSL.Reference @@ -161,7 +167,8 @@ , "circa" &= T.pack (if circa r then "1" else "") ] -instance FromJSON [RefDate] where +instance OVERLAPS + FromJSON [RefDate] where parseJSON (Array xs) = mapM parseJSON $ V.toList xs parseJSON (Object v) = do dateParts <- v .:? "date-parts" @@ -196,7 +203,8 @@ (Just y, Nothing, Nothing) -> [y] _ -> [] -instance ToJSON [RefDate] where +instance OVERLAPS + ToJSON [RefDate] where toJSON [] = Array V.empty toJSON xs = object' $ case filter (not . null) (map toDatePart xs) of @@ -204,9 +212,6 @@ dps -> (["date-parts" .= dps ] ++ ["circa" .= (1 :: Int) | or (map circa xs)] ++ ["season" .= s | s <- map season xs, s /= mempty]) - --- instance ToJSON [RefDate] --- toJSON xs = Array (V.fromList $ map toJSON xs) setCirca :: Bool -> RefDate -> RefDate setCirca circa' rd = rd{ circa = circa' } diff --git a/src/Text/CSL/Style.hs b/src/Text/CSL/Style.hs --- a/src/Text/CSL/Style.hs +++ b/src/Text/CSL/Style.hs @@ -702,7 +702,8 @@ v .:? "cite-hash" .!= 0 parseJSON _ = fail "Could not parse Cite" -instance FromJSON [[Cite]] where +instance OVERLAPS + FromJSON [[Cite]] where parseJSON (Array v) = mapM parseJSON $ V.toList v parseJSON _ = return [] @@ -904,7 +905,8 @@ ] ++ ["comma-suffix" .= commaSuffix agent | nameSuffix agent /= mempty] ++ ["parse-names" .= True | parseNames agent ] -instance FromJSON [Agent] where +instance OVERLAPS + FromJSON [Agent] where parseJSON (Array xs) = mapM parseJSON $ V.toList xs parseJSON (Object v) = (:[]) `fmap` parseJSON (Object v) parseJSON _ = fail "Could not parse [Agent]" diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -14,4 +14,5 @@ - texmath-0.8.6.6 - doctemplates-0.1.0.2 - pandoc-types-1.17.0.4 -resolver: lts-7.4 +- aeson-1.0.2.1 +resolver: lts-7.5 diff --git a/tests/isme.csl b/tests/isme.csl new file mode 100644 --- /dev/null +++ b/tests/isme.csl @@ -0,0 +1,204 @@ + +