Commit 8470b42
committed
Extend marginalia contracts: text collisions, registration, grammar
Another pass over the figure library found three more bug classes the
geometry contracts didn't yet cover. Each becomes a new contract; the
existing fixes for the canonical bugs stay in place.
Contract 3 — no two text elements overlap (FigureTextCollisionContract).
Catches narrow object_boxes whose tag and value compete for
horizontal space. itertools-chain failed: "ITER A" (sans, w=30) and
"1 · 2" (mono, w=31) couldn't both fit inside a 70px box with the
tag-inside layout. Fix: revert that figure to tag_position="above"
(the default) with iter A/B spaced 38px apart, canvas h 64→82.
Contracts 4a–d — FIGURES, ATTACHMENTS, SCORES stay in sync
(FigureRegistrationContract):
* every attached slug is scored,
* every scored slug is attached,
* every attachment points to a figure that exists in FIGURES,
* no FIGURES entry is orphan (a figure counts as used if it appears
in ATTACHMENTS or anywhere in scripts/build_prototypes.py — the
latter catches journey-section figures and banner-layout
prototypes that share src/marginalia.py paint code).
Contracts 5a–c — grammar conformance (FigureGrammarContract):
* every fill/stroke color is INK, INK_SOFT, EMPHASIS, SOFT_FILL,
or "none",
* every font-family is FONT_SERIF, FONT_MONO, or FONT_SANS,
* every stroke-width is W_HAIRLINE (0.6), W_STROKE (1.0),
W_EMPHASIS (1.4), or W_GHOST (0.5).
All 109 figures already conform; the contract locks the system
against future drift.
Suite is now 49 tests (was 41). Geometry, palette, fonts, stroke
weights, and registration consistency are all asserted on every
test run.1 parent 470a778 commit 8470b42
4 files changed
Lines changed: 128 additions & 9 deletions
File tree
- public/prototyping
- src
- tests
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
938 | 938 | | |
939 | 939 | | |
940 | 940 | | |
941 | | - | |
942 | | - | |
943 | | - | |
944 | | - | |
945 | | - | |
| 941 | + | |
| 942 | + | |
| 943 | + | |
| 944 | + | |
| 945 | + | |
946 | 946 | | |
947 | 947 | | |
948 | 948 | | |
| |||
1329 | 1329 | | |
1330 | 1330 | | |
1331 | 1331 | | |
1332 | | - | |
| 1332 | + | |
1333 | 1333 | | |
1334 | 1334 | | |
1335 | 1335 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
209 | 209 | | |
210 | 210 | | |
211 | 211 | | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
212 | 331 | | |
213 | 332 | | |
0 commit comments