diff options
author | John MacFarlane <jgm@berkeley.edu> | 2020-10-07 09:31:44 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2020-10-07 09:31:44 -0700 |
commit | d2e4a83dc63e51a1c7cfb8668cbaad328a05c3a4 (patch) | |
tree | 4dcdf5f066c1f1002a619839dd7643e14958b253 | |
parent | fd3809c33f663627f43168d347c7f2690a74b56f (diff) | |
download | pandoc-d2e4a83dc63e51a1c7cfb8668cbaad328a05c3a4.tar.gz |
Use latest citeproc.
Better solution to the problem of entities in CSL JSON output.
-rw-r--r-- | cabal.project | 2 | ||||
-rw-r--r-- | src/Text/Pandoc/Writers/CslJson.hs | 4 | ||||
-rw-r--r-- | stack.yaml | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/cabal.project b/cabal.project index 2227b793f..a18699145 100644 --- a/cabal.project +++ b/cabal.project @@ -7,6 +7,6 @@ package pandoc source-repository-package type: git location: https://github.com/jgm/citeproc - tag: dd561dc5bb359b3fb015b5ccbb5b657d80c2f415 + tag: 914695eb5735351db58e31f621ee72410e8ff8ba constraints: base16-bytestring < 1 diff --git a/src/Text/Pandoc/Writers/CslJson.hs b/src/Text/Pandoc/Writers/CslJson.hs index 95ffb34a7..02495799d 100644 --- a/src/Text/Pandoc/Writers/CslJson.hs +++ b/src/Text/Pandoc/Writers/CslJson.hs @@ -23,7 +23,6 @@ import qualified Data.Text as T import qualified Text.Pandoc.UTF8 as UTF8 import Text.Pandoc.Error import Text.Pandoc.Class -import Text.Pandoc.XML (fromEntities) import Control.Monad.Except (throwError) import Data.ByteString.Lazy (toStrict) import Data.ByteString (ByteString) @@ -86,6 +85,5 @@ toCslJson locale = toStrict . , confCompare = compare , confNumFormat = Generic } . map (runIdentity . traverse (return . - fromEntities . - renderCslJson locale . + renderCslJson False locale . foldMap fromInline)) diff --git a/stack.yaml b/stack.yaml index 695c4a4f8..511b47fa2 100644 --- a/stack.yaml +++ b/stack.yaml @@ -7,7 +7,7 @@ packages: - '.' extra-deps: - git: https://github.com/jgm/citeproc - commit: dd561dc5bb359b3fb015b5ccbb5b657d80c2f415 + commit: 914695eb5735351db58e31f621ee72410e8ff8ba - pandoc-types-1.22 - texmath-0.12.0.3 - rfc5051-0.2 |