summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnMacFarlane <>2017-10-28 17:32:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-10-28 17:32:00 (GMT)
commitd5801934a3be170db7555290e1bf6f90c2cf5e2b (patch)
tree111fd5eec6f01b662eb3d5d46cbd825c5e5f41a6
parente606259adfd246543390f9e8968f73971fa01460 (diff)
version 0.11.1.20.11.1.2
-rw-r--r--changelog8
-rw-r--r--compat/Text/CSL/Compat/Pandoc.hs9
-rw-r--r--pandoc-citeproc.cabal7
-rw-r--r--src/Text/CSL/Parser.hs2
-rw-r--r--stack.yaml13
-rw-r--r--tests/biblio2yaml/dates.biblatex2
-rw-r--r--tests/biblio2yaml/inbook-title-booktitle-maintitle-series-2.biblatex2
-rw-r--r--tests/biblio2yaml/inbook-title-booktitle-maintitle-series.biblatex2
8 files changed, 28 insertions, 17 deletions
diff --git a/changelog b/changelog
index 48fd3ed..ce1b2ec 100644
--- a/changelog
+++ b/changelog
@@ -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.
diff --git a/compat/Text/CSL/Compat/Pandoc.hs b/compat/Text/CSL/Compat/Pandoc.hs
index 5a6ddac..8effe7f 100644
--- a/compat/Text/CSL/Compat/Pandoc.hs
+++ b/compat/Text/CSL/Compat/Pandoc.hs
@@ -111,16 +111,15 @@ pipeProcess e f a b = do
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
diff --git a/pandoc-citeproc.cabal b/pandoc-citeproc.cabal
index 071d1bc..c2fc430 100644
--- a/pandoc-citeproc.cabal
+++ b/pandoc-citeproc.cabal
@@ -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 @@ source-repository head
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 @@ library
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)
diff --git a/src/Text/CSL/Parser.hs b/src/Text/CSL/Parser.hs
index 75e8633..763650d 100644
--- a/src/Text/CSL/Parser.hs
+++ b/src/Text/CSL/Parser.hs
@@ -56,7 +56,7 @@ readCSLFile :: Maybe String -> FilePath -> IO Style
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]
diff --git a/stack.yaml b/stack.yaml
index 468396d..116afbd 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -9,18 +9,19 @@ packages:
- '.'
- 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
diff --git a/tests/biblio2yaml/dates.biblatex b/tests/biblio2yaml/dates.biblatex
index 129b14e..a3efb4f 100644
--- a/tests/biblio2yaml/dates.biblatex
+++ b/tests/biblio2yaml/dates.biblatex
@@ -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,
diff --git a/tests/biblio2yaml/inbook-title-booktitle-maintitle-series-2.biblatex b/tests/biblio2yaml/inbook-title-booktitle-maintitle-series-2.biblatex
index 75e8539..b3fb698 100644
--- a/tests/biblio2yaml/inbook-title-booktitle-maintitle-series-2.biblatex
+++ b/tests/biblio2yaml/inbook-title-booktitle-maintitle-series-2.biblatex
@@ -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}}
diff --git a/tests/biblio2yaml/inbook-title-booktitle-maintitle-series.biblatex b/tests/biblio2yaml/inbook-title-booktitle-maintitle-series.biblatex
index c95c40f..406413d 100644
--- a/tests/biblio2yaml/inbook-title-booktitle-maintitle-series.biblatex
+++ b/tests/biblio2yaml/inbook-title-booktitle-maintitle-series.biblatex
@@ -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}}