Skip to content

Commit 0f44c75

Browse files
committed
Update to pandoc-types-1.22
[1.22] * Deprecate isNull from Builder: null can serve just as well (#67). Use null instead of isNull in Arbitrary (Christian Despres, #84). * Use untagged JSON encoding for single-constructor types (#75, #76, Christian Despres). All of the single constructor types related to Table are now represented in JSON either as arrays (for multi-argument constructors) or as the representation of the inner type (for single argument constructors). This behaviour for newtype-defined and multi-argument non-record types is now consistent across the entire JSON interface, with the exception of Pandoc itself (which is represented as a JSON object with additional metadata). Multi-argument records (of which Citation is the only example) are still represented as objects with the record accessors as keys. * The Meta and Citation types now use derived JSON serialization (newtype and generic, respectively). The format remains the same as before (Christian Despres). * New serialization tests now test that Meta and the Table types are encoded properly in JSON (Christian Despres). * Use TH To/FromJSON instances (Christian Despres). * Remove unused Legacy modules (#80, Despres). They are not exported, and are not used internally. * Change the table builder to permit looser intermediate table heads (#77, Christian Despres). The table builder (and the normalizeTableBody function) now permit cells in the intermediate head of a TableBody to extend past the RowHeadColumns. This allows for intermediate tables to have subheadings that extend across the entire table. Formerly the table builder would treat the intermediate head like the intermediate body, and clip or drop cells that extended past the row head. * Update QuickCheck lower bound. * Fix redundant pattern match. [1.21] * Add Underline constructor (#68, Vaibhav Sagar). * Improve table types to allow col, rowspans and more (#65, Christian Despres). The additions include modification of the Block type, some newtypes related to tables, and changes to the table builders. The table builder is now aware of the new Table constructor, and normalizes the input table appropriately, so that when laid onto a grid the resulting table has no empty spaces, overlapping cells, or cells that extend beyond their section boundary. Three properties of normalization are checked: - Normalization is idempotent. - Each row of a normalized table is an initial segment of the corresponding row in the unnormalized table, modulo changed cell dimensions, dropped cells, and padding with empty cells. This is only checked for the first row of the TableBody, however, due to row head difficulties. - The sum of the cell lengths in the first row of every normalized table section is always equal to the total table width. `simpleTable` has been changed so that a null header list becomes a TableHead with a null body, not a TableHead with a single empty row. * Bump QuickCheck upper bound. * Change lower bound for QuickCheck to 2.10 (needed for `liftShrink2`). * Small code quality improvements (Joseph C. Sible, #69). * Allow aeson 1.5 (#72, Felix Yan). * Fixed documentation typo (Merlin Göttlinger). * Add COMPLETE pragmas to the pattern definitions (Christian Despres).
1 parent 33f24bc commit 0f44c75

File tree

4 files changed

+73
-81
lines changed

4 files changed

+73
-81
lines changed

textproc/hs-pandoc-types/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# $NetBSD: Makefile,v 1.19 2020/01/11 10:05:46 pho Exp $
1+
# $NetBSD: Makefile,v 1.20 2021/04/24 17:05:02 pho Exp $
22

3-
DISTNAME= pandoc-types-1.20
3+
DISTNAME= pandoc-types-1.22
44
CATEGORIES= textproc
55

66
MAINTAINER= szptvlfn@NetBSD.org
77
COMMENT= Types for representing a structured document
88
LICENSE= gnu-gpl-v2
99

10-
.include "../../mk/haskell.mk"
1110
.include "../../converters/hs-aeson/buildlink3.mk"
1211
.include "../../devel/hs-QuickCheck/buildlink3.mk"
1312
.include "../../devel/hs-syb/buildlink3.mk"
13+
.include "../../mk/haskell.mk"
1414
.include "../../mk/bsd.pkg.mk"

textproc/hs-pandoc-types/PLIST

Lines changed: 62 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,63 @@
1-
@comment $NetBSD: PLIST,v 1.3 2020/05/11 17:52:17 rillig Exp $
2-
${HS_INTF}/package-description
3-
${HS_INTF}/package-id
1+
@comment $NetBSD: PLIST,v 1.4 2021/04/24 17:05:02 pho Exp $
2+
lib/pandoc-types-${PKGVERSION}/${HS_VERSION}/package-description
3+
lib/pandoc-types-${PKGVERSION}/${HS_VERSION}/package-id
44
lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
5-
${HS_IMPL}/Paths_pandoc_types.dyn_hi
6-
${HS_IMPL}/Paths_pandoc_types.hi
7-
${HS_IMPL}/Paths_pandoc_types.p_hi
8-
${HS_IMPL}/Text/Pandoc/Arbitrary.dyn_hi
9-
${HS_IMPL}/Text/Pandoc/Arbitrary.hi
10-
${HS_IMPL}/Text/Pandoc/Arbitrary.p_hi
11-
${HS_IMPL}/Text/Pandoc/Builder.dyn_hi
12-
${HS_IMPL}/Text/Pandoc/Builder.hi
13-
${HS_IMPL}/Text/Pandoc/Builder.p_hi
14-
${HS_IMPL}/Text/Pandoc/Definition.dyn_hi
15-
${HS_IMPL}/Text/Pandoc/Definition.hi
16-
${HS_IMPL}/Text/Pandoc/Definition.p_hi
17-
${HS_IMPL}/Text/Pandoc/Generic.dyn_hi
18-
${HS_IMPL}/Text/Pandoc/Generic.hi
19-
${HS_IMPL}/Text/Pandoc/Generic.p_hi
20-
${HS_IMPL}/Text/Pandoc/JSON.dyn_hi
21-
${HS_IMPL}/Text/Pandoc/JSON.hi
22-
${HS_IMPL}/Text/Pandoc/JSON.p_hi
23-
${HS_IMPL}/Text/Pandoc/Legacy/Builder.dyn_hi
24-
${HS_IMPL}/Text/Pandoc/Legacy/Builder.hi
25-
${HS_IMPL}/Text/Pandoc/Legacy/Builder.p_hi
26-
${HS_IMPL}/Text/Pandoc/Legacy/Definition.dyn_hi
27-
${HS_IMPL}/Text/Pandoc/Legacy/Definition.hi
28-
${HS_IMPL}/Text/Pandoc/Legacy/Definition.p_hi
29-
${HS_IMPL}/Text/Pandoc/Walk.dyn_hi
30-
${HS_IMPL}/Text/Pandoc/Walk.hi
31-
${HS_IMPL}/Text/Pandoc/Walk.p_hi
32-
${HS_IMPL}/libHS${HS_PKGID}.a
33-
${HS_IMPL}/libHS${HS_PKGID}_p.a
34-
${HS_DOCS}/LICENSE
35-
${HS_DOCS}/html/Text-Pandoc-Arbitrary.html
36-
${HS_DOCS}/html/Text-Pandoc-Builder.html
37-
${HS_DOCS}/html/Text-Pandoc-Definition.html
38-
${HS_DOCS}/html/Text-Pandoc-Generic.html
39-
${HS_DOCS}/html/Text-Pandoc-JSON.html
40-
${HS_DOCS}/html/Text-Pandoc-Legacy-Builder.html
41-
${HS_DOCS}/html/Text-Pandoc-Legacy-Definition.html
42-
${HS_DOCS}/html/Text-Pandoc-Walk.html
43-
${HS_DOCS}/html/doc-index-60.html
44-
${HS_DOCS}/html/doc-index-A.html
45-
${HS_DOCS}/html/doc-index-All.html
46-
${HS_DOCS}/html/doc-index-B.html
47-
${HS_DOCS}/html/doc-index-C.html
48-
${HS_DOCS}/html/doc-index-D.html
49-
${HS_DOCS}/html/doc-index-E.html
50-
${HS_DOCS}/html/doc-index-F.html
51-
${HS_DOCS}/html/doc-index-H.html
52-
${HS_DOCS}/html/doc-index-I.html
53-
${HS_DOCS}/html/doc-index-L.html
54-
${HS_DOCS}/html/doc-index-M.html
55-
${HS_DOCS}/html/doc-index-N.html
56-
${HS_DOCS}/html/doc-index-O.html
57-
${HS_DOCS}/html/doc-index-P.html
58-
${HS_DOCS}/html/doc-index-Q.html
59-
${HS_DOCS}/html/doc-index-R.html
60-
${HS_DOCS}/html/doc-index-S.html
61-
${HS_DOCS}/html/doc-index-T.html
62-
${HS_DOCS}/html/doc-index-U.html
63-
${HS_DOCS}/html/doc-index-W.html
64-
${HS_DOCS}/html/doc-index.html
65-
${HS_DOCS}/html/haddock-bundle.min.js
66-
${HS_DOCS}/html/index.html
67-
${HS_DOCS}/html/linuwial.css
68-
${HS_DOCS}/html/meta.json
69-
${HS_DOCS}/html/pandoc-types.haddock
70-
${HS_DOCS}/html/quick-jump.css
71-
${HS_DOCS}/html/synopsis.png
5+
lib/${HS_PLATFORM}/${HS_PKGID}/Paths_pandoc_types.dyn_hi
6+
lib/${HS_PLATFORM}/${HS_PKGID}/Paths_pandoc_types.hi
7+
lib/${HS_PLATFORM}/${HS_PKGID}/Paths_pandoc_types.p_hi
8+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Arbitrary.dyn_hi
9+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Arbitrary.hi
10+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Arbitrary.p_hi
11+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Builder.dyn_hi
12+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Builder.hi
13+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Builder.p_hi
14+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Definition.dyn_hi
15+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Definition.hi
16+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Definition.p_hi
17+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Generic.dyn_hi
18+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Generic.hi
19+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Generic.p_hi
20+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/JSON.dyn_hi
21+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/JSON.hi
22+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/JSON.p_hi
23+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Walk.dyn_hi
24+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Walk.hi
25+
lib/${HS_PLATFORM}/${HS_PKGID}/Text/Pandoc/Walk.p_hi
26+
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
27+
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
28+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/LICENSE
29+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/Text-Pandoc-Arbitrary.html
30+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/Text-Pandoc-Builder.html
31+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/Text-Pandoc-Definition.html
32+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/Text-Pandoc-Generic.html
33+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/Text-Pandoc-JSON.html
34+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/Text-Pandoc-Walk.html
35+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-60.html
36+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-A.html
37+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-All.html
38+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-B.html
39+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-C.html
40+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-D.html
41+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-E.html
42+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-F.html
43+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-H.html
44+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-I.html
45+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-L.html
46+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-M.html
47+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-N.html
48+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-O.html
49+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-P.html
50+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-Q.html
51+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-R.html
52+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-S.html
53+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-T.html
54+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-U.html
55+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index-W.html
56+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/doc-index.html
57+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/haddock-bundle.min.js
58+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/index.html
59+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/linuwial.css
60+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/meta.json
61+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/pandoc-types.haddock
62+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/quick-jump.css
63+
share/doc/${HS_PLATFORM}/pandoc-types-${PKGVERSION}/html/synopsis.png

textproc/hs-pandoc-types/buildlink3.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# $NetBSD: buildlink3.mk,v 1.19 2020/01/11 10:05:46 pho Exp $
1+
# $NetBSD: buildlink3.mk,v 1.20 2021/04/24 17:05:02 pho Exp $
22

33
BUILDLINK_TREE+= hs-pandoc-types
44

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

8-
BUILDLINK_API_DEPENDS.hs-pandoc-types+= hs-pandoc-types>=1.20
9-
BUILDLINK_ABI_DEPENDS.hs-pandoc-types+= hs-pandoc-types>=1.20
8+
BUILDLINK_API_DEPENDS.hs-pandoc-types+= hs-pandoc-types>=1.22
9+
BUILDLINK_ABI_DEPENDS.hs-pandoc-types+= hs-pandoc-types>=1.22
1010
BUILDLINK_PKGSRCDIR.hs-pandoc-types?= ../../textproc/hs-pandoc-types
1111

1212
.include "../../converters/hs-aeson/buildlink3.mk"

textproc/hs-pandoc-types/distinfo

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
$NetBSD: distinfo,v 1.4 2020/01/11 10:05:46 pho Exp $
1+
$NetBSD: distinfo,v 1.5 2021/04/24 17:05:02 pho Exp $
22

3-
SHA1 (pandoc-types-1.20.tar.gz) = d36120b3c3f3122d16884eefeb3a54e16d7490d4
4-
RMD160 (pandoc-types-1.20.tar.gz) = d4f7b60ba3bef2c0f725e43a90d6d109dba4a9dc
5-
SHA512 (pandoc-types-1.20.tar.gz) = 36c658093237246a344dc65bf9e214b250ea1a0aecf9931d80299f44ee152553c4326948bfae8e0f3e5aaabe93bc7a9aca0c79383e48b0f9d2696383df2b40ee
6-
Size (pandoc-types-1.20.tar.gz) = 29505 bytes
3+
SHA1 (pandoc-types-1.22.tar.gz) = 8f1e4c2650e7cfaaaa5ea20af6031600da42944d
4+
RMD160 (pandoc-types-1.22.tar.gz) = 1b4f8b7b02b805295a62d9aadb634c4254635df8
5+
SHA512 (pandoc-types-1.22.tar.gz) = b5f7c15b31c5ee6faa4d7574baa32d252b1e79350840f2d7ac3f3896b969e18241e514fb06e85aa97d7a74c0904839d04a4d8e5d4ff86d0a2b80957b99279ee0
6+
Size (pandoc-types-1.22.tar.gz) = 34702 bytes

0 commit comments

Comments
 (0)