Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id CCA321A923C for ; Sat, 12 Feb 2022 08:09:37 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 39FA084E75; Sat, 12 Feb 2022 08:09:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7395684E54 for ; Sat, 12 Feb 2022 08:09:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id vilVWpVlvUMN for ; Sat, 12 Feb 2022 08:09:35 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6862584D2F for ; Sat, 12 Feb 2022 08:09:35 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 62691FB24; Sat, 12 Feb 2022 08:09:35 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_164465337587710" MIME-Version: 1.0 Date: Sat, 12 Feb 2022 08:09:35 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/textproc/hs-citeproc To: pkgsrc-changes@NetBSD.org Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20220212080935.62691FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_164465337587710 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Sat Feb 12 08:09:35 UTC 2022 Modified Files: pkgsrc/textproc/hs-citeproc: Makefile buildlink3.mk distinfo Log Message: Update to citeproc-0.6.0.1 0.6.0.1 * Ensure that position evaluates false inside bibliography (#99). 0.6 * Add Term parameter to TagTerm [API change]. * Add TagPrefix, TagSuffix constructors to Tag [API change]. * Make sure that extracted AuthorOnly names have the correct formatting (#55). * Do case-insensitive sorting, like Zotero (#91). * Ignore "ibid" entries in computing ambiguities. * Improved disambiguation for author-in-text citations. * In disambiguating, convert author-in-text to normal citations. Otherwise we disambiguate incorrectly. * Fix title disambiguation with note style (#90). Previously we'd been calculating ambiguities by generating renderings for citation items independently of context. This meant that we didn't detect ambiguities in "subsequent" citations (which might e.g. just have an author). * Ensure we don't do collapsing of items across a prefix or suffix (#89). If we have [@doe99; for contrasting views see @smith33; @doe00], we don't want to get collapsing to (Doe 1999, 2000; for contrasting views, see Smith 1933). This isn't strictly by the spec, but it gives better results. * Allow collapsing after an initial prefix. 0.5 * Add linkBibliography field to CiteprocOptions [API change]. When this is set to True, we hyperlink bibliography entries according to the draft of the CSL v1.02 spec (Appendix VI). When an entry has a DOI, PMCID, PMID, or URL available but none of these are rendered by the style, add a link to the title (or, if no title is present, the whole entry), using the URL for the DOI, PMCID, PMID, or URL (in that order of priority). (Benjamin Bray, #88.) * In generating citation labels, only use issued date. Not, for example, accessed (#80). * Citeproc.Locale: export lookupQuotes. [API change] * Citeproc.Types: Add localizeQuotes method to CiteprocOutput class [API change]. * Citeproc.CslJson, Citeproc.Pandoc: Implement localizeQuotes. * Citeproc: apply localizeQuotes after rendering. This ensures that quotes are properly localized and flipflopped. Previously this was done in renderCslJson (for CSL JSON) and in pandoc (for Pandoc Inlines). It is more consistent to do this as part of the rendering pipeline, in citeproc itself. * Citeproc.CslJson: Drop the Locale parameter from the signature of renderCslJson [breaking API change]. It was only needed for quote localization, which now occurs outside of this function. * Citeproc.Pandoc: use a Span with class csl-quoted for quotes, rather than a Quoted inline. This way we can leave Quoted elements passed in by pandoc alone, and we won't get strange effects like the one described in #87 (where " behaves differently when in a citation suffix). * Default to Shifted with icu flag (#83). This makes the library behave similarly whether compiled with icu or with the default unicode-collation and prevents test failures with icu. * Require recent text-icu with icu flag. Older versions don't build with newer versions of icu4c. * Support links in CslJson (Benjamin Bray). Currently they are only supported in rendering, not parsing (in support of #88). * Allow test cases to specify CiteprocOptions (Benjamin Bray). * Update locales from upstream. * Add new CSL tests to repository. 0.4.1 * Change Pandoc inNote so it creates a Span with class csl-note rather than a Note. This should make it easier to integrate citations with ordinary notes in pandoc. * Do not hyperlink author-only citations (#77). If we do this we get two consecutive hyperlinks for author-in-text forms. * movePunctuationInsideQuotes: only move , and ., not ? and !, as per the CSL spec. 0.4.0.1 * Fix bug introduced by the fix to #61 (#74). In certain circumstances, we could get doubled "et al.". * Depend on unicode-collation unconditionally (#71). It is necessary even when text-icu is used, because of Text.Collate.Lang. * Rename tests in extra/ so they fall into categories. 0.4 * We now use Lang from unicode-collation rather than defining our own. The type constructor has changed, as has the signature of parseLang. * Use unicode-collation by default for more accurate sorting. * text-icu will still be used if the icu flag is set. This may give better performance, at the cost of depending on a large C library. * Change type of SortKeyValue so it doesn't embed Lang. [API change] Instead, we now store a language-specific collator in the Eval Context. * Move compSortKeyValues from Types to Eval. * Add curly open quote to word splitters in normalizeSortKey. * Improve date sorting: use the format YYYY0000 if no month, day, and YYYYMM00 if no day when generating sort keys. * Special treatment of literal "others" as last name in a list (#61). When we convert bibtex/biblatex bibliographies, the form "and others" yields a last name with nameLiteral = "others". We detect this and generate a localized "and others" (et al). * Make abbreviations case-insensitive (#45). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/hs-citeproc/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/hs-citeproc/buildlink3.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/hs-citeproc/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_164465337587710 Content-Disposition: inline Content-Length: 3313 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/hs-citeproc/Makefile diff -u pkgsrc/textproc/hs-citeproc/Makefile:1.5 pkgsrc/textproc/hs-citeproc/Makefile:1.6 --- pkgsrc/textproc/hs-citeproc/Makefile:1.5 Tue Jan 18 02:48:24 2022 +++ pkgsrc/textproc/hs-citeproc/Makefile Sat Feb 12 08:09:35 2022 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2022/01/18 02:48:24 pho Exp $ +# $NetBSD: Makefile,v 1.6 2022/02/12 08:09:35 pho Exp $ -DISTNAME= citeproc-0.3.0.9 -PKGREVISION= 2 +DISTNAME= citeproc-0.6.0.1 CATEGORIES= textproc MAINTAINER= pho@cielonegro.org @@ -19,6 +18,7 @@ CONFIGURE_ARGS+= -fexecutable .include "../../textproc/hs-pandoc-types/buildlink3.mk" .include "../../devel/hs-safe/buildlink3.mk" .include "../../math/hs-scientific/buildlink3.mk" +.include "../../textproc/hs-unicode-collation/buildlink3.mk" .include "../../devel/hs-uniplate/buildlink3.mk" .include "../../devel/hs-vector/buildlink3.mk" .include "../../textproc/hs-xml-conduit/buildlink3.mk" Index: pkgsrc/textproc/hs-citeproc/buildlink3.mk diff -u pkgsrc/textproc/hs-citeproc/buildlink3.mk:1.4 pkgsrc/textproc/hs-citeproc/buildlink3.mk:1.5 --- pkgsrc/textproc/hs-citeproc/buildlink3.mk:1.4 Tue Jan 18 02:48:24 2022 +++ pkgsrc/textproc/hs-citeproc/buildlink3.mk Sat Feb 12 08:09:35 2022 @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.4 2022/01/18 02:48:24 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2022/02/12 08:09:35 pho Exp $ BUILDLINK_TREE+= hs-citeproc .if !defined(HS_CITEPROC_BUILDLINK3_MK) HS_CITEPROC_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hs-citeproc+= hs-citeproc>=0.3.0 -BUILDLINK_ABI_DEPENDS.hs-citeproc+= hs-citeproc>=0.3.0.9nb2 +BUILDLINK_API_DEPENDS.hs-citeproc+= hs-citeproc>=0.6.0 +BUILDLINK_ABI_DEPENDS.hs-citeproc+= hs-citeproc>=0.6.0.1 BUILDLINK_PKGSRCDIR.hs-citeproc?= ../../textproc/hs-citeproc .include "../../converters/hs-aeson/buildlink3.mk" @@ -18,6 +18,7 @@ BUILDLINK_PKGSRCDIR.hs-citeproc?= ../../ .include "../../textproc/hs-pandoc-types/buildlink3.mk" .include "../../devel/hs-safe/buildlink3.mk" .include "../../math/hs-scientific/buildlink3.mk" +.include "../../textproc/hs-unicode-collation/buildlink3.mk" .include "../../devel/hs-uniplate/buildlink3.mk" .include "../../devel/hs-vector/buildlink3.mk" .include "../../textproc/hs-xml-conduit/buildlink3.mk" Index: pkgsrc/textproc/hs-citeproc/distinfo diff -u pkgsrc/textproc/hs-citeproc/distinfo:1.3 pkgsrc/textproc/hs-citeproc/distinfo:1.4 --- pkgsrc/textproc/hs-citeproc/distinfo:1.3 Tue Oct 26 11:21:59 2021 +++ pkgsrc/textproc/hs-citeproc/distinfo Sat Feb 12 08:09:35 2022 @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2021/10/26 11:21:59 nia Exp $ +$NetBSD: distinfo,v 1.4 2022/02/12 08:09:35 pho Exp $ -BLAKE2s (citeproc-0.3.0.9.tar.gz) = 003b061d6f641bd61653cb9ded797fc6fda0c30e1520b2c7a73ce097080c9f0a -SHA512 (citeproc-0.3.0.9.tar.gz) = 48341417e955f8ee4f6ea5e446e37907ed7b75858418c248504d93496b64147d67d7ba5e35ca9033a528982a7650d3013574f5e8686acc085f267e3d6a44b93f -Size (citeproc-0.3.0.9.tar.gz) = 572112 bytes +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 --_----------=_164465337587710--