diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md
index 5b1695604..593ae6e68 100644
--- a/ATTRIBUTION.md
+++ b/ATTRIBUTION.md
@@ -13,13 +13,13 @@ Every asset PdfCraft includes, bundles or uses to build its published material,
| `crates/ui-egui/src/i18n/zh-hant.tsv` | Traditional Chinese (Taiwan) interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed | Traditional Chinese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
| `crates/ui-egui/src/i18n/cs.tsv` | Czech interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed; 2026-10-22 signature-check and standard-identification wordings are contributor-original AI-assisted translations from English, not separately native-reviewed | Czech UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
| `crates/ui-egui/src/i18n/pt-br.tsv` | Brazilian Portuguese interface translation catalog | André Cardoso (andrecards), PdfCraft contributors | MIT OR Apache-2.0 | Clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources: the ~1,826-entry gist posted in issue #288 (https://gist.github.com/andrecards/ac388c25fba17312ce83207f8b7b467e), completed and reviewed by PdfCraft contributors; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed; 2026-10-22 text-field-table limit messages are contributor-original AI-assisted translations from English, not separately native-reviewed | Brazilian Portuguese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
-| `crates/ui-egui/src/i18n/es.tsv` | Spanish interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; the 2026-10-20 coverage additions are AI-assisted and not separately native-reviewed; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed | Spanish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
+| `crates/ui-egui/src/i18n/es.tsv` | Spanish interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; the 2026-10-20 coverage additions are AI-assisted and not separately native-reviewed; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed; 2026-10-22 signature-check wordings are contributor-original AI-assisted translations from English, not separately native-reviewed | Spanish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
| `crates/ui-egui/src/i18n/fr.tsv` | French interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed | French UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
| `crates/ui-egui/src/i18n/de.tsv` | German interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed | German UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
| `crates/ui-egui/src/i18n/lo.tsv` | Lao interface translation catalog | @bounkirdni-2025 | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft English UI labels, no proprietary localisation resources; 2026-10-22 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed | Lao UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
| `crates/ui-egui/src/i18n/te.tsv` | Telugu interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed | Telugu UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
| `crates/ui-egui/src/i18n/it.tsv` | Italian interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed | Italian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
-| `crates/ui-egui/src/i18n/pl.tsv` | Polish interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed | Polish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
+| `crates/ui-egui/src/i18n/pl.tsv` | Polish interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed; 2026-10-22 signature-check wordings are contributor-original AI-assisted translations from English, not separately native-reviewed | Polish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
| `crates/ui-egui/src/i18n/ru.tsv` | Russian interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed | Russian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
| `crates/ui-egui/src/i18n/hu.tsv` | Hungarian interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed | Hungarian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
| `crates/ui-egui/src/i18n/bg.tsv` | Bulgarian interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed | Bulgarian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
@@ -275,17 +275,17 @@ Every asset PdfCraft includes, bundles or uses to build its published material,
| `assets/icons/thumbs-down.svg` | Lucide icon "thumbs-down" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/thumbs-down.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
| `assets/icons/message-square-plus.svg` | Lucide icon "message-square-plus" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-square-plus.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
| `assets/icons/circle-x.svg` | Lucide icon "circle-x" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/circle-x.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `crates/ui-egui/tests/data/form.pdf` | One-page AcroForm test fixture (text, check box, radio group, combo box) | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: hand-written PDF objects, no third-party content | Form-filling UI tests (crates/ui-egui/tests/forms.rs, commands.rs) |
+| `crates/ui-egui/tests/data/form.pdf` | One-page AcroForm test fixture (text, check box, radio group, combo box) | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: hand-written PDF objects, no third-party content | Form-filling UI tests (crates/ui-egui/tests/it/forms.rs, commands.rs) |
| `assets/icons/pentagon.svg` | Lucide icon "pentagon" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/pentagon.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
| `assets/icons/message-square-quote.svg` | Lucide icon "message-square-quote" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/message-square-quote.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `crates/sign/tests/data/openssl-signed.pdf` | One-page PDF signed with OpenSSL CMS (adbe.pkcs7.detached) by the RSA test key | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: hand-written PDF objects; signature made with `openssl cms -sign` over its byte ranges (see crates/sign/tests/data/README.md) | Signature validation tests (crates/sign/tests/pdf.rs): a signature PdfCraft did not make |
+| `crates/sign/tests/data/openssl-signed.pdf` | One-page PDF signed with OpenSSL CMS (adbe.pkcs7.detached) by the RSA test key | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: hand-written PDF objects; signature made with `openssl cms -sign` over its byte ranges (see crates/sign/tests/data/README.md) | Signature validation tests (crates/sign/tests/it/pdf.rs): a signature PdfCraft did not make |
| `assets/icons/clipboard-paste.svg` | Lucide icon "clipboard-paste" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/clipboard-paste.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
| `assets/fonts/DancingScript.ttf` | Dancing Script (variable) | The Dancing Script Project Authors (Pablo Impallari) | OFL-1.1 | https://github.com/google/fonts/blob/9710da1eacb3be272583c3224dcb70f9da6eadbb/ofl/dancingscript/DancingScript%5Bwght%5D.ttf | Fill & Sign typed signatures and initials: the typed name's glyph outlines, drawn as filled paths (the font file itself is not embedded in PDFs) |
| `packaging/macos/dmg/background.svg` | PdfCraft macOS DMG window background | @XusBadia | MIT OR Apache-2.0 | Original work for this repository, derived from the PdfCraft app icon (assets/app-icon/pdfcraft.svg, referenced via an SVG image element, not copied) | Finder window of the macOS DMG; rendered to background.tiff by packaging/macos/dmg/generate.py |
| `packaging/macos/dmg/background.tiff` | PdfCraft macOS DMG window background (rendered) | @XusBadia | MIT OR Apache-2.0 | Rendered from packaging/macos/dmg/background.svg by packaging/macos/dmg/generate.py | 1x + 2x HiDPI 16-colour palette TIFF copied into the macOS DMG by packaging/macos/package.sh; includes the app icon and the free LittleCMS built-in sRGB profile |
-| `crates/sign/tests/data/x509-rsa-sha1.pdf` | One-page PDF with a legacy adbe.x509.rsa_sha1 signature by the RSA test key | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: hand-written PDF objects; signature made with `openssl dgst -sha1 -sign` over its byte ranges (see crates/sign/tests/data/README.md) | Signature validation tests (crates/sign/tests/pdf.rs): the legacy adbe.x509.rsa_sha1 format |
+| `crates/sign/tests/data/x509-rsa-sha1.pdf` | One-page PDF with a legacy adbe.x509.rsa_sha1 signature by the RSA test key | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: hand-written PDF objects; signature made with `openssl dgst -sha1 -sign` over its byte ranges (see crates/sign/tests/data/README.md) | Signature validation tests (crates/sign/tests/it/pdf.rs): the legacy adbe.x509.rsa_sha1 format |
| `assets/icons/monitor.svg` | Lucide icon "monitor" | Lucide Contributors (portions Cole Bemis, Feather) | ISC | https://github.com/lucide-icons/lucide (npm lucide-static 1.49.0, icons/monitor.svg) | UI icon, embedded via crates/ui-egui/src/icon_data.rs |
-| `crates/ui-egui/src/i18n/vi.tsv` | Vietnamese interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels; PhotoCraft and VectorCraft Vietnamese catalogs used only as translation memory when English source and semantic context matched; original catalog reviewed by a native Vietnamese-speaking contributor; 2026-10-15 coverage additions are AI-assisted and not separately native-reviewed; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed | Vietnamese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
+| `crates/ui-egui/src/i18n/vi.tsv` | Vietnamese interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels; PhotoCraft and VectorCraft Vietnamese catalogs used only as translation memory when English source and semantic context matched; original catalog reviewed by a native Vietnamese-speaking contributor; 2026-10-15 coverage additions are AI-assisted and not separately native-reviewed; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed; 2026-10-22 signature-check wordings are contributor-original AI-assisted translations from English, not separately native-reviewed | Vietnamese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
| `crates/ui-egui/src/i18n/sl.tsv` | Slovene interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed | Slovene UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
| `vendor/vello_common/assets/probe.png` | vello_common probe reference image (rendered from probe.rgba) | Linebender vello contributors | MIT OR Apache-2.0 | vello_common 0.0.8 (crates.io), vendored in vendor/vello_common; regenerated by its vello_sparse_tests regenerate_probe_reference binary | Reference picture of the vendored vello_common probe module, for people only; the build reads probe.rgba, not this file |
| `crates/ui-egui/src/i18n/nb.tsv` | Norwegian Bokmål interface translation catalog | PdfCraft contributors | MIT OR Apache-2.0 | Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-22 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed | Norwegian Bokmål UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs |
diff --git a/ATTRIBUTION.toml b/ATTRIBUTION.toml
index 6c9c88a2e..3f42a5401 100644
--- a/ATTRIBUTION.toml
+++ b/ATTRIBUTION.toml
@@ -52,7 +52,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Czech UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "7358300715a54e72a477c5888dad53f426ddf76da141a6202bec74594eb5ff0a"
+sha256 = "b08f8282923d2faaf1f658d2aff8f71fe5f2d3a33e792eeb50fb0e2b396ef24f"
[[asset]]
path = "crates/ui-egui/src/i18n/pt-br.tsv"
@@ -63,18 +63,18 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Brazilian Portuguese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "265083ea7dfa129fcae0b9e401aef8f7c84982011ba91fb2023c52705b81e639"
+sha256 = "df17dada3df736e75bd9b03e5ecceec164cce63767e33a1efdb98c56a121c890"
[[asset]]
path = "crates/ui-egui/src/i18n/es.tsv"
title = "Spanish interface translation catalog"
author = "PdfCraft contributors"
-source = "Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; the 2026-10-20 coverage additions are AI-assisted and not separately native-reviewed; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed"
+source = "Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; the 2026-10-20 coverage additions are AI-assisted and not separately native-reviewed; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed; 2026-10-22 signature-check wordings are contributor-original AI-assisted translations from English, not separately native-reviewed"
licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Spanish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "ffcf42859cfe38ae13c6fe4219cbe6225a20b4572c202db9e82ee38bfb433799"
+sha256 = "8e8c0cfda0886c584e5286370ec00814206c3af3699c76665e636fa6fdb6310b"
[[asset]]
path = "crates/ui-egui/src/i18n/fr.tsv"
@@ -135,12 +135,12 @@ sha256 = "76f138293fc12ea3584568a81f6f90a1cedfff6256e78b4f60cb21b1b66bbba4"
path = "crates/ui-egui/src/i18n/pl.tsv"
title = "Polish interface translation catalog"
author = "PdfCraft contributors"
-source = "Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed"
+source = "Contributor-original: clean-room translations of PdfCraft's English UI labels, no proprietary localisation resources; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed; 2026-10-22 signature-check wordings are contributor-original AI-assisted translations from English, not separately native-reviewed"
licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Polish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "7bca90240f873fcec687bea84e9ea5835f0903827501d0e73ec26b98b82e8a52"
+sha256 = "0bd75a93f8d18deb832223bd0642cc4f4abde04a322b684a143a9d4b4687a344"
[[asset]]
path = "crates/ui-egui/src/i18n/ru.tsv"
@@ -250,7 +250,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Lithuanian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "dea5076ce9c19f054812b678241931ad5e7f85dee08acf1c1e12c7ecaaa5d0f5"
+sha256 = "bbef7f4e16f83e9e0116278e7a0a175bad79757f96a18dc639516572533f6d5b"
[[asset]]
path = "crates/ui-egui/src/i18n/hi.tsv"
@@ -292,7 +292,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Romanian UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "18d4beda8495d7f0b91f0dc0a52c2248d9ce6fb3f4e3de0d51f42235eaab7aa8"
+sha256 = "00a2153c20a191fbe04f1ce61f140fd9628cfe2f8f75dad5bce8a7406e1bd091"
[[asset]]
@@ -304,7 +304,7 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Finnish UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "7b13e11191a3f2c0e38f1940996ae62da16e3bdb057215b2737f3a9c6a840000"
+sha256 = "609efa92054aa76de4bb6062c0fcc0a8b450519f4b253b4c0f395b3cbb34d2ba"
[[asset]]
path = "assets/icons/accessibility.svg"
@@ -3277,7 +3277,7 @@ source = "Contributor-original: hand-written PDF objects, no third-party content
licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "document"
-usage = "Form-filling UI tests (crates/ui-egui/tests/forms.rs, commands.rs)"
+usage = "Form-filling UI tests (crates/ui-egui/tests/it/forms.rs, commands.rs)"
sha256 = "c6f8b656e225101129aa36bd5467adc8dba16730915f19caca17f6a546d0b040"
[[asset]]
@@ -3310,7 +3310,7 @@ source = "Contributor-original: hand-written PDF objects; signature made with `o
licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "document"
-usage = "Signature validation tests (crates/sign/tests/pdf.rs): a signature PdfCraft did not make"
+usage = "Signature validation tests (crates/sign/tests/it/pdf.rs): a signature PdfCraft did not make"
sha256 = "8b91c3b4e39c4a31717a0dd0685bd7d0468671df32aee5b9818d44dc72c2bc3c"
[[asset]]
@@ -3403,7 +3403,7 @@ source = "Contributor-original: hand-written PDF objects; signature made with `o
licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "document"
-usage = "Signature validation tests (crates/sign/tests/pdf.rs): the legacy adbe.x509.rsa_sha1 format"
+usage = "Signature validation tests (crates/sign/tests/it/pdf.rs): the legacy adbe.x509.rsa_sha1 format"
sha256 = "b77bfb21166f4bd043597e45a1ea28b9d9f4ba6df0142b3a0fc8b7f8e0fc111b"
[[asset]]
@@ -3421,12 +3421,12 @@ sha256 = "d1a443233345724859de8e4fb48968ba91e885e12ddbd710701548bd91b39428"
path = "crates/ui-egui/src/i18n/vi.tsv"
title = "Vietnamese interface translation catalog"
author = "PdfCraft contributors"
-source = "Contributor-original: clean-room translations of PdfCraft's English UI labels; PhotoCraft and VectorCraft Vietnamese catalogs used only as translation memory when English source and semantic context matched; original catalog reviewed by a native Vietnamese-speaking contributor; 2026-10-15 coverage additions are AI-assisted and not separately native-reviewed; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed"
+source = "Contributor-original: clean-room translations of PdfCraft's English UI labels; PhotoCraft and VectorCraft Vietnamese catalogs used only as translation memory when English source and semantic context matched; original catalog reviewed by a native Vietnamese-speaking contributor; 2026-10-15 coverage additions are AI-assisted and not separately native-reviewed; 2026-10-18 page-gap labels are contributor-original AI-assisted translations from English, not separately native-reviewed; 2026-10-22 signature-check wordings are contributor-original AI-assisted translations from English, not separately native-reviewed"
licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Vietnamese UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "1c73f9d51b599923d704bf00c8e56b23696de16141b7a2c20aae6f60f88927a5"
+sha256 = "57f0dd007ad16518fbc87d8aeac840ef6d86412bb460aff9fb17b176408fb7a8"
[[asset]]
path = "crates/ui-egui/src/i18n/sl.tsv"
@@ -3537,4 +3537,4 @@ licence = "MIT OR Apache-2.0"
licence_file = "LICENSE-MIT"
kind = "translation"
usage = "Catalan UI strings, compiled in by crates/ui-egui/src/i18n/mod.rs"
-sha256 = "cde106ae68eea0a2d6229863ea21bbea235e4c3c5e3e728d52689d54041f0593"
+sha256 = "5879ee3540ffb630fc83d0f2cb293cc6cbf2e081ea4577161a770794e8cbd22c"
diff --git a/Cargo.lock b/Cargo.lock
index a95014924..47d73be44 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3936,7 +3936,7 @@ dependencies = [
[[package]]
name = "pdfcraft"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"chrono",
"craft-quit",
@@ -3962,7 +3962,7 @@ dependencies = [
[[package]]
name = "pdfcraft-a11y"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"pdfcraft-content",
"pdfcraft-cos",
@@ -3974,7 +3974,7 @@ dependencies = [
[[package]]
name = "pdfcraft-annot"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"hayro-syntax",
"pdfcraft-cos",
@@ -3985,7 +3985,7 @@ dependencies = [
[[package]]
name = "pdfcraft-audit"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"pdfcraft-content",
"pdfcraft-cos",
@@ -3996,7 +3996,7 @@ dependencies = [
[[package]]
name = "pdfcraft-automation"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"base64 0.22.1",
"flate2",
@@ -4018,7 +4018,7 @@ dependencies = [
[[package]]
name = "pdfcraft-cli"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"base64 0.22.1",
"pdfcraft-audit",
@@ -4036,18 +4036,19 @@ dependencies = [
[[package]]
name = "pdfcraft-compare"
-version = "0.11.0"
+version = "0.13.0"
[[package]]
name = "pdfcraft-content"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
+ "hayro-syntax",
"pdfcraft-cos",
]
[[package]]
name = "pdfcraft-cos"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"chrono",
"hayro-syntax",
@@ -4062,7 +4063,7 @@ dependencies = [
[[package]]
name = "pdfcraft-create"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"encoding_rs",
"hayro-syntax",
@@ -4078,7 +4079,7 @@ dependencies = [
[[package]]
name = "pdfcraft-crypt"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"aes",
"md-5",
@@ -4090,7 +4091,7 @@ dependencies = [
[[package]]
name = "pdfcraft-edit"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"hayro-syntax",
"kurbo 0.13.1",
@@ -4105,7 +4106,7 @@ dependencies = [
[[package]]
name = "pdfcraft-engine"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"chrono",
"craft-docpath",
@@ -4146,14 +4147,14 @@ dependencies = [
[[package]]
name = "pdfcraft-export"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"flate2",
]
[[package]]
name = "pdfcraft-filters"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"flate2",
"proptest",
@@ -4163,7 +4164,7 @@ dependencies = [
[[package]]
name = "pdfcraft-fonts"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"harfrust",
"pdfcraft-cos",
@@ -4173,7 +4174,7 @@ dependencies = [
[[package]]
name = "pdfcraft-forms"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"hayro-syntax",
"pdfcraft-content",
@@ -4186,11 +4187,11 @@ dependencies = [
[[package]]
name = "pdfcraft-geom"
-version = "0.11.0"
+version = "0.13.0"
[[package]]
name = "pdfcraft-js"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"boa_engine",
"chrono",
@@ -4198,7 +4199,7 @@ dependencies = [
[[package]]
name = "pdfcraft-measure"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"pdfcraft-annot",
"pdfcraft-content",
@@ -4211,14 +4212,14 @@ dependencies = [
[[package]]
name = "pdfcraft-model"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"pdfcraft-cos",
]
[[package]]
name = "pdfcraft-ocr"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"ocrs",
"pdfcraft-fonts",
@@ -4228,7 +4229,7 @@ dependencies = [
[[package]]
name = "pdfcraft-optimize"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"image",
"pdfcraft-annot",
@@ -4241,11 +4242,11 @@ dependencies = [
[[package]]
name = "pdfcraft-oracle"
-version = "0.11.0"
+version = "0.13.0"
[[package]]
name = "pdfcraft-organize"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"hayro-syntax",
"pdfcraft-content",
@@ -4256,7 +4257,7 @@ dependencies = [
[[package]]
name = "pdfcraft-platform"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"async-channel",
"futures-lite",
@@ -4266,7 +4267,7 @@ dependencies = [
[[package]]
name = "pdfcraft-preflight"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"flate2",
"pdfcraft-content",
@@ -4277,7 +4278,7 @@ dependencies = [
[[package]]
name = "pdfcraft-print"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"craft-print",
"pdfcraft-content",
@@ -4289,7 +4290,7 @@ dependencies = [
[[package]]
name = "pdfcraft-redact"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"pdfcraft-annot",
"pdfcraft-content",
@@ -4305,7 +4306,7 @@ dependencies = [
[[package]]
name = "pdfcraft-render"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"bytemuck",
"flate2",
@@ -4324,7 +4325,7 @@ dependencies = [
[[package]]
name = "pdfcraft-sign"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"aes",
"aws-lc-rs",
@@ -4359,14 +4360,15 @@ dependencies = [
[[package]]
name = "pdfcraft-testkit"
-version = "0.11.0"
+version = "0.13.0"
[[package]]
name = "pdfcraft-ui-egui"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"arboard",
"base64 0.22.1",
+ "block2 0.6.2",
"bytemuck",
"chrono",
"craft-quit",
@@ -4390,6 +4392,7 @@ dependencies = [
"pdfcraft-platform",
"pdfcraft-render",
"pdfcraft-xfa",
+ "plist",
"png 0.18.1",
"pollster 1.0.1",
"rfd",
@@ -4404,11 +4407,12 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"winsafe",
+ "xattr",
]
[[package]]
name = "pdfcraft-web"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"eframe",
"egui",
@@ -4420,7 +4424,7 @@ dependencies = [
[[package]]
name = "pdfcraft-xfa"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"base64 0.22.1",
"image",
@@ -4434,7 +4438,7 @@ dependencies = [
[[package]]
name = "pdfcraft-xfdf"
-version = "0.11.0"
+version = "0.13.0"
dependencies = [
"pdfcraft-annot",
"pdfcraft-cos",
@@ -4661,6 +4665,19 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+[[package]]
+name = "plist"
+version = "1.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65dca778f41c79ebbe8b2b2139fee86f01b766b67130d108c7c2b8ffbd949f77"
+dependencies = [
+ "base64 0.23.1",
+ "indexmap",
+ "quick-xml 0.42.0",
+ "serde",
+ "time",
+]
+
[[package]]
name = "png"
version = "0.17.16"
@@ -4888,6 +4905,15 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "quick-xml"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41b1177fdf999d2321d3fb46ff47159d9c1fb9ad66a4879f8c50a0b504615e9b"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "quinn"
version = "0.11.12"
@@ -7260,7 +7286,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0"
dependencies = [
"proc-macro2",
- "quick-xml",
+ "quick-xml 0.41.0",
"quote",
]
diff --git a/Cargo.toml b/Cargo.toml
index 201240314..92f51290d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ exclude = ["vendor"]
default-members = ["crates/*", "apps/pdfcraft", "apps/pdfcraft-cli", "xtask"]
[workspace.package]
-version = "0.11.0"
+version = "0.13.0"
edition = "2024"
license = "MIT OR Apache-2.0"
rust-version = "1.95"
@@ -21,39 +21,39 @@ craft-print = { git = "https://github.com/storytold/craft-libs", version = "0.1.
# Whether a path stored in a document may be opened (GoToR link targets).
craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "82a24b006eefa036b43c09a67fb9a3fbd17ffe63" }
# internal
-pdfcraft-geom = { path = "crates/geom", version = "0.11.0" }
-pdfcraft-filters = { path = "crates/filters", version = "0.11.0" }
-pdfcraft-cos = { path = "crates/cos", version = "0.11.0" }
-pdfcraft-crypt = { path = "crates/crypt", version = "0.11.0" }
-pdfcraft-organize = { path = "crates/organize", version = "0.11.0" }
-pdfcraft-measure = { path = "crates/measure", version = "0.11.0" }
-pdfcraft-annot = { path = "crates/annot", version = "0.11.0" }
-pdfcraft-audit = { path = "crates/audit", version = "0.11.0" }
-pdfcraft-fonts = { path = "crates/fonts", version = "0.11.0" }
-pdfcraft-model = { path = "crates/model", version = "0.11.0" }
-pdfcraft-content = { path = "crates/content", version = "0.11.0" }
-pdfcraft-redact = { path = "crates/redact", version = "0.11.0" }
-pdfcraft-print = { path = "crates/print", version = "0.11.0" }
-pdfcraft-xfdf = { path = "crates/xfdf", version = "0.11.0" }
-pdfcraft-sign = { path = "crates/sign", version = "0.11.0" }
-pdfcraft-optimize = { path = "crates/optimize", version = "0.11.0" }
-pdfcraft-a11y = { path = "crates/a11y", version = "0.11.0" }
-pdfcraft-oracle = { path = "crates/oracle", version = "0.11.0" }
-pdfcraft-testkit = { path = "crates/testkit", version = "0.11.0" }
-pdfcraft-ocr = { path = "crates/ocr", version = "0.11.0" }
-pdfcraft-js = { path = "crates/js", version = "0.11.0" }
-pdfcraft-compare = { path = "crates/compare", version = "0.11.0" }
-pdfcraft-preflight = { path = "crates/preflight", version = "0.11.0" }
-pdfcraft-export = { path = "crates/export", version = "0.11.0" }
-pdfcraft-edit = { path = "crates/edit", version = "0.11.0" }
-pdfcraft-create = { path = "crates/create", version = "0.11.0" }
-pdfcraft-forms = { path = "crates/forms", version = "0.11.0" }
-pdfcraft-xfa = { path = "crates/xfa", version = "0.11.0" }
-pdfcraft-render = { path = "crates/render", version = "0.11.0" }
-pdfcraft-engine = { path = "crates/engine", version = "0.11.0" }
-pdfcraft-platform = { path = "crates/platform", version = "0.11.0" }
-pdfcraft-ui-egui = { path = "crates/ui-egui", version = "0.11.0" }
-pdfcraft-automation = { path = "crates/automation", version = "0.11.0", default-features = false }
+pdfcraft-geom = { path = "crates/geom", version = "0.13.0" }
+pdfcraft-filters = { path = "crates/filters", version = "0.13.0" }
+pdfcraft-cos = { path = "crates/cos", version = "0.13.0" }
+pdfcraft-crypt = { path = "crates/crypt", version = "0.13.0" }
+pdfcraft-organize = { path = "crates/organize", version = "0.13.0" }
+pdfcraft-measure = { path = "crates/measure", version = "0.13.0" }
+pdfcraft-annot = { path = "crates/annot", version = "0.13.0" }
+pdfcraft-audit = { path = "crates/audit", version = "0.13.0" }
+pdfcraft-fonts = { path = "crates/fonts", version = "0.13.0" }
+pdfcraft-model = { path = "crates/model", version = "0.13.0" }
+pdfcraft-content = { path = "crates/content", version = "0.13.0" }
+pdfcraft-redact = { path = "crates/redact", version = "0.13.0" }
+pdfcraft-print = { path = "crates/print", version = "0.13.0" }
+pdfcraft-xfdf = { path = "crates/xfdf", version = "0.13.0" }
+pdfcraft-sign = { path = "crates/sign", version = "0.13.0" }
+pdfcraft-optimize = { path = "crates/optimize", version = "0.13.0" }
+pdfcraft-a11y = { path = "crates/a11y", version = "0.13.0" }
+pdfcraft-oracle = { path = "crates/oracle", version = "0.13.0" }
+pdfcraft-testkit = { path = "crates/testkit", version = "0.13.0" }
+pdfcraft-ocr = { path = "crates/ocr", version = "0.13.0" }
+pdfcraft-js = { path = "crates/js", version = "0.13.0" }
+pdfcraft-compare = { path = "crates/compare", version = "0.13.0" }
+pdfcraft-preflight = { path = "crates/preflight", version = "0.13.0" }
+pdfcraft-export = { path = "crates/export", version = "0.13.0" }
+pdfcraft-edit = { path = "crates/edit", version = "0.13.0" }
+pdfcraft-create = { path = "crates/create", version = "0.13.0" }
+pdfcraft-forms = { path = "crates/forms", version = "0.13.0" }
+pdfcraft-xfa = { path = "crates/xfa", version = "0.13.0" }
+pdfcraft-render = { path = "crates/render", version = "0.13.0" }
+pdfcraft-engine = { path = "crates/engine", version = "0.13.0" }
+pdfcraft-platform = { path = "crates/platform", version = "0.13.0" }
+pdfcraft-ui-egui = { path = "crates/ui-egui", version = "0.13.0" }
+pdfcraft-automation = { path = "crates/automation", version = "0.13.0", default-features = false }
# pdf
hayro = "0.7.1"
diff --git a/README.md b/README.md
index 7d3069258..d39bec5aa 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,10 @@
+
+
+
+
PdfCraft
diff --git a/ROADMAP.md b/ROADMAP.md
index bc057209c..27c8e1b6b 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -2,6 +2,7 @@
**Stage: alpha** · next: beta, ~25% (ready for real work 50% → 75%) and ~400–700 h away
+> **Last reviewed:** 2026-10-22 · **Last updated:** 2026-10-22 · **Change:** minor (M14, #3558: rebase guarded macOS per-file association recovery onto current main; estimates unchanged)
> **Last reviewed:** 2026-10-21 · **Last updated:** 2026-10-21 · **Change:** minor (M3, #3808: the Pages inspector has an independent 50–150% thumbnail size slider and buttons; selection and current-page following are retained, with headless ui.set coverage. Estimates unchanged.)
> **Last reviewed:** 2026-10-20 | **Last updated:** 2026-10-20 | **Change:** minor (M11 #3507: image merging preserves content stream boundaries; estimates unchanged)
> **Last reviewed:** 2026-10-20 | **Last updated:** 2026-10-20 | **Change:** minor (M10, #3532 partial: vector printing retains existing appearances with absent Subtype; estimates unchanged)
@@ -189,6 +190,7 @@ Ranked; detail and the full milestone table in [docs/roadmap.md](docs/roadmap.md
| 8 | 1.0 polish: performance, right-to-left, missing languages, keyboard-only (M14) | 55–95 |
## Progress log
+- **2026-10-22 (M14, macOS association recovery candidate):** Successful desktop open/save/sign can queue recovery of an existing per-file binding to the running PDFCraft bundle through NSWorkspace. Metadata-only watcher changes retain undo and avoid false overwrite prompts; real same-length/same-mtime edits remain protected. Rebased on 0.12.0 and reuses #3042's shared atomic metadata preservation; the bounded recovery parser does not narrow save limits. Prior native Preview TEST-signature and Finder workflows passed on macOS 27.0.1; other versions remain unqualified. Estimates unchanged.
- **2026-10-13 (M7, free image rotation):** A selected page image has a rotate knob (Shift: 15 degree steps) and `image_edit` a `rotate_by` action; the angle is written as one undoable `cm`. Snapping to page edges while moving is in #1740; resize snapping is not done. Estimates unchanged.
- **2026-10-20 (M4, initial view):** Window and interface options read indirect boolean ViewerPreferences values. Synthetic regressions cover true/false, direct/indirect preference dictionaries and save/reopen; malformed entries retain false defaults. Estimates unchanged.
diff --git a/apps/pdfcraft-cli/Cargo.toml b/apps/pdfcraft-cli/Cargo.toml
index 991cbf98f..7b5f9a82f 100644
--- a/apps/pdfcraft-cli/Cargo.toml
+++ b/apps/pdfcraft-cli/Cargo.toml
@@ -24,7 +24,7 @@ pdfcraft-platform = { workspace = true }
base64 = "0.22"
[dev-dependencies]
-# Decodes `render` output in tests/owner_password.rs; already a dependency of the engine.
+# Decodes `render` output in tests/it/owner_password.rs; already a dependency of the engine.
png = "0.18"
[target.'cfg(unix)'.dependencies]
diff --git a/apps/pdfcraft-cli/tests/audit.rs b/apps/pdfcraft-cli/tests/it/audit.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/audit.rs
rename to apps/pdfcraft-cli/tests/it/audit.rs
diff --git a/apps/pdfcraft-cli/tests/automation_roots.rs b/apps/pdfcraft-cli/tests/it/automation_roots.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/automation_roots.rs
rename to apps/pdfcraft-cli/tests/it/automation_roots.rs
diff --git a/apps/pdfcraft-cli/tests/batch.rs b/apps/pdfcraft-cli/tests/it/batch.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/batch.rs
rename to apps/pdfcraft-cli/tests/it/batch.rs
diff --git a/apps/pdfcraft-cli/tests/check.rs b/apps/pdfcraft-cli/tests/it/check.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/check.rs
rename to apps/pdfcraft-cli/tests/it/check.rs
diff --git a/apps/pdfcraft-cli/tests/edit.rs b/apps/pdfcraft-cli/tests/it/edit.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/edit.rs
rename to apps/pdfcraft-cli/tests/it/edit.rs
diff --git a/apps/pdfcraft-cli/tests/extract.rs b/apps/pdfcraft-cli/tests/it/extract.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/extract.rs
rename to apps/pdfcraft-cli/tests/it/extract.rs
diff --git a/apps/pdfcraft-cli/tests/help.rs b/apps/pdfcraft-cli/tests/it/help.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/help.rs
rename to apps/pdfcraft-cli/tests/it/help.rs
diff --git a/apps/pdfcraft-cli/tests/info_standards.rs b/apps/pdfcraft-cli/tests/it/info_standards.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/info_standards.rs
rename to apps/pdfcraft-cli/tests/it/info_standards.rs
diff --git a/apps/pdfcraft-cli/tests/it/main.rs b/apps/pdfcraft-cli/tests/it/main.rs
new file mode 100644
index 000000000..f0b87c97a
--- /dev/null
+++ b/apps/pdfcraft-cli/tests/it/main.rs
@@ -0,0 +1,24 @@
+//! The crate's integration tests, linked into one test binary.
+
+mod audit;
+mod automation_roots;
+mod batch;
+mod check;
+mod edit;
+mod extract;
+mod help;
+mod info_standards;
+mod mcp_compact;
+mod options;
+mod owner_password;
+mod render;
+mod root_arguments;
+mod run_report;
+mod run_root;
+mod split;
+mod stderr;
+mod stdout;
+mod text;
+mod ui_control;
+mod version_resource;
+mod xfa;
diff --git a/apps/pdfcraft-cli/tests/mcp_compact.rs b/apps/pdfcraft-cli/tests/it/mcp_compact.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/mcp_compact.rs
rename to apps/pdfcraft-cli/tests/it/mcp_compact.rs
diff --git a/apps/pdfcraft-cli/tests/options.rs b/apps/pdfcraft-cli/tests/it/options.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/options.rs
rename to apps/pdfcraft-cli/tests/it/options.rs
diff --git a/apps/pdfcraft-cli/tests/owner_password.rs b/apps/pdfcraft-cli/tests/it/owner_password.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/owner_password.rs
rename to apps/pdfcraft-cli/tests/it/owner_password.rs
diff --git a/apps/pdfcraft-cli/tests/render.rs b/apps/pdfcraft-cli/tests/it/render.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/render.rs
rename to apps/pdfcraft-cli/tests/it/render.rs
diff --git a/apps/pdfcraft-cli/tests/root_arguments.rs b/apps/pdfcraft-cli/tests/it/root_arguments.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/root_arguments.rs
rename to apps/pdfcraft-cli/tests/it/root_arguments.rs
diff --git a/apps/pdfcraft-cli/tests/run_report.rs b/apps/pdfcraft-cli/tests/it/run_report.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/run_report.rs
rename to apps/pdfcraft-cli/tests/it/run_report.rs
diff --git a/apps/pdfcraft-cli/tests/run_root.rs b/apps/pdfcraft-cli/tests/it/run_root.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/run_root.rs
rename to apps/pdfcraft-cli/tests/it/run_root.rs
diff --git a/apps/pdfcraft-cli/tests/split.rs b/apps/pdfcraft-cli/tests/it/split.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/split.rs
rename to apps/pdfcraft-cli/tests/it/split.rs
diff --git a/apps/pdfcraft-cli/tests/stderr.rs b/apps/pdfcraft-cli/tests/it/stderr.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/stderr.rs
rename to apps/pdfcraft-cli/tests/it/stderr.rs
diff --git a/apps/pdfcraft-cli/tests/stdout.rs b/apps/pdfcraft-cli/tests/it/stdout.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/stdout.rs
rename to apps/pdfcraft-cli/tests/it/stdout.rs
diff --git a/apps/pdfcraft-cli/tests/text.rs b/apps/pdfcraft-cli/tests/it/text.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/text.rs
rename to apps/pdfcraft-cli/tests/it/text.rs
diff --git a/apps/pdfcraft-cli/tests/ui_control.rs b/apps/pdfcraft-cli/tests/it/ui_control.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/ui_control.rs
rename to apps/pdfcraft-cli/tests/it/ui_control.rs
diff --git a/apps/pdfcraft-cli/tests/version_resource.rs b/apps/pdfcraft-cli/tests/it/version_resource.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/version_resource.rs
rename to apps/pdfcraft-cli/tests/it/version_resource.rs
diff --git a/apps/pdfcraft-cli/tests/xfa.rs b/apps/pdfcraft-cli/tests/it/xfa.rs
similarity index 100%
rename from apps/pdfcraft-cli/tests/xfa.rs
rename to apps/pdfcraft-cli/tests/it/xfa.rs
diff --git a/apps/pdfcraft/src/main.rs b/apps/pdfcraft/src/main.rs
index 83923fbe5..1a36d64bf 100644
--- a/apps/pdfcraft/src/main.rs
+++ b/apps/pdfcraft/src/main.rs
@@ -780,7 +780,7 @@ mod tests {
/// graphics libraries at a time. The test threads otherwise run them together, and on
/// FreeBSD's CI machine the test process then died with SIGSEGV, in about half the runs:
/// the first device was still being set up when the second test began its own. The UI
- /// tests take turns the same way (`crates/ui-egui/tests/view.rs`). Hold it for the whole
+ /// tests take turns the same way (`crates/ui-egui/tests/it/main.rs`). Hold it for the whole
/// test (declared before the instance, so it's released after the device is dropped).
static GPU: std::sync::Mutex<()> = std::sync::Mutex::new(());
diff --git a/apps/pdfcraft/tests/it/main.rs b/apps/pdfcraft/tests/it/main.rs
new file mode 100644
index 000000000..bc05099a5
--- /dev/null
+++ b/apps/pdfcraft/tests/it/main.rs
@@ -0,0 +1,21 @@
+//! The crate's integration tests, linked into one test binary.
+
+// Compile winit's scroll policy against its real event type, without a compositor. The vendored
+// source (`winit_wayland_scroll`) names it as `crate::event`.
+#[cfg(target_os = "linux")]
+mod event {
+ pub use winit::event::TouchPhase;
+}
+
+mod winit_macos_emoji_picker;
+mod winit_macos_ime_commit;
+mod winit_macos_ime_discard;
+mod winit_macos_korean_first_key;
+mod winit_macos_korean_space;
+mod winit_macos_title_bar_drag;
+mod winit_wayland_scroll;
+mod winit_wayland_text_input;
+mod winit_windows_hidden_maximized;
+mod winit_windows_ime_cursor;
+mod winit_x11_dpi;
+mod winit_x11_ime_focus;
diff --git a/apps/pdfcraft/tests/winit_macos_emoji_picker.rs b/apps/pdfcraft/tests/it/winit_macos_emoji_picker.rs
similarity index 100%
rename from apps/pdfcraft/tests/winit_macos_emoji_picker.rs
rename to apps/pdfcraft/tests/it/winit_macos_emoji_picker.rs
diff --git a/apps/pdfcraft/tests/winit_macos_ime_commit.rs b/apps/pdfcraft/tests/it/winit_macos_ime_commit.rs
similarity index 100%
rename from apps/pdfcraft/tests/winit_macos_ime_commit.rs
rename to apps/pdfcraft/tests/it/winit_macos_ime_commit.rs
diff --git a/apps/pdfcraft/tests/winit_macos_ime_discard.rs b/apps/pdfcraft/tests/it/winit_macos_ime_discard.rs
similarity index 100%
rename from apps/pdfcraft/tests/winit_macos_ime_discard.rs
rename to apps/pdfcraft/tests/it/winit_macos_ime_discard.rs
diff --git a/apps/pdfcraft/tests/winit_macos_korean_first_key.rs b/apps/pdfcraft/tests/it/winit_macos_korean_first_key.rs
similarity index 100%
rename from apps/pdfcraft/tests/winit_macos_korean_first_key.rs
rename to apps/pdfcraft/tests/it/winit_macos_korean_first_key.rs
diff --git a/apps/pdfcraft/tests/winit_macos_korean_space.rs b/apps/pdfcraft/tests/it/winit_macos_korean_space.rs
similarity index 100%
rename from apps/pdfcraft/tests/winit_macos_korean_space.rs
rename to apps/pdfcraft/tests/it/winit_macos_korean_space.rs
diff --git a/apps/pdfcraft/tests/winit_macos_title_bar_drag.rs b/apps/pdfcraft/tests/it/winit_macos_title_bar_drag.rs
similarity index 100%
rename from apps/pdfcraft/tests/winit_macos_title_bar_drag.rs
rename to apps/pdfcraft/tests/it/winit_macos_title_bar_drag.rs
diff --git a/apps/pdfcraft/tests/winit_wayland_scroll.rs b/apps/pdfcraft/tests/it/winit_wayland_scroll.rs
similarity index 93%
rename from apps/pdfcraft/tests/winit_wayland_scroll.rs
rename to apps/pdfcraft/tests/it/winit_wayland_scroll.rs
index ec76d2b4b..96686f7ec 100644
--- a/apps/pdfcraft/tests/winit_wayland_scroll.rs
+++ b/apps/pdfcraft/tests/it/winit_wayland_scroll.rs
@@ -3,11 +3,8 @@
use egui::{Event, Modifiers, MouseWheelUnit, RawInput, TouchPhase, vec2};
use wayland_client::protocol::wl_pointer::AxisSource;
-// Compile the production policy against winit's real event type, without a compositor.
-mod event {
- pub use winit::event::TouchPhase;
-}
-#[path = "../../../vendor/winit/src/platform_impl/linux/wayland/seat/pointer/scroll.rs"]
+use crate::event;
+#[path = "../../../../vendor/winit/src/platform_impl/linux/wayland/seat/pointer/scroll.rs"]
mod scroll;
fn egui_phase(phase: event::TouchPhase) -> TouchPhase {
diff --git a/apps/pdfcraft/tests/winit_wayland_text_input.rs b/apps/pdfcraft/tests/it/winit_wayland_text_input.rs
similarity index 100%
rename from apps/pdfcraft/tests/winit_wayland_text_input.rs
rename to apps/pdfcraft/tests/it/winit_wayland_text_input.rs
diff --git a/apps/pdfcraft/tests/winit_windows_hidden_maximized.rs b/apps/pdfcraft/tests/it/winit_windows_hidden_maximized.rs
similarity index 100%
rename from apps/pdfcraft/tests/winit_windows_hidden_maximized.rs
rename to apps/pdfcraft/tests/it/winit_windows_hidden_maximized.rs
diff --git a/apps/pdfcraft/tests/winit_windows_ime_cursor.rs b/apps/pdfcraft/tests/it/winit_windows_ime_cursor.rs
similarity index 100%
rename from apps/pdfcraft/tests/winit_windows_ime_cursor.rs
rename to apps/pdfcraft/tests/it/winit_windows_ime_cursor.rs
diff --git a/apps/pdfcraft/tests/winit_x11_dpi.rs b/apps/pdfcraft/tests/it/winit_x11_dpi.rs
similarity index 100%
rename from apps/pdfcraft/tests/winit_x11_dpi.rs
rename to apps/pdfcraft/tests/it/winit_x11_dpi.rs
diff --git a/apps/pdfcraft/tests/winit_x11_ime_focus.rs b/apps/pdfcraft/tests/it/winit_x11_ime_focus.rs
similarity index 100%
rename from apps/pdfcraft/tests/winit_x11_ime_focus.rs
rename to apps/pdfcraft/tests/it/winit_x11_ime_focus.rs
diff --git a/assets/demo/showcase.html b/assets/demo/showcase.html
index 267e56a56..22e0619ea 100644
--- a/assets/demo/showcase.html
+++ b/assets/demo/showcase.html
@@ -401,12 +401,12 @@ a.box { position: absolute; display: block; color: transparent; font-size: 1pt;
A short greeting — roughly, “every letter deserves a good home” — in writing systems that need bidirectional layout, contextual shaping, reordering and vertical setting.
The word كتاب means “book”, and ספר does too — the bidi algorithm keeps each run in its own direction while the sentence stays left-to-right, even across numbers like ٣٤٥ and 345.
+
The word كتاب means “book”, and ספר does too — the bidi algorithm keeps each run in its own direction while the sentence stays left-to-right, even across numbers like ٣٤٥ and 345.
Colour emoji
📄🖋️🎨📐🔍🌍🧮✅🦀📎
diff --git a/crates/a11y/src/alt.rs b/crates/a11y/src/alt.rs
index e4755ab38..87cfce5ac 100644
--- a/crates/a11y/src/alt.rs
+++ b/crates/a11y/src/alt.rs
@@ -4,7 +4,7 @@
use std::collections::{HashMap, HashSet};
use pdfcraft_content::Matrix;
-use pdfcraft_cos::{Dict, Document, ObjRef, Object, PdfString, Stream};
+use pdfcraft_cos::{DecodeBudget, Dict, Document, ObjRef, Object, PdfString, Stream};
/// A Figure element (after the role map).
#[derive(Clone, Debug, PartialEq)]
@@ -23,6 +23,8 @@ pub enum AltError {
Untagged,
#[error("object {0} is not a figure")]
NotAFigure(u32),
+ #[error("the page has more content than can be edited")]
+ TooLarge,
#[error("{0}")]
Cos(#[from] pdfcraft_cos::CosError),
}
@@ -48,6 +50,8 @@ pub enum ArtifactError {
AmbiguousParent,
#[error("couldn't update the parent tree: {0}")]
ParentTree(String),
+ #[error("the page has more content than can be edited")]
+ TooLarge,
#[error(transparent)]
Cos(#[from] pdfcraft_cos::CosError),
}
@@ -157,22 +161,19 @@ fn bdc_mcid(doc: &Document, props: &Dict, op: &pdfcraft_content::Op) -> Option Vec {
+ page_content_within(doc, page, &mut DecodeBudget::page())
+}
+
+/// The page's content streams, decoded against `budget` and joined with a space. Streams that
+/// don't decode, or arrive after the budget is spent, are left out.
+pub(crate) fn page_content_within(doc: &Document, page: &Dict, budget: &mut DecodeBudget) -> Vec {
let Some(c) = page.get(b"Contents") else { return Vec::new() };
- match &*doc.resolve(c) {
- Object::Stream(s) => s.decoded().unwrap_or_default(),
- Object::Array(a) => a
- .iter()
- .flat_map(|x| match &*doc.resolve(x) {
- Object::Stream(s) => {
- let mut v = s.decoded().unwrap_or_default();
- v.push(b' ');
- v
- }
- _ => Vec::new(),
- })
- .collect(),
- _ => Vec::new(),
+ let mut out = Vec::new();
+ for data in budget.decode_contents(doc, c).into_iter().flatten() {
+ out.extend_from_slice(&data);
+ out.push(b' ');
}
+ out
}
fn union(a: Option<[f64; 4]>, b: [f64; 4]) -> [f64; 4] {
@@ -182,17 +183,51 @@ fn union(a: Option<[f64; 4]>, b: [f64; 4]) -> [f64; 4] {
}
}
-/// Where the marked content `ids` is drawn on a page (images, forms and paths).
-fn content_bbox(doc: &Document, page: &Dict, ids: &HashSet) -> Option<[f64; 4]> {
+/// An open marked-content sequence while bounds are gathered: its id, when it is one of those asked
+/// for, and the bounds of what has been drawn in it so far.
+struct Mark {
+ id: Option,
+ drawn: Option<[f64; 4]>,
+}
+
+/// Adds `b` to what the innermost open sequence has drawn.
+fn draw(marks: &mut [Mark], b: [f64; 4]) {
+ if let Some(m) = marks.last_mut() {
+ m.drawn = Some(union(m.drawn, b));
+ }
+}
+
+/// Closes the innermost open sequence: what it drew counts for its id and for the sequence around it.
+fn close(marks: &mut Vec, matching: &mut usize, out: &mut HashMap) {
+ let Some(m) = marks.pop() else { return };
+ if m.id.is_some() {
+ *matching = matching.saturating_sub(1);
+ }
+ let Some(b) = m.drawn else { return };
+ if let Some(id) = m.id {
+ let e = out.entry(id).or_insert(b);
+ *e = union(Some(*e), b);
+ }
+ draw(marks, b);
+}
+
+/// Where each of the marked content `ids` is drawn on a page (images, forms and paths), in one pass
+/// over the page. What a sequence draws counts for every sequence of `ids` around it too.
+pub(crate) fn content_bboxes(doc: &Document, page: &Dict, ids: &HashSet) -> HashMap {
let res = page.get(b"Resources").map(|r| doc.resolve(r)).and_then(|r| r.as_dict().cloned()).unwrap_or_default();
let xobjects = res.get(b"XObject").map(|x| doc.resolve(x)).and_then(|x| x.as_dict().cloned()).unwrap_or_default();
let props = page_properties(doc, page);
+ #[cfg(test)]
+ crate::BOUNDS_PASSES.with(|c| c.set(c.get() + 1));
let mut ctm = vec![Matrix([1.0, 0.0, 0.0, 1.0, 0.0, 0.0])];
- let mut marks: Vec = Vec::new();
- let mut bbox = None;
+ // The open marked-content sequences, and how many of them are one of `ids`.
+ let mut marks: Vec = Vec::new();
+ let mut matching = 0usize;
+ let mut out = HashMap::new();
let mut path: Vec<(f64, f64)> = Vec::new();
for op in pdfcraft_content::parse(&page_content(doc, page)).ops {
- let inside = marks.iter().any(|m| *m);
+ crate::count_mark_reads(1);
+ let inside = matching > 0;
let top = ctm.last().copied().unwrap_or(Matrix([1.0, 0.0, 0.0, 1.0, 0.0, 0.0]));
match op.op.as_slice() {
b"q" => ctm.push(top),
@@ -206,11 +241,13 @@ fn content_bbox(doc: &Document, page: &Dict, ids: &HashSet) -> Option<[f64;
*t = m.then(&top);
}
}
- b"BMC" => marks.push(false),
- b"BDC" => marks.push(bdc_mcid(doc, &props, &op).is_some_and(|n| ids.contains(&n))),
- b"EMC" => {
- marks.pop();
+ b"BMC" => marks.push(Mark { id: None, drawn: None }),
+ b"BDC" => {
+ let id = bdc_mcid(doc, &props, &op).filter(|n| ids.contains(n));
+ matching += usize::from(id.is_some());
+ marks.push(Mark { id, drawn: None });
}
+ b"EMC" => close(&mut marks, &mut matching, &mut out),
b"m" | b"l" => {
if let Some([x, y]) = op.nums::<2>() {
path.push(top.apply(x, y));
@@ -231,7 +268,7 @@ fn content_bbox(doc: &Document, page: &Dict, ids: &HashSet) -> Option<[f64;
b"f" | b"F" | b"f*" | b"B" | b"B*" | b"b" | b"b*" | b"S" | b"s" | b"n" => {
if inside && !matches!(op.op.as_slice(), b"n") {
for (x, y) in &path {
- bbox = Some(union(bbox, [*x, *y, *x, *y]));
+ draw(&mut marks, [*x, *y, *x, *y]);
}
}
path.clear();
@@ -251,13 +288,16 @@ fn content_bbox(doc: &Document, page: &Dict, ids: &HashSet) -> Option<[f64;
}
_ => top.bbox([0.0, 0.0, 1.0, 1.0]),
};
- bbox = Some(union(bbox, unit));
+ draw(&mut marks, unit);
}
- b"BI" if inside => bbox = Some(union(bbox, top.bbox([0.0, 0.0, 1.0, 1.0]))),
+ b"BI" if inside => draw(&mut marks, top.bbox([0.0, 0.0, 1.0, 1.0])),
_ => {}
}
}
- bbox
+ while !marks.is_empty() {
+ close(&mut marks, &mut matching, &mut out);
+ }
+ out
}
/// The figures, in document order.
@@ -266,14 +306,28 @@ pub fn figures(doc: &Document) -> Vec {
let role_map = root.get(b"RoleMap").map(|o| doc.resolve(o)).and_then(|o| o.as_dict().cloned()).unwrap_or_default();
let pages = pdfcraft_model::pages(doc);
let index: HashMap = pages.iter().enumerate().map(|(i, p)| (p.obj, i)).collect();
- elements(doc)
+ let figures: Vec<(Element, Option)> = elements(doc)
.into_iter()
.filter(|e| e.dict.name(b"S").is_some_and(|s| standard(doc, &role_map, s) == b"Figure"))
.map(|e| {
let page = e.page.and_then(|p| index.get(&p).copied());
+ (e, page)
+ })
+ .collect();
+ let mut wanted: HashMap> = HashMap::new();
+ for (e, page) in &figures {
+ if let Some(p) = page {
+ wanted.entry(*p).or_default().extend(mcids(&e.dict));
+ }
+ }
+ let bounds: HashMap> =
+ wanted.into_iter().filter_map(|(p, ids)| Some((p, content_bboxes(doc, &pages.get(p)?.dict, &ids)))).collect();
+ figures
+ .into_iter()
+ .map(|(e, page)| {
let alt = e.dict.get(b"Alt").map(|o| doc.resolve(o)).and_then(|o| o.as_string().map(|s| s.to_text()));
- let ids: HashSet = mcids(&e.dict).into_iter().collect();
- let bbox = page.and_then(|p| content_bbox(doc, &pages[p].dict, &ids));
+ let on_page = page.and_then(|p| bounds.get(&p));
+ let bbox = on_page.and_then(|b| mcids(&e.dict).iter().filter_map(|id| b.get(id)).fold(None, |acc, b| Some(union(acc, *b))));
Figure { obj: e.object, page, alt, bbox }
})
.collect()
@@ -322,9 +376,19 @@ fn artifact_marked_content(doc: &mut Document, page: &pdfcraft_model::Page, ids:
let Some(entries) = content_entries(doc, &page.dict) else { return Ok(false) };
let props = page_properties(doc, &page.dict);
let mut streams: Vec)>> = Vec::with_capacity(entries.len());
+ let mut budget = DecodeBudget::page();
for entry in &entries {
match &*doc.resolve(entry) {
- Object::Stream(s) => streams.push(Some((s.clone(), s.decoded().unwrap_or_default()))),
+ Object::Stream(s) => {
+ let data = match budget.decode(s) {
+ Ok(data) => data,
+ // Content past the budget may hold more of the figure: editing the rest
+ // would leave that part marked as a figure the tree no longer has.
+ Err(_) if budget.exhausted() => return Err(AltError::TooLarge),
+ Err(_) => Vec::new(),
+ };
+ streams.push(Some((s.clone(), data)));
+ }
_ => streams.push(None),
}
}
@@ -421,7 +485,23 @@ pub fn mark_tag_artifact(doc: &mut Document, obj: ObjRef) -> Result<(), Artifact
let pages = pdfcraft_model::pages(doc);
let page_ref = element.page.ok_or(ArtifactError::NoPage)?;
let page = pages.iter().find(|page| page.obj == page_ref).ok_or(ArtifactError::NoPage)?;
- let mut ops = pdfcraft_content::parse(&page_content(doc, &page.dict)).ops;
+ let mut content = Vec::new();
+ if let Some(c) = page.dict.get(b"Contents") {
+ let mut budget = DecodeBudget::page();
+ for data in budget.decode_contents(doc, c) {
+ match data {
+ Ok(data) => {
+ content.extend_from_slice(&data);
+ content.push(b' ');
+ }
+ // The page's /Contents is replaced with what was decoded: content past the
+ // budget would be dropped from the page.
+ Err(_) if budget.exhausted() => return Err(ArtifactError::TooLarge),
+ Err(_) => {}
+ }
+ }
+ }
+ let mut ops = pdfcraft_content::parse(&content).ops;
let mut found = HashSet::new();
for op in &mut ops {
let id = (op.op == b"BDC")
diff --git a/crates/a11y/src/content.rs b/crates/a11y/src/content.rs
index 8f7221b2c..fd5f0d305 100644
--- a/crates/a11y/src/content.rs
+++ b/crates/a11y/src/content.rs
@@ -6,7 +6,7 @@
use std::collections::{BTreeMap, BTreeSet, HashSet};
-use pdfcraft_cos::{Dict, Document, ObjRef, Object};
+use pdfcraft_cos::{DecodeBudget, Dict, Document, ObjRef, Object};
use pdfcraft_model::Page;
use crate::{Finding, Rule};
@@ -20,6 +20,8 @@ pub(crate) struct Scan {
pub untagged: BTreeMap,
/// Page → fonts used.
pub fonts: BTreeMap>,
+ /// Pages read only in part: content or forms past the page's decode budget are missing.
+ pub incomplete: BTreeSet,
}
const MAX_FORM_DEPTH: usize = 12;
@@ -30,38 +32,25 @@ impl Scan {
for &p in list {
let Some(page) = pages.get(p) else { continue };
let res = page.dict.get(b"Resources").map(|r| doc.resolve(r)).and_then(|r| r.as_dict().cloned()).unwrap_or_default();
- let data = page_content(doc, &page.dict);
- let mut w = Walk { doc, scan: &mut s, page: p, forms: HashSet::new() };
+ let mut budget = DecodeBudget::page();
+ let data = crate::alt::page_content_within(doc, &page.dict, &mut budget);
+ if budget.remaining() == 0 {
+ s.incomplete.insert(p);
+ }
+ let mut w = Walk { doc, scan: &mut s, page: p, forms: HashSet::new(), budget };
w.content(&data, &res, false, 0);
}
s
}
}
-fn page_content(doc: &Document, page: &Dict) -> Vec {
- let Some(c) = page.get(b"Contents") else { return Vec::new() };
- match &*doc.resolve(c) {
- Object::Stream(s) => s.decoded().unwrap_or_default(),
- Object::Array(a) => a
- .iter()
- .flat_map(|x| match &*doc.resolve(x) {
- Object::Stream(s) => {
- let mut v = s.decoded().unwrap_or_default();
- v.push(b' ');
- v
- }
- _ => Vec::new(),
- })
- .collect(),
- _ => Vec::new(),
- }
-}
-
struct Walk<'a> {
doc: &'a Document,
scan: &'a mut Scan,
page: usize,
forms: HashSet,
+ /// Decoded bytes and form entries left for this page.
+ budget: DecodeBudget,
}
impl Walk<'_> {
@@ -116,14 +105,27 @@ impl Walk<'_> {
self.scan.has_images = true;
untagged += usize::from(!inside);
}
- Some(b"Form") if depth < MAX_FORM_DEPTH && self.forms.insert(r) => {
+ Some(b"Form") if depth < MAX_FORM_DEPTH && !self.forms.contains(&r) => {
+ if !self.budget.enter_form() {
+ self.scan.incomplete.insert(self.page);
+ continue;
+ }
+ let data = match self.budget.decode(x) {
+ Ok(data) => data,
+ Err(_) => {
+ if self.budget.exhausted() {
+ self.scan.incomplete.insert(self.page);
+ }
+ continue;
+ }
+ };
+ self.forms.insert(r);
let inner = x
.dict
.get(b"Resources")
.map(|o| self.doc.resolve(o))
.and_then(|o| o.as_dict().cloned())
.unwrap_or_else(|| res.clone());
- let data = x.decoded().unwrap_or_default();
self.content(&data, &inner, inside, depth + 1);
self.forms.remove(&r);
}
diff --git a/crates/a11y/src/headings.rs b/crates/a11y/src/headings.rs
index 537ed908d..41c749ed3 100644
--- a/crates/a11y/src/headings.rs
+++ b/crates/a11y/src/headings.rs
@@ -182,6 +182,7 @@ pub(crate) fn mcid_texts(doc: &Document, page: &Dict) -> HashMap {
let res = sub(doc, page, b"Resources");
let (fonts, props) = (sub(doc, &res, b"Font"), sub(doc, &res, b"Properties"));
let mut metrics: HashMap, Metrics> = HashMap::new();
+ // The id each open marked-content sequence is in: its own, else the enclosing one's.
let mut stack: Vec> = Vec::new();
let mut out: HashMap = HashMap::new();
// Where each id's last glyph ended, in user space.
@@ -191,16 +192,20 @@ pub(crate) fn mcid_texts(doc: &Document, page: &Dict) -> HashMap {
let mut unsaved = 0usize;
let (mut tm, mut tlm) = (Matrix::IDENTITY, Matrix::IDENTITY);
for op in pdfcraft_content::parse(&page_content(doc, page)).ops {
- let id = stack.iter().rev().find_map(|m| *m);
+ crate::count_mark_reads(1);
+ let id = stack.last().copied().flatten();
match op.op.as_slice() {
- b"BMC" => stack.push(None),
- b"BDC" => stack.push(match op.operands.get(1) {
- Some(Object::Dict(d)) => d.get(b"MCID").and_then(Object::as_int),
- Some(Object::Name(n)) => {
- props.get(n).map(|x| doc.resolve(x)).and_then(|x| x.as_dict().and_then(|d| d.get(b"MCID").and_then(Object::as_int)))
+ b"BMC" => stack.push(id),
+ b"BDC" => stack.push(
+ match op.operands.get(1) {
+ Some(Object::Dict(d)) => d.get(b"MCID").and_then(Object::as_int),
+ Some(Object::Name(n)) => {
+ props.get(n).map(|x| doc.resolve(x)).and_then(|x| x.as_dict().and_then(|d| d.get(b"MCID").and_then(Object::as_int)))
+ }
+ _ => None,
}
- _ => None,
- }),
+ .or(id),
+ ),
b"EMC" => {
stack.pop();
}
@@ -280,17 +285,17 @@ pub(crate) fn mcid_texts(doc: &Document, page: &Dict) -> HashMap {
};
for (code, len) in m.codes(&s.bytes) {
let trm = tm.then(&gs.ctm);
+ // A glyph's text is only built while its id still takes more.
if let Some(id) = id
+ && out.get(&id).is_none_or(|t| t.len() < MAX_TITLE * 4)
&& let Some(glyph) = m.text_of(code)
{
let text = out.entry(id).or_default();
- if text.len() < MAX_TITLE * 4 {
- let breaks = ends.get(&id).is_some_and(|end| new_word(&trm, *end, gs.size, gs.scale));
- if breaks && !text.is_empty() && !text.ends_with(' ') && !glyph.starts_with(' ') {
- text.push(' ');
- }
- text.push_str(&glyph);
+ let breaks = ends.get(&id).is_some_and(|end| new_word(&trm, *end, gs.size, gs.scale));
+ if breaks && !text.is_empty() && !text.ends_with(' ') && !glyph.starts_with(' ') {
+ text.push(' ');
}
+ text.push_str(&glyph);
}
let advance = m.width(code) * gs.size + gs.char_spacing + if m.is_space(code, len) { gs.word_spacing } else { 0.0 };
tm = Matrix::translate(advance * gs.scale, 0.0).then(&tm);
diff --git a/crates/a11y/src/lib.rs b/crates/a11y/src/lib.rs
index ff81cc4c9..280f4e845 100644
--- a/crates/a11y/src/lib.rs
+++ b/crates/a11y/src/lib.rs
@@ -21,6 +21,22 @@ mod report;
mod structure;
mod tags;
+#[cfg(test)]
+thread_local! {
+ /// Marked-content stack entries read to decide which marks enclose an operator, for the tests
+ /// that keep that constant per operator.
+ static MARK_READS: std::cell::Cell = const { std::cell::Cell::new(0) };
+ /// Page content passes made to find figure bounds.
+ static BOUNDS_PASSES: std::cell::Cell = const { std::cell::Cell::new(0) };
+}
+
+/// Counts `n` marked-content stack reads (tests only).
+#[inline]
+fn count_mark_reads(_n: usize) {
+ #[cfg(test)]
+ MARK_READS.with(|c| c.set(c.get().saturating_add(_n)));
+}
+
pub use alt::{AltError, ArtifactError, Figure, figures, mark_decorative, mark_tag_artifact, set_alt};
pub use autotag::{AutoTagError, AutoTagResult, autotag_text};
pub use autotag_fields::tag_form_fields;
@@ -665,6 +681,18 @@ pub fn check(doc: &Document, options: &Options) -> Report {
}
}
}
+ // A page read only in part may hold what the scan didn't find: text that makes the
+ // document more than images, untagged content, or a font without Unicode mappings.
+ let unsure = !scan.incomplete.is_empty()
+ && match rule {
+ Rule::ImageOnly => !scan.has_text,
+ Rule::TaggedContent | Rule::CharacterEncoding => findings.is_empty(),
+ _ => false,
+ };
+ if unsure {
+ results.push(RuleResult { rule, status: Status::Manual, findings: Vec::new() });
+ continue;
+ }
if total > MAX_FINDINGS {
let more = total - MAX_FINDINGS;
findings.truncate(MAX_FINDINGS);
diff --git a/crates/a11y/src/tests.rs b/crates/a11y/src/tests.rs
index 15ca643e8..399aded3c 100644
--- a/crates/a11y/src/tests.rs
+++ b/crates/a11y/src/tests.rs
@@ -1023,6 +1023,67 @@ fn glyph_by_tm(text: &str, size: f64, y: f64) -> String {
ops + " ET"
}
+/// Marked-content stack reads while `f` runs.
+fn mark_reads(f: impl FnOnce()) -> usize {
+ MARK_READS.with(|c| c.set(0));
+ f();
+ MARK_READS.with(|c| c.get())
+}
+
+/// Page content nesting `depth` unmarked `BMC` blocks around a marked one, with `ops` operators inside.
+fn deeply_nested_page(doc: &mut Document, depth: usize, ops: usize) -> pdfcraft_cos::Dict {
+ use pdfcraft_cos::{Dict, Stream};
+ let mut data = "/Figure << /MCID 0 >> BDC ".to_string();
+ data.push_str(&"/X BMC ".repeat(depth));
+ data.push_str(&"0 0 1 1 re f ".repeat(ops));
+ data.push_str(&"EMC ".repeat(depth + 1));
+ let content = doc.add(Stream::flate(Dict::new(), data.as_bytes()));
+ [(b"Contents".to_vec(), Object::Ref(content))].into_iter().collect()
+}
+
+#[test]
+fn marked_text_reads_its_enclosing_id_in_constant_steps() {
+ let mut doc = Document::new_empty();
+ let page = deeply_nested_page(&mut doc, 5_000, 5_000);
+ let reads = mark_reads(|| {
+ crate::headings::mcid_texts(&doc, &page);
+ });
+ // About 15 000 operators; a scan of the stack per operator reads millions of entries.
+ assert!(reads <= 4 * 15_000, "{reads} stack reads");
+}
+
+#[test]
+fn figure_bounds_read_the_marked_content_state_in_constant_steps() {
+ let mut doc = Document::new_empty();
+ let page = deeply_nested_page(&mut doc, 5_000, 5_000);
+ // No mark encloses figure 7, so a scan of the stack per operator reads all of it.
+ let reads = mark_reads(|| {
+ crate::alt::content_bboxes(&doc, &page, &std::collections::HashSet::from([7]));
+ });
+ assert!(reads <= 4 * 15_000, "{reads} stack reads");
+}
+
+#[test]
+fn figure_bounds_take_one_pass_over_each_page() {
+ let n = 50;
+ let content: Vec = (0..n).map(|i| format!("/Figure << /MCID {i} >> BDC {i} 0 1 1 re f EMC")).collect();
+ let kids: Vec = (0..n).map(|i| format!("{} 0 R", 6 + i)).collect();
+ let mut objs: Vec = vec![
+ "<< /Type /Catalog /Pages 2 0 R /StructTreeRoot 5 0 R >>".into(),
+ "<< /Type /Pages /Kids [3 0 R] /Count 1 >>".into(),
+ "<< /Type /Page /Parent 2 0 R /MediaBox [0 0 200 200] /Contents 4 0 R >>".into(),
+ stream(&content.join(" ")),
+ format!("<< /Type /StructTreeRoot /K [{}] >>", kids.join(" ")),
+ ];
+ objs.extend((0..n).map(|i| format!("<< /S /Figure /Pg 3 0 R /K {i} >>")));
+ let doc = pdf(&objs, "");
+ BOUNDS_PASSES.with(|c| c.set(0));
+ let f = figures(&doc);
+ assert_eq!(BOUNDS_PASSES.with(|c| c.get()), 1, "page passes");
+ assert_eq!(f.len(), n);
+ assert!(f.iter().enumerate().all(|(i, f)| f.bbox == Some([i as f64, 0.0, i as f64 + 1.0, 1.0])));
+}
+
/// One tagged page whose H1 headings show `contents` (one marked-content sequence each).
fn heading_page(contents: &[String]) -> Document {
let marked: Vec = contents.iter().enumerate().map(|(i, c)| format!("/H1 << /MCID {i} >> BDC {c} EMC")).collect();
@@ -1191,3 +1252,75 @@ fn horizontally_scaled_wrapped_heading_keeps_a_space_between_lines() {
let titles: Vec = headings(&doc).into_iter().map(|h| h.title).collect();
assert_eq!(titles, ["I Overview"]);
}
+
+#[test]
+fn repeated_content_references_share_one_decode_budget() {
+ use pdfcraft_cos::{Dict, MAX_PAGE_DECODED, Object, Stream};
+ let mut doc = Document::new_empty();
+ let stream = doc.add(Stream::flate(Dict::new(), &vec![b' '; 1 << 20]));
+ let page: Dict = [(b"Contents".to_vec(), Object::Array(vec![Object::Ref(stream); 300]))].into_iter().collect();
+ let data = crate::alt::page_content(&doc, &page);
+ assert!(data.len() <= MAX_PAGE_DECODED + 300, "{} bytes", data.len());
+}
+
+/// A figure whose marked content goes on in a stream past the page's decode budget is refused,
+/// not removed with that content still pointing at it.
+#[test]
+fn marking_decorative_refuses_content_past_the_decode_budget() {
+ use pdfcraft_cos::{Dict, ObjRef, Object, Stream};
+ let mut doc = figures_doc();
+ let filler = doc.add(Stream::flate(Dict::new(), &vec![b' '; 1 << 20]));
+ let last = doc.add(Stream::from_raw(Dict::new(), b"/Figure << /MCID 0 >> BDC 0 0 5 5 re f EMC".to_vec()));
+ let mut contents = vec![Object::Ref(ObjRef::new(4, 0))];
+ contents.extend(std::iter::repeat_n(Object::Ref(filler), 256));
+ contents.push(Object::Ref(last));
+ doc.update_dict(ObjRef::new(3, 0), |p| p.set(b"Contents".to_vec(), Object::Array(contents))).unwrap();
+ assert!(mark_decorative(&mut doc, ObjRef::new(7, 0)).is_err());
+ assert_eq!(figures(&doc).len(), 2, "the figure stays");
+}
+
+/// Text past the page's decode budget is unread, so a page that shows images and no text so far
+/// can't be called image-only, nor its content all tagged.
+#[test]
+fn content_past_the_decode_budget_needs_a_manual_check() {
+ use pdfcraft_cos::{Dict, ObjRef, Object, Stream};
+ let mut doc = pdf(
+ &[
+ "<< /Type /Catalog /Pages 2 0 R >>".into(),
+ "<< /Type /Pages /Kids [3 0 R] /Count 1 >>".into(),
+ "<< /Type /Page /Parent 2 0 R /MediaBox [0 0 200 200] /Contents 4 0 R /Resources << /XObject << /Im 5 0 R >> /Font << /F1 6 0 R >> >> >>"
+ .into(),
+ stream("/Artifact BMC q 200 0 0 200 0 0 cm /Im Do Q EMC"),
+ "<< /Type /XObject /Subtype /Image /Width 1 /Height 1 /ColorSpace /DeviceGray /BitsPerComponent 8 /Length 1 >>\nstream\n\u{0}\nendstream"
+ .into(),
+ FONT.into(),
+ ],
+ "",
+ );
+ let filler = doc.add(Stream::flate(Dict::new(), &vec![b' '; 1 << 20]));
+ let text = doc.add(Stream::from_raw(Dict::new(), b"BT /F1 12 Tf 10 10 Td (Hello) Tj ET".to_vec()));
+ let mut contents = vec![Object::Ref(ObjRef::new(4, 0))];
+ contents.extend(std::iter::repeat_n(Object::Ref(filler), 256));
+ contents.push(Object::Ref(text));
+ doc.update_dict(ObjRef::new(3, 0), |p| p.set(b"Contents".to_vec(), Object::Array(contents))).unwrap();
+ let report = check(&doc, &Options::default());
+ assert_eq!(status(&report, Rule::ImageOnly), Status::Manual);
+ assert_eq!(status(&report, Rule::TaggedContent), Status::Manual);
+}
+
+/// Marking a tag as an artifact replaces the page's content with what it decoded, so content past
+/// the page's decode budget is refused rather than dropped from the page.
+#[test]
+fn marking_a_tag_artifact_refuses_content_past_the_decode_budget() {
+ use pdfcraft_cos::{Dict, ObjRef, Object, Stream};
+ let mut doc = figures_doc();
+ let filler = doc.add(Stream::flate(Dict::new(), &vec![b' '; 1 << 20]));
+ let last = doc.add(Stream::from_raw(Dict::new(), b"0 0 5 5 re f".to_vec()));
+ let mut contents = vec![Object::Ref(ObjRef::new(4, 0))];
+ contents.extend(std::iter::repeat_n(Object::Ref(filler), 256));
+ contents.push(Object::Ref(last));
+ let contents = Object::Array(contents);
+ doc.update_dict(ObjRef::new(3, 0), |p| p.set(b"Contents".to_vec(), contents.clone())).unwrap();
+ assert_eq!(mark_tag_artifact(&mut doc, ObjRef::new(7, 0)), Err(ArtifactError::TooLarge));
+ assert_eq!(doc.get(ObjRef::new(3, 0)).as_dict().unwrap().get(b"Contents"), Some(&contents), "the page keeps its content");
+}
diff --git a/crates/annot/src/appearance.rs b/crates/annot/src/appearance.rs
index 4668881a6..59cacbbdd 100644
--- a/crates/annot/src/appearance.rs
+++ b/crates/annot/src/appearance.rs
@@ -120,12 +120,18 @@ fn smooth_curve(pts: &[(f64, f64)]) -> String {
smooth_segments(pts).iter().map(|[a, b, e]| format!("{} {} {} {} {} {} c\n", n(a.0), n(a.1), n(b.0), n(b.1), n(e.0), n(e.1))).collect()
}
+/// Bumps one cloudy outline draws at most (plus one per edge); past it the bumps grow.
+pub(crate) const MAX_CLOUD_BUMPS: usize = 20_000;
+
/// A closed cloudy outline through `pts` (§12.5.4 `/BE /S /C`): each edge becomes a row of
/// half-circle bumps of about `r`, bulging outwards.
pub fn cloud_path(pts: &[(f64, f64)], r: f64) -> String {
let area: f64 = pts.iter().zip(pts.iter().cycle().skip(1)).map(|(a, b)| a.0 * b.1 - b.0 * a.1).sum();
// Outward normal of an edge: to the right of travel for counter-clockwise outlines.
let sign = if area >= 0.0 { 1.0 } else { -1.0 };
+ let perimeter: f64 = pts.iter().zip(pts.iter().cycle().skip(1)).map(|(a, b)| (b.0 - a.0).hypot(b.1 - a.1)).sum();
+ // Each edge rounds to at least one bump, so the total stays within the budget plus one per edge.
+ let r = r.max(perimeter / (2.0 * MAX_CLOUD_BUMPS as f64));
let mut c = String::new();
for (i, (a, b)) in pts.iter().zip(pts.iter().cycle().skip(1)).enumerate() {
let (dx, dy) = (b.0 - a.0, b.1 - a.1);
diff --git a/crates/annot/src/links.rs b/crates/annot/src/links.rs
index 4d3eef632..657488137 100644
--- a/crates/annot/src/links.rs
+++ b/crates/annot/src/links.rs
@@ -78,11 +78,15 @@ pub struct LinkItem {
pub style: LinkStyle,
}
+/// Bytes of web-address text one listing keeps, counted after conversion to UTF-8; past it a link
+/// lists as [`LinkAction::Other`].
+pub(crate) const MAX_URI_BYTES: usize = 16 << 20;
+
fn nums(doc: &Document, o: Option<&Object>) -> Vec {
o.map(|o| doc.resolve(o)).and_then(|a| a.as_array().map(|a| a.iter().filter_map(|x| doc.resolve(x).as_f64()).collect())).unwrap_or_default()
}
-fn action_of(doc: &Document, d: &Dict, pages: &[ObjRef]) -> LinkAction {
+fn action_of(doc: &Document, d: &Dict, pages: &[ObjRef], uri_budget: &mut usize) -> LinkAction {
let dest_page = |dest: &Object| -> Option {
let a = doc.resolve(dest);
let first = a.as_array()?.first()?.clone();
@@ -97,9 +101,20 @@ fn action_of(doc: &Document, d: &Dict, pages: &[ObjRef]) -> LinkAction {
}
let Some(a) = d.get(b"A").map(|a| doc.resolve(a)).and_then(|a| a.as_dict().cloned()) else { return LinkAction::Other("no action".into()) };
match a.name(b"S") {
- Some(b"URI") => LinkAction::Uri(
- a.get(b"URI").and_then(|u| doc.resolve(u).as_string().map(|s| String::from_utf8_lossy(&s.bytes).into_owned())).unwrap_or_default(),
- ),
+ Some(b"URI") => {
+ let uri = a.get(b"URI").map(|u| doc.resolve(u));
+ let bytes = uri.as_ref().and_then(|u| u.as_string()).map_or(&[][..], |s| &s.bytes[..]);
+ // The raw length first, so an address already over the budget is never converted; then the
+ // converted text, which is up to three times longer where the bytes are not UTF-8.
+ let text = (bytes.len() <= *uri_budget).then(|| String::from_utf8_lossy(bytes));
+ match text.and_then(|t| Some((uri_budget.checked_sub(t.len())?, t))) {
+ Some((left, text)) => {
+ *uri_budget = left;
+ LinkAction::Uri(text.into_owned())
+ }
+ None => LinkAction::Other("web address too long".into()),
+ }
+ }
Some(b"GoTo") => a.get(b"D").and_then(dest_page).map_or_else(|| LinkAction::Other("named destination".into()), LinkAction::Page),
Some(s) => LinkAction::Other(String::from_utf8_lossy(s).into_owned()),
None => LinkAction::Other("no action".into()),
@@ -133,8 +148,16 @@ fn style_of(doc: &Document, d: &Dict) -> LinkStyle {
pub fn list(doc: &Document) -> Vec {
let Ok(pages) = page_refs(doc) else { return Vec::new() };
let mut out = Vec::new();
+ let mut seen = std::collections::HashSet::new();
+ let mut uri_budget = MAX_URI_BYTES;
for (pi, p) in pages.iter().enumerate() {
for (k, a) in annots(doc, *p).iter().enumerate() {
+ // One annotation object listed under several entries or pages is one link.
+ if let Some(r) = a.as_ref()
+ && !seen.insert(r)
+ {
+ continue;
+ }
let Some(d) = doc.resolve(a).as_dict().cloned() else { continue };
if d.name(b"Subtype") != Some(b"Link") {
continue;
@@ -148,7 +171,7 @@ pub fn list(doc: &Document) -> Vec {
index: k,
obj: a.as_ref(),
rect: [r[0].min(r[2]), r[1].min(r[3]), r[0].max(r[2]), r[1].max(r[3])],
- action: action_of(doc, &d, &pages),
+ action: action_of(doc, &d, &pages, &mut uri_budget),
style: style_of(doc, &d),
});
}
diff --git a/crates/annot/src/tests.rs b/crates/annot/src/tests.rs
index a65996681..6eb94b830 100644
--- a/crates/annot/src/tests.rs
+++ b/crates/annot/src/tests.rs
@@ -1504,3 +1504,66 @@ fn typed_signature_uses_nonzero_winding_fill() {
assert!(ap.ends_with("h\nf\n"), "expected non-zero winding fill (`f`), got: {ap}");
assert!(!ap.contains("f*"), "must not use even-odd fill (`f*`): {ap}");
}
+
+fn doc_of(objs: &[String]) -> Document {
+ let mut out = b"%PDF-1.7\n".to_vec();
+ let mut offsets = Vec::new();
+ for (i, o) in objs.iter().enumerate() {
+ offsets.push(out.len());
+ out.extend_from_slice(format!("{} 0 obj\n{o}\nendobj\n", i + 1).as_bytes());
+ }
+ let xref = out.len();
+ out.extend_from_slice(format!("xref\n0 {}\n0000000000 65535 f \n", objs.len() + 1).as_bytes());
+ for o in offsets {
+ out.extend_from_slice(format!("{o:010} 00000 n \n").as_bytes());
+ }
+ out.extend_from_slice(format!("trailer\n<< /Size {} /Root 1 0 R >>\nstartxref\n{xref}\n%%EOF\n", objs.len() + 1).as_bytes());
+ Document::open(Arc::new(out)).expect("opens")
+}
+
+#[test]
+fn link_listing_skips_repeated_refs_and_caps_web_address_text() {
+ // One link referenced 1000 times, and 300 small links sharing one 64 KiB address.
+ let annots = format!("{}{}", " 4 0 R".repeat(1000), "<< /Subtype /Link /Rect [0 0 1 1] /A 5 0 R >>".repeat(300));
+ let doc = doc_of(&[
+ "<< /Type /Catalog /Pages 2 0 R >>".into(),
+ "<< /Type /Pages /Kids [3 0 R] /Count 1 /MediaBox [0 0 612 792] >>".into(),
+ format!("<< /Type /Page /Parent 2 0 R /Annots [{annots}] >>"),
+ "<< /Type /Annot /Subtype /Link /Rect [0 0 10 10] /A 5 0 R >>".into(),
+ "<< /S /URI /URI 6 0 R >>".into(),
+ format!("({})", "u".repeat(64 << 10)),
+ ]);
+ let all = links::list(&doc);
+ assert_eq!(all.iter().filter(|l| l.obj == Some(ObjRef::new(4, 0))).count(), 1);
+ assert_eq!(all.len(), 301, "every distinct link is still listed");
+ let kept: usize = all.iter().map(|l| if let links::LinkAction::Uri(u) = &l.action { u.len() } else { 0 }).sum();
+ assert!(kept <= links::MAX_URI_BYTES, "{kept} bytes of web addresses kept");
+ assert!(matches!(&all[0].action, links::LinkAction::Uri(u) if u.len() == 64 << 10));
+}
+
+#[test]
+fn web_address_cap_counts_the_text_kept_after_conversion() {
+ // 200 links sharing a 64 KiB address of invalid UTF-8: 12.5 MiB of bytes, each byte kept as a
+ // three-byte replacement character.
+ let annots = "<< /Subtype /Link /Rect [0 0 1 1] /A 4 0 R >>".repeat(200);
+ let doc = doc_of(&[
+ "<< /Type /Catalog /Pages 2 0 R >>".into(),
+ "<< /Type /Pages /Kids [3 0 R] /Count 1 /MediaBox [0 0 612 792] >>".into(),
+ format!("<< /Type /Page /Parent 2 0 R /Annots [{annots}] >>"),
+ "<< /S /URI /URI 5 0 R >>".into(),
+ format!("<{}>", "FF".repeat(64 << 10)),
+ ]);
+ let all = links::list(&doc);
+ assert_eq!(all.len(), 200);
+ let kept: usize = all.iter().map(|l| if let links::LinkAction::Uri(u) = &l.action { u.len() } else { 0 }).sum();
+ assert!(kept <= links::MAX_URI_BYTES, "{kept} bytes of web addresses kept");
+ assert!(kept > 0);
+}
+
+#[test]
+fn cloud_outline_has_a_bump_budget() {
+ // 50 long edges would each ask for 10,000 bumps of radius 1.
+ let pts: Vec<(f64, f64)> = (0..50).map(|i| (f64::from(i) * std::f64::consts::TAU / 50.0).sin_cos()).map(|(s, c)| (1e7 * c, 1e7 * s)).collect();
+ let bumps = appearance::cloud_path(&pts, 1.0).lines().filter(|l| l.ends_with(" c")).count();
+ assert!((pts.len()..=appearance::MAX_CLOUD_BUMPS + 2 * pts.len()).contains(&bumps), "{bumps} bumps");
+}
diff --git a/crates/audit/src/cover.rs b/crates/audit/src/cover.rs
index 3df666c19..93394ccfb 100644
--- a/crates/audit/src/cover.rs
+++ b/crates/audit/src/cover.rs
@@ -16,7 +16,7 @@
//! Positions compare lexicographically in paint order.
use pdfcraft_content::{Matrix, Op, Pieces, parse};
-use pdfcraft_cos::{Dict, Document, Object};
+use pdfcraft_cos::{DecodeBudget, Dict, Document, Object};
use crate::AuditError;
@@ -109,6 +109,9 @@ struct Walker<'a> {
pieces: &'a Pieces,
out: Vec,
ops_seen: usize,
+ /// Decoded bytes and form entries left for the page, its forms included: spending either
+ /// fails the audit.
+ budget: DecodeBudget,
}
impl<'a> Walker<'a> {
@@ -271,8 +274,11 @@ impl<'a> Walker<'a> {
})
.unwrap_or(Matrix::IDENTITY);
let sub_resources = dict.get(b"Resources").map(|o| self.doc.resolve(o)).and_then(|o| o.as_dict().cloned()).unwrap_or_default();
+ if !self.budget.enter_form() {
+ return Err(AuditError::TooManyForms);
+ }
// A form stream that cannot be decoded fails the audit: it might hide a cover.
- let data = stream.decoded_strict()?;
+ let data = self.budget.decode_strict(stream)?;
let ops = parse(&data).ops;
// The XObject matrix maps form space into the user space active at `Do`.
let mut sub_gs = gs.clone();
@@ -304,7 +310,8 @@ fn ext_alpha(doc: &Document, resources: &Dict, name: &[u8]) -> f64 {
/// Every opaque filled rectangle drawn by a page's content (and its form XObjects), with paint
/// positions. A page's content streams are walked once, joined, with one graphics state, so
/// state set in an earlier stream is still in force in the later ones. Any content stream that
-/// cannot be decoded is an audit failure, never an empty result.
+/// cannot be decoded, or content and forms that decode or enter past one page's [`DecodeBudget`]
+/// in all, is an audit failure, never an empty result.
pub fn filled_rects(doc: &Document, page: &Dict) -> Result, AuditError> {
let resources = page.get(b"Resources").map(|o| doc.resolve(o)).and_then(|o| o.as_dict().cloned()).unwrap_or_default();
let contents: Vec
+