Skip to content

Commit 41ccc09

Browse files
depressed-phodepressed-pho
committed
textproc/hs-citeproc: Update to 0.8.1
0.8.1 * In Pandoc and CslJson CaseTransform, group punctuation in clusters (#127). * Fix sorting on dates (#126). Previously this broke for some styles, e.g. apa.csl, which styles dates as MM/DD/YYYY, and would lead to incorrect sorting of dates with months and/or days. * Add citation-key variable from citeId. This is a new addition in CSL 1.0.2. * Update locales from upstream. * Raise an error if multiple layout elements are present (#120). * Fix two test cases. They had illegal bibliography elements with no layout children. * If there are multiple layout elements, only use the last one. This can happen with CSL-M styles. The last layout should be locale-unspecific. This change will prevent us from emitting doubled citations or bibliographic references (see #120), allowing more graceful handling of CSL-M styles, even though we don't support CSL-M. 0.8.0.2 * Fix missing locator after collapsing and grouping with year suffix (#96). 0.8.0.1 * Fix disambiguation edge case (#116). We weren't properly disambiguating when only one of two ambiguous names had a subsequent citation. * Chicago page numbering fixes. * Update test suite form upstream. * Handle whole-citation links differently in secondFieldAlign (#113, Benjamin Bray). * Require data-default >= 0.5.2 (#114, Bodigrim). 0.8 * Add SubstitutedVal constructor for Val [API change] (#101, #108). This is used to track variables that are repressed due to substitution. (We can't just delete them, because they still count when we have "if" elements that check for a variable.) * Fix logic for including a group. A group with a text node and an empty variable should count as empty. * CaseTransform: don't change words that are a mix of uppercase and nonletters, like CRT1000. * Fix label with "page" variable (#107). * Fix error in test suite. We stripped indentation in the expected result in some cases. * Update fr-FR locale from upstream. 0.7 * Handle old term form sub verbo as if it is sub-verbo (the new form). * Update to latest locales in CSL repository. * Makefile: Fix update-locales target. * Keep explicit "et al." (#102, Albert Krewinkel). * Factor out deleteSubstitutedVariables. * Add any references in citationItemData to references. * Add citationItemData field to CitationItem [API change]. This corresponds to the itemData that can appear in the JSON representation of a citation item. * Add Ord, Eq instances for Reference, DisambiguationData, Val [API change].
1 parent be40198 commit 41ccc09

File tree

4 files changed

+80
-78
lines changed

4 files changed

+80
-78
lines changed

‎textproc/hs-citeproc/Makefile‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# $NetBSD: Makefile,v 1.11 2022/09/07 06:50:51 pho Exp $
1+
# $NetBSD: Makefile,v 1.12 2023/01/28 08:45:46 pho Exp $
22

3-
DISTNAME= citeproc-0.6.0.1
4-
PKGREVISION= 5
3+
DISTNAME= citeproc-0.8.1
54
CATEGORIES= textproc
65

76
MAINTAINER= pho@cielonegro.org
@@ -10,8 +9,8 @@ LICENSE= 2-clause-bsd
109

1110
CONFIGURE_ARGS+= -fexecutable
1211

12+
# lib:citeproc
1313
.include "../../converters/hs-aeson/buildlink3.mk"
14-
.include "../../converters/hs-aeson-pretty/buildlink3.mk"
1514
.include "../../textproc/hs-attoparsec/buildlink3.mk"
1615
.include "../../textproc/hs-case-insensitive/buildlink3.mk"
1716
.include "../../devel/hs-data-default/buildlink3.mk"
@@ -24,5 +23,9 @@ CONFIGURE_ARGS+= -fexecutable
2423
.include "../../devel/hs-vector/buildlink3.mk"
2524
.include "../../textproc/hs-xml-conduit/buildlink3.mk"
2625
.include "../../textproc/hs-rfc5051/buildlink3.mk"
26+
27+
# exe:citeproc
28+
.include "../../converters/hs-aeson-pretty/buildlink3.mk"
29+
2730
.include "../../mk/haskell.mk"
2831
.include "../../mk/bsd.pkg.mk"

‎textproc/hs-citeproc/PLIST‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,81 @@
1-
@comment $NetBSD: PLIST,v 1.1 2021/04/24 19:26:26 pho Exp $
1+
@comment $NetBSD: PLIST,v 1.2 2023/01/28 08:45:46 pho Exp $
22
bin/citeproc
33
lib/citeproc-${PKGVERSION}/${HS_VERSION}/package-description
44
lib/citeproc-${PKGVERSION}/${HS_VERSION}/package-id
5-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc.dyn_hi
5+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc.dyn_hi
66
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc.hi
7-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc.p_hi
8-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CaseTransform.dyn_hi
7+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc.p_hi
8+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CaseTransform.dyn_hi
99
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CaseTransform.hi
10-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CaseTransform.p_hi
11-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CslJson.dyn_hi
10+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CaseTransform.p_hi
11+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CslJson.dyn_hi
1212
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CslJson.hi
13-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CslJson.p_hi
14-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Data.dyn_hi
13+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CslJson.p_hi
14+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Data.dyn_hi
1515
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Data.hi
16-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Data.p_hi
17-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Element.dyn_hi
16+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Data.p_hi
17+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Element.dyn_hi
1818
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Element.hi
19-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Element.p_hi
20-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Eval.dyn_hi
19+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Element.p_hi
20+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Eval.dyn_hi
2121
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Eval.hi
22-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Eval.p_hi
23-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Locale.dyn_hi
22+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Eval.p_hi
23+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Locale.dyn_hi
2424
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Locale.hi
25-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Locale.p_hi
26-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Pandoc.dyn_hi
25+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Locale.p_hi
26+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Pandoc.dyn_hi
2727
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Pandoc.hi
28-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Pandoc.p_hi
29-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Style.dyn_hi
28+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Pandoc.p_hi
29+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Style.dyn_hi
3030
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Style.hi
31-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Style.p_hi
32-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Types.dyn_hi
31+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Style.p_hi
32+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Types.dyn_hi
3333
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Types.hi
34-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Types.p_hi
35-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Unicode.dyn_hi
34+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Types.p_hi
35+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Unicode.dyn_hi
3636
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Unicode.hi
37-
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Unicode.p_hi
37+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Unicode.p_hi
3838
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
39-
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
40-
lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
41-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/LICENSE
42-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/CHANGELOG.md
43-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-CaseTransform.html
44-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-CslJson.html
45-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Eval.html
46-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Locale.html
47-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Pandoc.html
48-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Style.html
49-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Types.html
50-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc.html
51-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/README.md
52-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/citeproc.haddock
53-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-A.html
54-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-All.html
55-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-B.html
56-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-C.html
57-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-D.html
58-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-E.html
59-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-F.html
60-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-G.html
61-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-H.html
62-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-I.html
63-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-L.html
64-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-M.html
65-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-N.html
66-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-O.html
67-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-P.html
68-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-R.html
69-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-S.html
70-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-T.html
71-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-U.html
72-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-V.html
73-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-W.html
74-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-Y.html
75-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index.html
76-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/haddock-bundle.min.js
77-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/index.html
78-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/linuwial.css
79-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/meta.json
80-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/quick-jump.css
81-
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/synopsis.png
39+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
40+
${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
41+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/LICENSE
42+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/CHANGELOG.md
43+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-CaseTransform.html
44+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-CslJson.html
45+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Eval.html
46+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Locale.html
47+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Pandoc.html
48+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Style.html
49+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Types.html
50+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc.html
51+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/README.md
52+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/citeproc.haddock
53+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-A.html
54+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-All.html
55+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-B.html
56+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-C.html
57+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-D.html
58+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-E.html
59+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-F.html
60+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-G.html
61+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-H.html
62+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-I.html
63+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-L.html
64+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-M.html
65+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-N.html
66+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-O.html
67+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-P.html
68+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-R.html
69+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-S.html
70+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-T.html
71+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-U.html
72+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-V.html
73+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-W.html
74+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-Y.html
75+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index.html
76+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/haddock-bundle.min.js
77+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/index.html
78+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/linuwial.css
79+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/meta.json
80+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/quick-jump.css
81+
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/synopsis.png

‎textproc/hs-citeproc/buildlink3.mk‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
# $NetBSD: buildlink3.mk,v 1.10 2022/09/07 06:50:51 pho Exp $
1+
# $NetBSD: buildlink3.mk,v 1.11 2023/01/28 08:45:46 pho Exp $
22

33
BUILDLINK_TREE+= hs-citeproc
44

55
.if !defined(HS_CITEPROC_BUILDLINK3_MK)
66
HS_CITEPROC_BUILDLINK3_MK:=
77

8-
BUILDLINK_API_DEPENDS.hs-citeproc+= hs-citeproc>=0.6.0
9-
BUILDLINK_ABI_DEPENDS.hs-citeproc+= hs-citeproc>=0.6.0.1nb5
8+
BUILDLINK_API_DEPENDS.hs-citeproc+= hs-citeproc>=0.8.1
9+
BUILDLINK_ABI_DEPENDS.hs-citeproc+= hs-citeproc>=0.8.1
1010
BUILDLINK_PKGSRCDIR.hs-citeproc?= ../../textproc/hs-citeproc
1111

1212
.include "../../converters/hs-aeson/buildlink3.mk"
13-
.include "../../converters/hs-aeson-pretty/buildlink3.mk"
1413
.include "../../textproc/hs-attoparsec/buildlink3.mk"
1514
.include "../../textproc/hs-case-insensitive/buildlink3.mk"
1615
.include "../../devel/hs-data-default/buildlink3.mk"

‎textproc/hs-citeproc/distinfo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
$NetBSD: distinfo,v 1.4 2022/02/12 08:09:35 pho Exp $
1+
$NetBSD: distinfo,v 1.5 2023/01/28 08:45:46 pho Exp $
22

3-
BLAKE2s (citeproc-0.6.0.1.tar.gz) = 3223ddfb087331e2072de8df016dd2d67406ff23bc86169bd324202fc8adae6b
4-
SHA512 (citeproc-0.6.0.1.tar.gz) = ba9949d089e1a1ae27b16a19639aeaa18cebe1113861afabd97a1ee0fa2c9ca1444d7a36335422a3cabc90a1840a5cc99ca6ba8146c43008df4967dcea271ac3
5-
Size (citeproc-0.6.0.1.tar.gz) = 588162 bytes
3+
BLAKE2s (citeproc-0.8.1.tar.gz) = 243df96c208fce1cbaa5ca98eaa73d16a9fe1f32a643a533fdd7f9f3ebf13e50
4+
SHA512 (citeproc-0.8.1.tar.gz) = 7bce91a19e8db475b7c0c7f1f324e356dfb895fddc575b59d3fcdb8955b1ee17a82d3943edc383669a7bb5cc9fb14b3ff1cea766a2d322157017a97acddeee32
5+
Size (citeproc-0.8.1.tar.gz) = 549947 bytes

0 commit comments

Comments
 (0)