Skip to content

Commit

Permalink
textproc/hs-citeproc: Update to 0.8.1
Browse files Browse the repository at this point in the history 
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].
  • Loading branch information
@depressed-pho
depressed-pho committed Jan 28, 2023
1 parent be40198 commit 41ccc09
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 78 deletions.
11 changes: 7 additions & 4 deletions textproc/hs-citeproc/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.11 2022/09/07 06:50:51 pho Exp $
# $NetBSD: Makefile,v 1.12 2023/01/28 08:45:46 pho Exp $

DISTNAME= citeproc-0.6.0.1
PKGREVISION= 5
DISTNAME= citeproc-0.8.1
CATEGORIES= textproc

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

CONFIGURE_ARGS+= -fexecutable

# lib:citeproc
.include "../../converters/hs-aeson/buildlink3.mk"
.include "../../converters/hs-aeson-pretty/buildlink3.mk"
.include "../../textproc/hs-attoparsec/buildlink3.mk"
.include "../../textproc/hs-case-insensitive/buildlink3.mk"
.include "../../devel/hs-data-default/buildlink3.mk"
Expand All @@ -24,5 +23,9 @@ CONFIGURE_ARGS+= -fexecutable
.include "../../devel/hs-vector/buildlink3.mk"
.include "../../textproc/hs-xml-conduit/buildlink3.mk"
.include "../../textproc/hs-rfc5051/buildlink3.mk"

# exe:citeproc
.include "../../converters/hs-aeson-pretty/buildlink3.mk"

.include "../../mk/haskell.mk"
.include "../../mk/bsd.pkg.mk"
132 changes: 66 additions & 66 deletions textproc/hs-citeproc/PLIST
View file
Original file line number Diff line number Diff line change
@@ -1,81 +1,81 @@
@comment $NetBSD: PLIST,v 1.1 2021/04/24 19:26:26 pho Exp $
@comment $NetBSD: PLIST,v 1.2 2023/01/28 08:45:46 pho Exp $
bin/citeproc
lib/citeproc-${PKGVERSION}/${HS_VERSION}/package-description
lib/citeproc-${PKGVERSION}/${HS_VERSION}/package-id
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc.dyn_hi
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CaseTransform.dyn_hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc.p_hi
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CaseTransform.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CaseTransform.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CaseTransform.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CslJson.dyn_hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CaseTransform.p_hi
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CslJson.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CslJson.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CslJson.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Data.dyn_hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/CslJson.p_hi
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Data.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Data.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Data.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Element.dyn_hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Data.p_hi
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Element.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Element.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Element.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Eval.dyn_hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Element.p_hi
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Eval.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Eval.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Eval.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Locale.dyn_hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Eval.p_hi
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Locale.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Locale.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Locale.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Pandoc.dyn_hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Locale.p_hi
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Pandoc.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Pandoc.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Pandoc.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Style.dyn_hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Pandoc.p_hi
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Style.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Style.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Style.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Types.dyn_hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Style.p_hi
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Types.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Types.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Types.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Unicode.dyn_hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Types.p_hi
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Unicode.dyn_hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Unicode.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Unicode.p_hi
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Citeproc/Unicode.p_hi
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/LICENSE
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/CHANGELOG.md
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-CaseTransform.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-CslJson.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Eval.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Locale.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Pandoc.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Style.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Types.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/README.md
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/citeproc.haddock
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-A.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-All.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-B.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-C.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-D.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-E.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-F.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-G.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-H.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-I.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-L.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-M.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-N.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-O.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-P.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-R.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-S.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-T.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-U.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-V.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-W.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-Y.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/haddock-bundle.min.js
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/index.html
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/linuwial.css
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/meta.json
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/quick-jump.css
share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/synopsis.png
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/LICENSE
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/CHANGELOG.md
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-CaseTransform.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-CslJson.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Eval.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Locale.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Pandoc.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Style.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc-Types.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/Citeproc.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/README.md
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/citeproc.haddock
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-A.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-All.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-B.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-C.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-D.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-E.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-F.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-G.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-H.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-I.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-L.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-M.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-N.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-O.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-P.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-R.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-S.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-T.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-U.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-V.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-W.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index-Y.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/doc-index.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/haddock-bundle.min.js
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/index.html
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/linuwial.css
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/meta.json
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/quick-jump.css
${PLIST.doc}share/doc/${HS_PLATFORM}/citeproc-${PKGVERSION}/html/synopsis.png
7 changes: 3 additions & 4 deletions textproc/hs-citeproc/buildlink3.mk
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
# $NetBSD: buildlink3.mk,v 1.10 2022/09/07 06:50:51 pho Exp $
# $NetBSD: buildlink3.mk,v 1.11 2023/01/28 08:45:46 pho Exp $

BUILDLINK_TREE+= hs-citeproc

.if !defined(HS_CITEPROC_BUILDLINK3_MK)
HS_CITEPROC_BUILDLINK3_MK:=

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

.include "../../converters/hs-aeson/buildlink3.mk"
.include "../../converters/hs-aeson-pretty/buildlink3.mk"
.include "../../textproc/hs-attoparsec/buildlink3.mk"
.include "../../textproc/hs-case-insensitive/buildlink3.mk"
.include "../../devel/hs-data-default/buildlink3.mk"
Expand Down
8 changes: 4 additions & 4 deletions textproc/hs-citeproc/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.4 2022/02/12 08:09:35 pho Exp $
$NetBSD: distinfo,v 1.5 2023/01/28 08:45:46 pho Exp $

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

0 comments on commit 41ccc09

Please sign in to comment.