diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -2,18 +2,13 @@ import Distribution.Simple import Distribution.Simple.PreProcess -import Distribution.Simple.InstallDirs (mandir) -import Distribution.PackageDescription (PackageDescription(..), Executable(..)) +import Distribution.PackageDescription (PackageDescription(..)) import Distribution.Simple.Program (simpleProgram, Program(..)) import Distribution.Simple.Utils ( rawSystemExitCode, findProgramVersion ) -import Data.Version import System.Exit -import System.Directory ( findExecutable ) -import Distribution.Simple.Utils (info, notice, rawSystemExit, installOrdinaryFiles) +import Distribution.Simple.Utils (info, notice, installOrdinaryFiles) import Distribution.Simple.Setup import Distribution.Simple.LocalBuildInfo -import Distribution.Verbosity -import qualified Control.Exception as E main :: IO () diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,11 @@ +pandoc-citeproc (0.10.1.3) + + * Fixed compiler warnings. + * Setup.hs - removed unnecessary imports. + * Travis improvements. Run on stack lts-7, not earlier. + Disable optimizations for faster build. Turn on warnings. + * Bump pandoc-types to 1.17.0.3 in stack.yaml. + pandoc-citeproc (0.10.1.2) * Implemented notes-after-punctuation metadata field (#256). 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.1.2 +version: 0.10.1.3 cabal-version: >= 1.12 synopsis: Supports using pandoc with citeproc @@ -24,7 +24,7 @@ homepage: https://github.com/jgm/pandoc-citeproc category: Text -tested-with: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1 +tested-with: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1 license: BSD3 license-file: LICENSE author: John MacFarlane, Andrea Rossato @@ -105,40 +105,36 @@ data-default, setenv >= 0.1 && < 0.2, split, yaml >= 0.8.8.7 + default-language: Haskell2010 + default-extensions: CPP + if impl(ghc < 7.6) build-depends: ghc-prim if flag(debug) build-depends: pretty-show - default-extensions: CPP cpp-options: -DTRACE if flag(bibutils) build-depends: hs-bibutils >= 0.3 - default-extensions: CPP cpp-options: -DUSE_BIBUTILS if flag(embed_data_files) - default-extensions: CPP Build-Tools: hsb2hs >= 0.3.1 cpp-options: -DEMBED_DATA_FILES other-modules: Text.CSL.Data.Embedded if flag(unicode_collation) build-depends: text, text-icu - default-extensions: CPP cpp-options: -DUNICODE_COLLATION else build-depends: rfc5051 - default-extensions: CPP if impl(ghc >= 6.10) build-depends: base >= 4, syb, parsec, old-locale, time else build-depends: base >= 3 && < 4 - default-language: Haskell98 - executable pandoc-citeproc main-is: pandoc-citeproc.hs hs-source-dirs: ., prelude @@ -152,7 +148,7 @@ filepath other-modules: Paths_pandoc_citeproc Prelude - default-language: Haskell98 + default-language: Haskell2010 if flag(bibutils) default-extensions: CPP cpp-options: -DUSE_BIBUTILS @@ -172,7 +168,7 @@ filepath, bytestring, pandoc-citeproc, process, temporary >= 1.1, yaml >= 0.8.8.7, containers >= 0.4, vector >= 0.10 - default-language: Haskell98 + default-language: Haskell2010 test-suite test-pandoc-citeproc Type: exitcode-stdio-1.0 @@ -185,4 +181,4 @@ pandoc >= 1.16 && < 1.18, filepath, bytestring, pandoc-citeproc, process, temporary >= 1.1, yaml >= 0.8.8.7 - default-language: Haskell98 + default-language: Haskell2010 diff --git a/src/Text/CSL/Eval/Common.hs b/src/Text/CSL/Eval/Common.hs --- a/src/Text/CSL/Eval/Common.hs +++ b/src/Text/CSL/Eval/Common.hs @@ -1,4 +1,7 @@ {-# LANGUAGE PatternGuards #-} +#if MIN_VERSION_base(4,9,0) +{-# OPTIONS_GHC -fno-warn-redundant-constraints #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Text.CSL.Eval.Common diff --git a/src/Text/CSL/Proc/Disamb.hs b/src/Text/CSL/Proc/Disamb.hs --- a/src/Text/CSL/Proc/Disamb.hs +++ b/src/Text/CSL/Proc/Disamb.hs @@ -1,4 +1,7 @@ {-# LANGUAGE PatternGuards #-} +#if MIN_VERSION_base(4,9,0) +{-# OPTIONS_GHC -fno-warn-redundant-constraints #-} +#endif ----------------------------------------------------------------------------- -- | -- Module : Text.CSL.Proc.Disamb 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 @@ -1,7 +1,12 @@ {-# LANGUAGE OverloadedStrings, PatternGuards, DeriveDataTypeable, ScopedTypeVariables, FlexibleInstances, DeriveGeneric, - OverlappingInstances, GeneralizedNewtypeDeriving, CPP, MultiParamTypeClasses #-} +#if MIN_VERSION_base(4,8,0) +#define OVERLAPS {-# OVERLAPPING #-} +#else +{-# LANGUAGE OverlappingInstances #-} +#define OVERLAPS +#endif ----------------------------------------------------------------------------- -- | -- Module : Text.CSL.Style diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -8,12 +8,10 @@ packages: - '.' - location: - git: https://github.com/jgm/pandoc-types.git - commit: 485eb11e9869fcd4c1ca9bcd68d3ccd384230252 -- location: git: https://github.com/jgm/pandoc.git commit: 6156cdda13ee5f9edbb11a672f6eb78631c3ffc5 extra-deps: - texmath-0.8.6.6 - doctemplates-0.1.0.2 -resolver: lts-7.2 +- pandoc-types-1.17.0.3 +resolver: lts-7.4 diff --git a/tests/isme.csl b/tests/isme.csl new file mode 100644 --- /dev/null +++ b/tests/isme.csl @@ -0,0 +1,204 @@ + +