diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for KVITable +## 1.1.0.1 -- 2024-09-21 + +* Add test/evenodd.md and test/bigsquare.md to cabal data files. + ## 1.1.0.0 -- 2024-09-18 * The `RenderConfig.sortKeyVals` changed from a `Boolean` to a `Maybe fn`, where diff --git a/kvitable.cabal b/kvitable.cabal --- a/kvitable.cabal +++ b/kvitable.cabal @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: kvitable -version: 1.1.0.0 +version: 1.1.0.1 synopsis: Key/Value Indexed Table container and formatting library description: . @@ -42,6 +42,8 @@ , examples/hundreds_all.md , examples/zoo.md , README.md + , test/evenodd.md + , test/bigsquare.md library hs-source-dirs: src diff --git a/test/bigsquare.md b/test/bigsquare.md new file mode 100644 --- /dev/null +++ b/test/bigsquare.md @@ -0,0 +1,2180 @@ +The big square table, column and cell limited, in text form: + +**** +| Pitcher | B0 | B1 | B2 | B3 | B4 | B5 | B6 | B7 | B8 | B9 | B10 | B11 | B12 | B13 | B14 | B15 | B16 | B17 | {+83} | <- Batter ++---------+----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------+------+------+------+------+------+------+------+-------+ +| P0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | | +| P1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | | +| P2 | 0 | 2 | 4 | 6 | 8 | 10 | 12 | 14 | 16 | 18 | 20 | 22 | 24 | 26 | 28 | 30 | 32 | 34 | | +| P3 | 0 | 3 | 6 | 9 | 12 | 15 | 18 | 21 | 24 | 27 | 30 | 33 | 36 | 39 | 42 | 45 | 48 | 51 | | +| P4 | 0 | 4 | 8 | 12 | 16 | 20 | 24 | 28 | 32 | 36 | 40 | 44 | 48 | 52 | 56 | 60 | 64 | 68 | | +| P5 | 0 | 5 | 10 | 15 | 20 | 25 | 30 | 35 | 40 | 45 | 50 | 55 | 60 | 65 | 70 | 75 | 80 | 85 | | +| P6 | 0 | 6 | 12 | 18 | 24 | 30 | 36 | 42 | 48 | 54 | 60 | 66 | 72 | 78 | 84 | 90 | 96 | 102 | | +| P7 | 0 | 7 | 14 | 21 | 28 | 35 | 42 | 49 | 56 | 63 | 70 | 77 | 84 | 91 | 98 | 105 | 112 | 119 | | +| P8 | 0 | 8 | 16 | 24 | 32 | 40 | 48 | 56 | 64 | 72 | 80 | 88 | 96 | 104 | 112 | 120 | 128 | 136 | | +| P9 | 0 | 9 | 18 | 27 | 36 | 45 | 54 | 63 | 72 | 81 | 90 | 99 | 108 | 117 | 126 | 135 | 144 | 153 | | +| P10 | 0 | 10 | 20 | 30 | 40 | 50 | 60 | 70 | 80 | 90 | 100 | 110 | 120 | 130 | 140 | 150 | 160 | 170 | | +| P11 | 0 | 11 | 22 | 33 | 44 | 55 | 66 | 77 | 88 | 99 | 110 | 121 | 132 | 143 | 154 | 165 | 176 | 187 | | +| P12 | 0 | 12 | 24 | 36 | 48 | 60 | 72 | 84 | 96 | 108 | 120 | 132 | 144 | 156 | 168 | 180 | 192 | 204 | | +| P13 | 0 | 13 | 26 | 39 | 52 | 65 | 78 | 91 | 104 | 117 | 130 | 143 | 156 | 169 | 182 | 195 | 208 | 221 | | +| P14 | 0 | 14 | 28 | 42 | 56 | 70 | 84 | 98 | 112 | 126 | 140 | 154 | 168 | 182 | 196 | 210 | 224 | 238 | | +| P15 | 0 | 15 | 30 | 45 | 60 | 75 | 90 | 105 | 120 | 135 | 150 | 165 | 180 | 195 | 210 | 225 | 240 | 255 | | +| P16 | 0 | 16 | 32 | 48 | 64 | 80 | 96 | 112 | 128 | 144 | 160 | 176 | 192 | 208 | 224 | 240 | 256 | 272 | | +| P17 | 0 | 17 | 34 | 51 | 68 | 85 | 102 | 119 | 136 | 153 | 170 | 187 | 204 | 221 | 238 | 255 | 272 | 289 | | +| P18 | 0 | 18 | 36 | 54 | 72 | 90 | 108 | 126 | 144 | 162 | 180 | 198 | 216 | 234 | 252 | 270 | 288 | 306 | | +| P19 | 0 | 19 | 38 | 57 | 76 | 95 | 114 | 133 | 152 | 171 | 190 | 209 | 228 | 247 | 266 | 285 | 304 | 323 | | +| P20 | 0 | 20 | 40 | 60 | 80 | 100 | 120 | 140 | 160 | 180 | 200 | 220 | 240 | 260 | 280 | 300 | 320 | 340 | | +| P21 | 0 | 21 | 42 | 63 | 84 | 105 | 126 | 147 | 168 | 189 | 210 | 231 | 252 | 273 | 294 | 315 | 336 | 357 | | +| P22 | 0 | 22 | 44 | 66 | 88 | 110 | 132 | 154 | 176 | 198 | 220 | 242 | 264 | 286 | 308 | 330 | 352 | 374 | | +| P23 | 0 | 23 | 46 | 69 | 92 | 115 | 138 | 161 | 184 | 207 | 230 | 253 | 276 | 299 | 322 | 345 | 368 | 391 | | +| P24 | 0 | 24 | 48 | 72 | 96 | 120 | 144 | 168 | 192 | 216 | 240 | 264 | 288 | 312 | 336 | 360 | 384 | 408 | | +| P25 | 0 | 25 | 50 | 75 | 100 | 125 | 150 | 175 | 200 | 225 | 250 | 275 | 300 | 325 | 350 | 375 | 400 | 425 | | +| P26 | 0 | 26 | 52 | 78 | 104 | 130 | 156 | 182 | 208 | 234 | 260 | 286 | 312 | 338 | 364 | 390 | 416 | 442 | | +| P27 | 0 | 27 | 54 | 81 | 108 | 135 | 162 | 189 | 216 | 243 | 270 | 297 | 324 | 351 | 378 | 405 | 432 | 459 | | +| P28 | 0 | 28 | 56 | 84 | 112 | 140 | 168 | 196 | 224 | 252 | 280 | 308 | 336 | 364 | 392 | 420 | 448 | 476 | | +| {+72} | + | + | + | + | + | + | + | + | + | + | + _ | + _ | + _ | + _ | + _ | + _ | + _ | + _ | _ + _ | +**** + +And in HTML form: + +**** + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +Pitcher + +
+		 +
+ +B0 + +
+		 +
+ +B1 + +
+		 +
+ +B2 + +
+		 +
+ +B3 + +
+		 +
+ +B4 + +
+		 +
+ +B5 + +
+		 +
+ +B6 + +
+		 +
+ +B7 + +
+		 +
+ +B8 + +
+		 +
+ +B9 + +
+		 +
+ +B10 + +
+		 +
+ +B11 + +
+		 +
+ +B12 + +
+		 +
+ +B13 + +
+		 +
+ +B14 + +
+		 +
+ +B15 + +
+		 +
+ +B16 + +
+		 +
+ +B17 + +
+		 +
+ +{+83} + +
+		 + ←Batter +
+
+ +P0 + +
+		 +0 + +0 + +0 + +0 + +0 + +0 + +0 + +0 + +0 + +0 + +0 + +0 + +0 + +0 + +0 + +0 + +0 + +0 + + +... --> + +
+
+ +P1 + +
+		 +0 + +1 + +2 + +3 + +4 + +5 + +6 + +7 + +8 + +9 + +10 + +11 + +12 + +13 + +14 + +15 + +16 + +17 + + +... --> + +
+
+ +P2 + +
+		 +0 + +2 + +4 + +6 + +8 + +10 + +12 + +14 + +16 + +18 + +20 + +22 + +24 + +26 + +28 + +30 + +32 + +34 + + +... --> + +
+
+ +P3 + +
+		 +0 + +3 + +6 + +9 + +12 + +15 + +18 + +21 + +24 + +27 + +30 + +33 + +36 + +39 + +42 + +45 + +48 + +51 + + +... --> + +
+
+ +P4 + +
+		 +0 + +4 + +8 + +12 + +16 + +20 + +24 + +28 + +32 + +36 + +40 + +44 + +48 + +52 + +56 + +60 + +64 + +68 + + +... --> + +
+
+ +P5 + +
+		 +0 + +5 + +10 + +15 + +20 + +25 + +30 + +35 + +40 + +45 + +50 + +55 + +60 + +65 + +70 + +75 + +80 + +85 + + +... --> + +
+
+ +P6 + +
+		 +0 + +6 + +12 + +18 + +24 + +30 + +36 + +42 + +48 + +54 + +60 + +66 + +72 + +78 + +84 + +90 + +96 + +102 + + +... --> + +
+
+ +P7 + +
+		 +0 + +7 + +14 + +21 + +28 + +35 + +42 + +49 + +56 + +63 + +70 + +77 + +84 + +91 + +98 + +105 + +112 + +119 + + +... --> + +
+
+ +P8 + +
+		 +0 + +8 + +16 + +24 + +32 + +40 + +48 + +56 + +64 + +72 + +80 + +88 + +96 + +104 + +112 + +120 + +128 + +136 + + +... --> + +
+
+ +P9 + +
+		 +0 + +9 + +18 + +27 + +36 + +45 + +54 + +63 + +72 + +81 + +90 + +99 + +108 + +117 + +126 + +135 + +144 + +153 + + +... --> + +
+
+ +P10 + +
+		 +0 + +10 + +20 + +30 + +40 + +50 + +60 + +70 + +80 + +90 + +100 + +110 + +120 + +130 + +140 + +150 + +160 + +170 + + +... --> + +
+
+ +P11 + +
+		 +0 + +11 + +22 + +33 + +44 + +55 + +66 + +77 + +88 + +99 + +110 + +121 + +132 + +143 + +154 + +165 + +176 + +187 + + +... --> + +
+
+ +P12 + +
+		 +0 + +12 + +24 + +36 + +48 + +60 + +72 + +84 + +96 + +108 + +120 + +132 + +144 + +156 + +168 + +180 + +192 + +204 + + +... --> + +
+
+ +P13 + +
+		 +0 + +13 + +26 + +39 + +52 + +65 + +78 + +91 + +104 + +117 + +130 + +143 + +156 + +169 + +182 + +195 + +208 + +221 + + +... --> + +
+
+ +P14 + +
+		 +0 + +14 + +28 + +42 + +56 + +70 + +84 + +98 + +112 + +126 + +140 + +154 + +168 + +182 + +196 + +210 + +224 + +238 + + +... --> + +
+
+ +P15 + +
+		 +0 + +15 + +30 + +45 + +60 + +75 + +90 + +105 + +120 + +135 + +150 + +165 + +180 + +195 + +210 + +225 + +240 + +255 + + +... --> + +
+
+ +P16 + +
+		 +0 + +16 + +32 + +48 + +64 + +80 + +96 + +112 + +128 + +144 + +160 + +176 + +192 + +208 + +224 + +240 + +256 + +272 + + +... --> + +
+
+ +P17 + +
+		 +0 + +17 + +34 + +51 + +68 + +85 + +102 + +119 + +136 + +153 + +170 + +187 + +204 + +221 + +238 + +255 + +272 + +289 + + +... --> + +
+
+ +P18 + +
+		 +0 + +18 + +36 + +54 + +72 + +90 + +108 + +126 + +144 + +162 + +180 + +198 + +216 + +234 + +252 + +270 + +288 + +306 + + +... --> + +
+
+ +P19 + +
+		 +0 + +19 + +38 + +57 + +76 + +95 + +114 + +133 + +152 + +171 + +190 + +209 + +228 + +247 + +266 + +285 + +304 + +323 + + +... --> + +
+
+ +P20 + +
+		 +0 + +20 + +40 + +60 + +80 + +100 + +120 + +140 + +160 + +180 + +200 + +220 + +240 + +260 + +280 + +300 + +320 + +340 + + +... --> + +
+
+ +P21 + +
+		 +0 + +21 + +42 + +63 + +84 + +105 + +126 + +147 + +168 + +189 + +210 + +231 + +252 + +273 + +294 + +315 + +336 + +357 + + +... --> + +
+
+ +P22 + +
+		 +0 + +22 + +44 + +66 + +88 + +110 + +132 + +154 + +176 + +198 + +220 + +242 + +264 + +286 + +308 + +330 + +352 + +374 + + +... --> + +
+
+ +P23 + +
+		 +0 + +23 + +46 + +69 + +92 + +115 + +138 + +161 + +184 + +207 + +230 + +253 + +276 + +299 + +322 + +345 + +368 + +391 + + +... --> + +
+
+ +P24 + +
+		 +0 + +24 + +48 + +72 + +96 + +120 + +144 + +168 + +192 + +216 + +240 + +264 + +288 + +312 + +336 + +360 + +384 + +408 + + +... --> + +
+
+ +P25 + +
+		 +0 + +25 + +50 + +75 + +100 + +125 + +150 + +175 + +200 + +225 + +250 + +275 + +300 + +325 + +350 + +375 + +400 + +425 + + +... --> + +
+
+ +P26 + +
+		 +0 + +26 + +52 + +78 + +104 + +130 + +156 + +182 + +208 + +234 + +260 + +286 + +312 + +338 + +364 + +390 + +416 + +442 + + +... --> + +
+
+ +P27 + +
+		 +0 + +27 + +54 + +81 + +108 + +135 + +162 + +189 + +216 + +243 + +270 + +297 + +324 + +351 + +378 + +405 + +432 + +459 + + +... --> + +
+
+ +P28 + +
+		 +0 + +28 + +56 + +84 + +112 + +140 + +168 + +196 + +224 + +252 + +280 + +308 + +336 + +364 + +392 + +420 + +448 + +476 + + +... --> + +
+
+ +{+72} + +
+		 + +more + +
+**** + +That is all. diff --git a/test/evenodd.md b/test/evenodd.md new file mode 100644 --- /dev/null +++ b/test/evenodd.md @@ -0,0 +1,1191 @@ +When a maximum size is specified for the table, it will be truncated. + +Here is the even/odd table in its unconstrained form, with column stacking at the thousands + +**** +| millions | thousands | _____ 0 _____ | _______ 1 ________ | _______ 2 ________ | <- hundreds +| | | _ 0 _ | _ 2 _ | _ 0 _ | ___ 2 ____ | _ 0 _ | ___ 2 ____ | <- tens +| | | 0 | 1 | 0 | 1 | 0 | 1 | 0 | 1 | 0 | 1 | 0 | 1 | <- ones ++----------+-----------+---+---+---+---+---+---+------+-----+---+---+------+-----+ +| 0 | 0 | | | | | | | even | odd | | | even | odd | +| | 1 | | | | | | | even | odd | | | even | odd | +| | 2 | | | | | | | even | odd | | | even | odd | +| 1 | 0 | | | | | | | even | odd | | | even | odd | +| | 1 | | | | | | | even | odd | | | even | odd | +| | 2 | | | | | | | even | odd | | | even | odd | +| 2 | 0 | | | | | | | even | odd | | | even | odd | +| | 1 | | | | | | | even | odd | | | even | odd | +| | 2 | | | | | | | even | odd | | | even | odd | +**** + +**** + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+millions +
+		 +
+thousands +
+		 +
+0 +
+		 +
+1 +
+		 +
+2 +
+		 ←hundreds
+
+0 +
+		 +
+2 +
+		 +
+0 +
+		 +
+2 +
+		 +
+0 +
+		 +
+2 +
+		 ←tens
+
+0 +
+		 +
+1 +
+		 +
+0 +
+		 +
+1 +
+		 +
+0 +
+		 +
+1 +
+		 +
+0 +
+		 +
+1 +
+		 +
+0 +
+		 +
+1 +
+		 +
+0 +
+		 +
+1 +
+		 ←ones
+
+0 +
+		 +
+0 +
+		 + + + + + +evenodd + +evenodd
+
+1 +
+		 + + + + + +evenodd + +evenodd
+
+2 +
+		 + + + + + +evenodd + +evenodd
+
+1 +
+		 +
+0 +
+		 + + + + + +evenodd + +evenodd
+
+1 +
+		 + + + + + +evenodd + +evenodd
+
+2 +
+		 + + + + + +evenodd + +evenodd
+
+2 +
+		 +
+0 +
+		 + + + + + +evenodd + +evenodd
+
+1 +
+		 + + + + + +evenodd + +evenodd
+
+2 +
+		 + + + + + +evenodd + +evenodd
+**** + + +And here is the same table with a `maxCells` specification of `60`: + +**** +| millions | thousands | _____ 0 _____ | _______ 1 ________ | _______ 2 ________ | <- hundreds +| | | _ 0 _ | _ 2 _ | _ 0 _ | ___ 2 ____ | _ 0 _ | ___ 2 ____ | <- tens +| | | 0 | 1 | 0 | 1 | 0 | 1 | 0 | 1 | 0 | 1 | 0 | 1 | <- ones ++----------+-----------+---+---+---+---+---+---+------+-----+---+---+------+-----+ +| 0 | 0 | | | | | | | even | odd | | | even | odd | +| | 1 | | | | | | | even | odd | | | even | odd | +| | 2 | | | | | | | even | odd | | | even | odd | +| {+6} | ___ + ___ | + | + | + | + | + | + | + _ | + | + | + | + _ | + | +**** + +**** + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+millions +
+		 +
+thousands +
+		 +
+0 +
+		 +
+1 +
+		 +
+2 +
+		 ←hundreds
+
+0 +
+		 +
+2 +
+		 +
+0 +
+		 +
+2 +
+		 +
+0 +
+		 +
+2 +
+		 ←tens
+
+0 +
+		 +
+1 +
+		 +
+0 +
+		 +
+1 +
+		 +
+0 +
+		 +
+1 +
+		 +
+0 +
+		 +
+1 +
+		 +
+0 +
+		 +
+1 +
+		 +
+0 +
+		 +
+1 +
+		 ←ones
+
+0 +
+		 +
+0 +
+		 + + + + + +evenodd + +evenodd
+
+1 +
+		 + + + + + +evenodd + +evenodd
+
+2 +
+		 + + + + + +evenodd + +evenodd
+
+{+6} +
+		 +more +
+**** + +The same table with no column stacking and a `maxCells` specification of `60`: + +**** +| millions | thousands | hundreds | tens | ones | Value | ++----------+-----------+----------+------+------+-------+ +| 0 | 0 | 1 | 2 | 0 | even | +| | | | | 1 | odd | +| | | 2 | 2 | 0 | even | +| | | | | 1 | odd | +| | 1 | 1 | 2 | 0 | even | +| | | | | 1 | odd | +| | | 2 | 2 | 0 | even | +| | | | | 1 | odd | +| | 2 | 1 | 2 | 0 | even | +| | | | | 1 | odd | +| | | 2 | 2 | 0 | even | +| | | | | 1 | odd | +| {+72} | ___ + ___ | __ + ___ | + _ | + _ | _ + _ | +**** + +**** + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+millions +
+		 +
+thousands +
+		 +
+hundreds +
+		 +
+tens +
+		 +
+ones +
+		 +
+Value +
+
+
+0 +
+		 +
+0 +
+		 +
+0 +
+		 +
+0 +
+		 +
+0 +
+		 +
+
+1 +
+		 +
+
+2 +
+		 +
+0 +
+		 +
+
+1 +
+		 +
+
+1 +
+		 +
+0 +
+		 +
+0 +
+		 +
+
+1 +
+		 +
+
+2 +
+		 +
+0 +
+		even
+
+1 +
+		odd
+
+2 +
+		 +
+0 +
+		 +
+0 +
+		 +
+
+1 +
+		 +
+
+2 +
+		 +
+0 +
+		even
+
+1 +
+		odd
+
+1 +
+		 +
+0 +
+		 +
+0 +
+		 +
+0 +
+		 +
+
+1 +
+		 +
+
+2 +
+		 +
+0 +
+		 +
+
+1 +
+		 +
+
+1 +
+		 +
+0 +
+		 +
+0 +
+		 +
+
+1 +
+		 +
+
+2 +
+		 +
+0 +
+		even
+
+1 +
+		odd
+
+2 +
+		 +
+0 +
+		 +
+0 +
+		 +
+
+1 +
+		 +
+
+2 +
+		 +
+0 +
+		even
+
+1 +
+		odd
+
+2 +
+		 +
+0 +
+		 +
+0 +
+		 +
+0 +
+		 +
+
+1 +
+		 +
+
+2 +
+		 +
+0 +
+		 +
+
+1 +
+		 +
+
+1 +
+		 +
+0 +
+		 +
+0 +
+		 +
+
+1 +
+		 +
+
+2 +
+		 +
+0 +
+		even
+
+1 +
+		odd
+
+2 +
+		 +
+0 +
+		 +
+0 +
+		 +
+
+1 +
+		 +
+
+2 +
+		 +
+0 +
+		even
+
+1 +
+		odd
+
+{+72} +
+		 +more +
+****