pandoc-citeproc 0.11.1.1 → 0.11.1.2

raw patch · 8 files changed

+28/−17 lines, 8 filesdep ~basedep ~hs-bibutilsdep ~pandocPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base, hs-bibutils, pandoc

API changes (from Hackage documentation)

Files

• changelog +8/−0
• compat/Text/CSL/Compat/Pandoc.hs +4/−5
• pandoc-citeproc.cabal +5/−2
• src/Text/CSL/Parser.hs +1/−1
• stack.yaml +7/−6
• tests/biblio2yaml/dates.biblatex +1/−1
• tests/biblio2yaml/inbook-title-booktitle-maintitle-series-2.biblatex +1/−1
• tests/biblio2yaml/inbook-title-booktitle-maintitle-series.biblatex +1/−1

@@ -1,3 +1,11 @@+pandoc-citeproc (0.11.1.2)++  * Fixed quotes in three test cases.  We'd been using straight quotes.+  * Use latest hs-bibutils.+  * Update compat for latest pandoc 2.0.+  * Change type of compat's fetchItem so it doesn't take+    a datadir argument.+ pandoc-citeproc (0.11.1.1)    * Added containers to build deps for test-pandoc-citeproc.

@@ -111,16 +111,15 @@   return (ec, out) #endif -fetchItem :: Maybe String-          -> String+fetchItem :: String           -> IO (Either E.SomeException (B.ByteString, Maybe MimeType)) #if MIN_VERSION_pandoc(2,0,0)-fetchItem mbd s = do-  res <- runIO $ runExceptT $ lift $ Text.Pandoc.Class.fetchItem mbd s+fetchItem s = do+  res <- runIO $ runExceptT $ lift $ Text.Pandoc.Class.fetchItem s   return $ case res of        Left e          -> Left (E.toException e)        Right (Left (e :: PandocError))  -> Left (E.toException e)        Right (Right r) -> Right r #else-fetchItem = Text.Pandoc.Shared.fetchItem+fetchItem = Text.Pandoc.Shared.fetchItem Nothing #endif

@@ -1,5 +1,5 @@ name:               pandoc-citeproc-version:            0.11.1.1+version:            0.11.1.2 cabal-version:      >= 1.12 synopsis:           Supports using pandoc with citeproc @@ -51,6 +51,9 @@   type:          git   location:      git://github.com/jgm/pandoc-citeproc.git +custom-setup+  setup-depends: base, Cabal+ flag bibutils   description: Use Chris Putnam's Bibutils.   default:     True@@ -126,7 +129,7 @@        cpp-options:     -DTRACE      if flag(bibutils)-       build-depends:   hs-bibutils >= 0.3+       build-depends:   hs-bibutils >= 6.2.0.1        cpp-options:     -DUSE_BIBUTILS      if flag(embed_data_files)

@@ -56,7 +56,7 @@ readCSLFile mbLocale src = do   csldir <- getAppUserDataDirectory "csl"   mbSrc <- findFile [".", csldir] src-  fetchRes <- fetchItem Nothing (fromMaybe src mbSrc)+  fetchRes <- fetchItem (fromMaybe src mbSrc)   f <- case fetchRes of             Left err         -> E.throwIO err             Right (rawbs, _) -> return $ L.fromChunks [rawbs]

@@ -9,18 +9,19 @@ - '.' - location:     git: https://github.com/jgm/pandoc.git-    commit: 5849b89e52de64a5bbebbc815772ad6bbc883c1d+    commit: 47e2719cc3e18a6216c886b8ab7166f48bfe457f   extra-dep: true extra-deps: - texmath-0.9.4.2-- hslua-0.8.0-- skylighting-0.3.4.1+- hslua-0.9.2+- skylighting-0.4.2 - cmark-gfm-0.1.1 - QuickCheck-2.10.0.1 - tasty-quickcheck-0.9.1+- doctemplates-0.2.1 - haddock-library-1.4.3-- pandoc-types-1.17.1+- pandoc-types-1.17.2 # needed for now:-- hs-bibutils-5.5+- hs-bibutils-6.2.0.1 - rfc5051-0.1.0.3-resolver: lts-9.1+resolver: lts-9.9

@@ -25,7 +25,7 @@     Author = {Author, Al},     Journal = {Journal},     Month = {08},-    Title = {Year and Month, biblatex style; note that biblatex does not have a "day" field},+    Title = {Year and Month, biblatex style; note that biblatex does not have a ``day'' field},     Year = {1999}}  @article{dates,

@@ -14,7 +14,7 @@ 	Publisher = {Publisher}, 	Series = {Series}, 	Subtitle = {Subtitle},-	Title = {Title of the "inbook" Entry},+	Title = {Title of the ``inbook'' Entry}, 	Titleaddon = {Titleaddon}, 	Volume = {4}} 

@@ -13,7 +13,7 @@ 	Publisher = {Publisher}, 	Series = {Series}, 	Subtitle = {Subtitle},-	Title = {Title of the "inbook" Entry},+	Title = {Title of the ``inbook'' Entry}, 	Titleaddon = {Titleaddon}, 	Volume = {4}}