aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <[email protected]>2025-10-24 23:06:16 +0200
committerJohn MacFarlane <[email protected]>2025-10-24 23:11:26 +0200
commitd6c95435bfd30285b97ece4b221388000ea7a511 (patch)
treeae5aa42a7546732d5606e2dab6590a6e760c0d1a
parentba64240f2c99c1f75557f2dae6c4022e1178297c (diff)
Use latest dev citeproc.
-rw-r--r--cabal.project5
-rw-r--r--stack.yaml3
-rw-r--r--test/docx/mendeley_citations_plus.native4
-rw-r--r--test/docx/zotero_citations_plus.native17
4 files changed, 13 insertions, 16 deletions
diff --git a/cabal.project b/cabal.project
index 07b8626d2..7b5aef9ab 100644
--- a/cabal.project
+++ b/cabal.project
@@ -6,3 +6,8 @@ tests: True
flags: +embed_data_files
constraints: skylighting-format-blaze-html >= 0.1.1.3,
skylighting-format-context >= 0.1.0.2
+
+source-repository-package
+ type: git
+ location: https://github.com/jgm/citeproc.git
+ tag: 1a82c13ac1d8e9e07cf69fbf89ba2b57474b8e0f
diff --git a/stack.yaml b/stack.yaml
index 46c9a1eeb..92b8a0c56 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -17,7 +17,8 @@ extra-deps:
- skylighting-0.14.7
- djot-0.1.2.3
- texmath-0.13.0.1
-- citeproc-0.11
+- git: https://github.com/jgm/citeproc.git
+ commit: 1a82c13ac1d8e9e07cf69fbf89ba2b57474b8e0f
ghc-options:
"$locals": -fhide-source-paths -Wno-missing-home-modules
resolver: lts-24.9
diff --git a/test/docx/mendeley_citations_plus.native b/test/docx/mendeley_citations_plus.native
index c4bb46f60..0493b7f64 100644
--- a/test/docx/mendeley_citations_plus.native
+++ b/test/docx/mendeley_citations_plus.native
@@ -7,9 +7,9 @@ Pandoc
[ MetaMap
(fromList
[ ( "DOI"
- , MetaInlines [ Str "10.1145/1929887.1929902" ]
+ , MetaString "10.1145/1929887.1929902"
)
- , ( "ISSN" , MetaInlines [ Str "2153-2184" ] )
+ , ( "ISSN" , MetaString "2153-2184" )
, ( "author"
, MetaList
[ MetaMap
diff --git a/test/docx/zotero_citations_plus.native b/test/docx/zotero_citations_plus.native
index 3e7c50f5d..bd1a51bcb 100644
--- a/test/docx/zotero_citations_plus.native
+++ b/test/docx/zotero_citations_plus.native
@@ -6,9 +6,7 @@ Pandoc
, MetaList
[ MetaMap
(fromList
- [ ( "DOI"
- , MetaInlines [ Str "10.1002/2016GL069961" ]
- )
+ [ ( "DOI" , MetaString "10.1002/2016GL069961" )
, ( "author"
, MetaList
[ MetaMap
@@ -97,16 +95,9 @@ Pandoc
, MetaMap
(fromList
[ ( "DOI"
- , MetaInlines
- [ Str "10.1007/s00382-013-1683-2" ]
- )
- , ( "ISSN"
- , MetaInlines
- [ Str "0930-7575,"
- , Space
- , Str "1432-0894"
- ]
+ , MetaString "10.1007/s00382-013-1683-2"
)
+ , ( "ISSN" , MetaString "0930-7575, 1432-0894" )
, ( "author"
, MetaList
[ MetaMap
@@ -174,7 +165,7 @@ Pandoc
, MetaMap
(fromList
[ ( "DOI"
- , MetaInlines [ Str "10.5194/gmd-9-3751-2016" ]
+ , MetaString "10.5194/gmd-9-3751-2016"
)
, ( "author"
, MetaList